diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/app/models/user.rb b/app/models/user.rb index abc1234..def5678 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,6 +1,4 @@ class User < ActiveRecord::Base - # Include default devise modules. Others available are: - # :token_authenticatable, :confirmable, :lockable and :timeoutable devise ...
Trim out devise options comment
diff --git a/app/models/user.rb b/app/models/user.rb index abc1234..def5678 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -12,9 +12,7 @@ validates_length_of :bio, :maximum => 120 def full_name - if first_name and last_name - [first_name, last_name].join(' ') - end + [first_name, last_...
Refactor roles method to avoid creating temp array every time is called
diff --git a/rom-repository.gemspec b/rom-repository.gemspec index abc1234..def5678 100644 --- a/rom-repository.gemspec +++ b/rom-repository.gemspec @@ -16,7 +16,7 @@ gem.license = 'MIT' gem.add_runtime_dependency 'anima', '~> 0.2', '>= 0.2' - gem.add_runtime_dependency 'rom', '~> 0.9.0.beta1' + gem.add_...
Update rom dep in gemspec
diff --git a/spec/lib/sendgrid_toolkit/common_spec.rb b/spec/lib/sendgrid_toolkit/common_spec.rb index abc1234..def5678 100644 --- a/spec/lib/sendgrid_toolkit/common_spec.rb +++ b/spec/lib/sendgrid_toolkit/common_spec.rb @@ -23,7 +23,7 @@ # this will only really test it on a computer that's on on utc. describe 're...
Update specs from prior pull request to work with generic sendgrid URI as implemented before merge.
diff --git a/lib/rails/generators/shadmin/resource/templates/controllers/shadmin_controller.rb b/lib/rails/generators/shadmin/resource/templates/controllers/shadmin_controller.rb index abc1234..def5678 100644 --- a/lib/rails/generators/shadmin/resource/templates/controllers/shadmin_controller.rb +++ b/lib/rails/generat...
Include all restful actions in controller template
diff --git a/spec/libraries/form_for_resource_spec.rb b/spec/libraries/form_for_resource_spec.rb index abc1234..def5678 100644 --- a/spec/libraries/form_for_resource_spec.rb +++ b/spec/libraries/form_for_resource_spec.rb @@ -9,8 +9,18 @@ end.to raise_error(ArgumentError) end + it 'requires :resource to ...
Add extra specifications for automatic `path` suffix and requiring that the stem be a symbol.
diff --git a/test/components/builders_test.rb b/test/components/builders_test.rb index abc1234..def5678 100644 --- a/test/components/builders_test.rb +++ b/test/components/builders_test.rb @@ -12,7 +12,7 @@ result = copyartifact( project: 'upstream-project', which_build: 'last-successful', - targ...
Fix a typo in the test for copyartifact
diff --git a/spec/support/devise.rb b/spec/support/devise.rb index abc1234..def5678 100644 --- a/spec/support/devise.rb +++ b/spec/support/devise.rb @@ -1,4 +1,5 @@ RSpec.configure do |config| - # Add Devise's helpers for controller tests + # Add Devise's helpers for controller and view tests config.include Devise...
Add Devise's helpers to View specs as suggested
diff --git a/test/liquid/tags/raw_tag_test.rb b/test/liquid/tags/raw_tag_test.rb index abc1234..def5678 100644 --- a/test/liquid/tags/raw_tag_test.rb +++ b/test/liquid/tags/raw_tag_test.rb @@ -20,5 +20,6 @@ assert_template_result ' Foobar {% invalid {% {% endraw ', '{% raw %} Foobar {% invalid {% {% endraw {% endra...
Add regression test for raw tags with open variable tags.
diff --git a/db/migrate/20200713114812_remove_fk_constraints_for_cross_shard_root_account_ids.rb b/db/migrate/20200713114812_remove_fk_constraints_for_cross_shard_root_account_ids.rb index abc1234..def5678 100644 --- a/db/migrate/20200713114812_remove_fk_constraints_for_cross_shard_root_account_ids.rb +++ b/db/migrate/...
Remove FK constraints for possibly global RA ids root_account_id on these tables can be cross-shard, so cannot have an FK constraint. Test plan: - run migration and make sure you can set root_account_id to a global ID e.g. 10000000000001 on an Attachment, AttachmentAssociation, Folder, CommunicationChannel (this ...
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index abc1234..def5678 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,6 +1,6 @@ module ApplicationHelper def set_title(title) - content_for :title, strip_tags(title) + content_for :t...
Fix html escaping in some titles.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index abc1234..def5678 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -5,7 +5,7 @@ end def languages - I18n.fallbacks.keys.concat(I18n.available_locales).uniq + [:fi, :en, :se].conc...
Fix languages list to work even if fallbacks is disabled
diff --git a/app/helpers/safe_params_helper.rb b/app/helpers/safe_params_helper.rb index abc1234..def5678 100644 --- a/app/helpers/safe_params_helper.rb +++ b/app/helpers/safe_params_helper.rb @@ -1,6 +1,6 @@ module SafeParamsHelper - # Rails 5.0 requires to permit parameters if used in url helpers. - # User this hel...
Fix typos in comments [ci skip]
diff --git a/app/models/article_endorsement.rb b/app/models/article_endorsement.rb index abc1234..def5678 100644 --- a/app/models/article_endorsement.rb +++ b/app/models/article_endorsement.rb @@ -6,8 +6,8 @@ after_create :send_endorsement - validates :article_id, uniqueness: { - scope: :user_id, message: "al...
Validate the user association instead
diff --git a/app/models/project/invitations.rb b/app/models/project/invitations.rb index abc1234..def5678 100644 --- a/app/models/project/invitations.rb +++ b/app/models/project/invitations.rb @@ -1,4 +1,4 @@-require_dependency 'extract_emails' +require 'extract_emails' class Project
Use 'require', not 'require_dependency' in extract_emails
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb index abc1234..def5678 100644 --- a/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb +++ b/qa/qa...
Refactor collapse comments end-to-end test To: - Better separate scopes (pre-conditions on before, tests on it) - Remove unnecessary expectation - Replace other unnecessary expectations by page.assert_text - Move variables closer to where they're used
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index abc1234..def5678 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,4 +1,5 @@ class ApplicationController < ActionController::Base protect_from_forgery wi...
Include ItemsHelper within ApplicationController so that the entire application has access to finding items
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index abc1234..def5678 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -4,8 +4,8 @@ before_filter :set_our_current_user def index - @repositories = AqRep...
Select only public repositories and commits of
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index abc1234..def5678 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -3,15 +3,22 @@ # For APIs, you may want to use :null_session instead. protect_from_forg...
Disable CSRF for JSON API
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index abc1234..def5678 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,9 +1,14 @@ class ApplicationController < ActionController::Base + protect_from_forgery w...
Add current user to sentry
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index abc1234..def5678 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -18,7 +18,7 @@ end def user_not_authorized - flash[:alert] = "Access denied." + ...
Write nicer unauthorized flash message
diff --git a/app/controllers/newsletters_controller.rb b/app/controllers/newsletters_controller.rb index abc1234..def5678 100644 --- a/app/controllers/newsletters_controller.rb +++ b/app/controllers/newsletters_controller.rb @@ -14,7 +14,7 @@ end def raw - token = EmailNewsletter.token(full_token) + token ...
Switch to shared token parser.
diff --git a/app/helpers/admin/consultations_helper.rb b/app/helpers/admin/consultations_helper.rb index abc1234..def5678 100644 --- a/app/helpers/admin/consultations_helper.rb +++ b/app/helpers/admin/consultations_helper.rb @@ -1,13 +1,9 @@ module Admin::ConsultationsHelper def consulation_response_help_text(respon...
Change wording of hints on consultation forms After discussion with Alice, we think this wording is more succinct. The key concern is to alert people to the fact that they can upload attachments on the next page, so a shorter message gives more chance that they'll read this info.
diff --git a/app/controllers/alliances_controller.rb b/app/controllers/alliances_controller.rb index abc1234..def5678 100644 --- a/app/controllers/alliances_controller.rb +++ b/app/controllers/alliances_controller.rb @@ -25,7 +25,7 @@ def create if student_union_employee? @alliance = @user.alliances.creat...
Fix delivery of alliance confirmations
diff --git a/app/controllers/gameplays_controller.rb b/app/controllers/gameplays_controller.rb index abc1234..def5678 100644 --- a/app/controllers/gameplays_controller.rb +++ b/app/controllers/gameplays_controller.rb @@ -15,8 +15,11 @@ def destroy night = Night.find(params[:night_id]) + gp_name = Gameplay...
Clean up delete a little
diff --git a/ui_speech_cerevoice.rb b/ui_speech_cerevoice.rb index abc1234..def5678 100644 --- a/ui_speech_cerevoice.rb +++ b/ui_speech_cerevoice.rb @@ -14,7 +14,7 @@ def say(text) text = munge(text) speech_file = @cerevoice.render_speech(text) - system "mpg321 #{speech_file} &" + system "ki...
Kill any previous speech process before starting a new one.
diff --git a/tasks/_default_task.rb b/tasks/_default_task.rb index abc1234..def5678 100644 --- a/tasks/_default_task.rb +++ b/tasks/_default_task.rb @@ -5,4 +5,4 @@ require 'rake' -task default: :gem +task :default => :gem
Make syntax Ruby 1.8 compatible.
diff --git a/util/build_entities.rb b/util/build_entities.rb index abc1234..def5678 100644 --- a/util/build_entities.rb +++ b/util/build_entities.rb @@ -0,0 +1,28 @@+#!/usr/bin/env ruby +require 'open-uri' +require 'uri' + +DTD_URI = 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd' +entities = {} + +dtd = open(DTD_U...
Build entities map from W3C DTD.
diff --git a/cookbooks/zookeeper_cluster/metadata.rb b/cookbooks/zookeeper_cluster/metadata.rb index abc1234..def5678 100644 --- a/cookbooks/zookeeper_cluster/metadata.rb +++ b/cookbooks/zookeeper_cluster/metadata.rb @@ -8,8 +8,6 @@ depends "java" depends "apt" -depends "mountable_volumes"...
Remove 2 dependencies on provides_service and mountable_volumes from zookeeper. These just don't exist anywhere and they break bulk cookbook uploads Former-commit-id: f768344564a6ce0797f36da723c754f01cc60805
diff --git a/juniper-staging.rb b/juniper-staging.rb index abc1234..def5678 100644 --- a/juniper-staging.rb +++ b/juniper-staging.rb @@ -6,5 +6,6 @@ template_file = config['template_file'] unless File.file?(template_file) puts "ERROR: Check the template_file configuration variable is correct (points to a valid tem...
Abort the script with an error signal if the template file doesn't seem to exist
diff --git a/spec/front_matter_parser/loader/yaml_spec.rb b/spec/front_matter_parser/loader/yaml_spec.rb index abc1234..def5678 100644 --- a/spec/front_matter_parser/loader/yaml_spec.rb +++ b/spec/front_matter_parser/loader/yaml_spec.rb @@ -5,7 +5,7 @@ describe FrontMatterParser::Loader::Yaml do describe '::call' do...
Fix test not reflecting a real scenario
diff --git a/lib/acfs/errors.rb b/lib/acfs/errors.rb index abc1234..def5678 100644 --- a/lib/acfs/errors.rb +++ b/lib/acfs/errors.rb @@ -2,6 +2,22 @@ # Acfs base error. # - class Error < StandardError; end + class Error < StandardError + end + + # Response error containing the responsible response object. + ...
Add error classes for not found resources and failed responses.
diff --git a/test/server/metrics.rb b/test/server/metrics.rb index abc1234..def5678 100644 --- a/test/server/metrics.rb +++ b/test/server/metrics.rb @@ -2,7 +2,7 @@ MIN = { test_count:1, app_coverage:100, - test_coverage:100, + test_coverage:99, line_ratio:2.4, hits_ratio:1.0 }
Drop test-coverage limit (of test) to 99%; on CI output varies
diff --git a/test/spec_rack_lock.rb b/test/spec_rack_lock.rb index abc1234..def5678 100644 --- a/test/spec_rack_lock.rb +++ b/test/spec_rack_lock.rb @@ -20,21 +20,19 @@ specify "should call synchronize on lock" do lock = Lock.new env = Rack::MockRequest.env_for("/") - app = Rack::Lock.new(lambda { }, loc...
Fix spec failures and warnings in Rack::Lock under 1.9
diff --git a/lib/steamroller.rb b/lib/steamroller.rb index abc1234..def5678 100644 --- a/lib/steamroller.rb +++ b/lib/steamroller.rb @@ -12,8 +12,16 @@ end.flatten else return nil if block_given? && !yield(data) - require 'ruby-debug' - debugger + begin + require 'ruby-debug' + ...
Add logic for ruby-debug gem version
diff --git a/lib/capistrano/tasks/bundler_package.rake b/lib/capistrano/tasks/bundler_package.rake index abc1234..def5678 100644 --- a/lib/capistrano/tasks/bundler_package.rake +++ b/lib/capistrano/tasks/bundler_package.rake @@ -5,7 +5,7 @@ within release_path do with fetch(:bundle_env_variables, {}) do ...
Remove quiet flag in Capistrano bundler task To enable a more verbose output that helps to follow on the deployment process and debug eventual problems. civio/onodo#373
diff --git a/lib/docs/filters/marionette/clean_html.rb b/lib/docs/filters/marionette/clean_html.rb index abc1234..def5678 100644 --- a/lib/docs/filters/marionette/clean_html.rb +++ b/lib/docs/filters/marionette/clean_html.rb @@ -12,17 +12,21 @@ end def other - css('#source + h2', '#improve', '#sou...
Fix Marionette anchor links and improve readability Fixes #235.
diff --git a/lib/nacre/abstract_resource_collection.rb b/lib/nacre/abstract_resource_collection.rb index abc1234..def5678 100644 --- a/lib/nacre/abstract_resource_collection.rb +++ b/lib/nacre/abstract_resource_collection.rb @@ -41,10 +41,6 @@ resource_params end - def self.resource_class - Order -...
Remove redundant method from AbstractResourceCollection
diff --git a/lib/tasks/business_support_content.rake b/lib/tasks/business_support_content.rake index abc1234..def5678 100644 --- a/lib/tasks/business_support_content.rake +++ b/lib/tasks/business_support_content.rake @@ -3,4 +3,9 @@ task :import_facet_data => :environment do BusinessSupportFacetDataImporter.run ...
Add rake task for bsf locations migrator
diff --git a/vagrant-darwin.gemspec b/vagrant-darwin.gemspec index abc1234..def5678 100644 --- a/vagrant-darwin.gemspec +++ b/vagrant-darwin.gemspec @@ -10,7 +10,7 @@ s.homepage = "https://github.counsyl.com/dev/vagrant-darwin.git" s.summary = "Enables Vagrant to work with Darwin (OS X) guests" s.des...
Include LICENSE and README files in release.
diff --git a/pakyow-realtime/pakyow-realtime.gemspec b/pakyow-realtime/pakyow-realtime.gemspec index abc1234..def5678 100644 --- a/pakyow-realtime/pakyow-realtime.gemspec +++ b/pakyow-realtime/pakyow-realtime.gemspec @@ -32,5 +32,5 @@ s.add_dependency('websocket_parser', '~> 1.0') s.add_dependency('redis', '~> 3...
Remove concurrent-ruby version from gemspec For testing prerelease version
diff --git a/Library/Formula/llvm.rb b/Library/Formula/llvm.rb index abc1234..def5678 100644 --- a/Library/Formula/llvm.rb +++ b/Library/Formula/llvm.rb @@ -1,17 +1,48 @@ require 'formula' +class Clang <Formula + url 'http://llvm.org/releases/2.6/clang-2.6.tar.gz' + homepage 'http://llvm.org/' + md5 '...
Add Clang as an option to LLVM formula
diff --git a/lib/autoprefixer-rails/railtie.rb b/lib/autoprefixer-rails/railtie.rb index abc1234..def5678 100644 --- a/lib/autoprefixer-rails/railtie.rb +++ b/lib/autoprefixer-rails/railtie.rb @@ -26,7 +26,7 @@ Rake::AutoprefixerTasks.new(browsers(app)) end - initializer :setup_autoprefixer, group...
Fix group to work on Rails 4
diff --git a/lib/rss/atom/feed_history/atom.rb b/lib/rss/atom/feed_history/atom.rb index abc1234..def5678 100644 --- a/lib/rss/atom/feed_history/atom.rb +++ b/lib/rss/atom/feed_history/atom.rb @@ -1,3 +1,5 @@+require 'rss/atom/feed_history' + module RSS module Atom class Feed
Add `require` for backward compat
diff --git a/lib/sequenceserver/blast/query.rb b/lib/sequenceserver/blast/query.rb index abc1234..def5678 100644 --- a/lib/sequenceserver/blast/query.rb +++ b/lib/sequenceserver/blast/query.rb @@ -17,7 +17,8 @@ end def sort_hits_by_evalue! - @hits = hits.sort_by(&:evalue) + # change made he...
Sort hits by score when evalue is same. Signed-off-by: Alekhya Munagala <b2aa6119f2bf3cb55fa4719dcdf853cc5042ebcc@gmail.com>
diff --git a/lib/spooky_core/payment_method.rb b/lib/spooky_core/payment_method.rb index abc1234..def5678 100644 --- a/lib/spooky_core/payment_method.rb +++ b/lib/spooky_core/payment_method.rb @@ -27,6 +27,10 @@ def last_name at('last_name') + end + + def full_name + at('full_name') end ...
Add full_name to payment method
diff --git a/site/profile/lib/facter/network_zone.rb b/site/profile/lib/facter/network_zone.rb index abc1234..def5678 100644 --- a/site/profile/lib/facter/network_zone.rb +++ b/site/profile/lib/facter/network_zone.rb @@ -1,17 +1,17 @@ require 'ipaddr' Facter.add(:network_zone) do setcode do - # Exit with 'none' ...
Add condition for empty networking
diff --git a/spec/support/matchers/error_matchers.rb b/spec/support/matchers/error_matchers.rb index abc1234..def5678 100644 --- a/spec/support/matchers/error_matchers.rb +++ b/spec/support/matchers/error_matchers.rb @@ -2,7 +2,10 @@ RSpec::Matchers.define :have_error do |erro| def error_message(record, atributo, ...
Add new path for translations
diff --git a/spec/libraries/high_voltage_pages_spec.rb b/spec/libraries/high_voltage_pages_spec.rb index abc1234..def5678 100644 --- a/spec/libraries/high_voltage_pages_spec.rb +++ b/spec/libraries/high_voltage_pages_spec.rb @@ -0,0 +1,14 @@+require 'rails_helper' + +describe 'High Voltage Pages Action Class', type: :c...
Test for the High Voltage page action class, with our class extension.
diff --git a/recipes/default.rb b/recipes/default.rb index abc1234..def5678 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -20,6 +20,7 @@ chef_gem 'chef-vault' do version node['chef-vault']['version'] + compile_time true if respond_to?(:compile_time) end require 'chef-vault'
Fix chef_gem compat for Chef 12.1.0
diff --git a/DateRangePicker.podspec b/DateRangePicker.podspec index abc1234..def5678 100644 --- a/DateRangePicker.podspec +++ b/DateRangePicker.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'DateRangePicker' - s.version = '1.0' + s.version = '1.0.1' ...
Update the Podspec's version to 1.0.1
diff --git a/app/controllers/api/v1/api_keys_controller.rb b/app/controllers/api/v1/api_keys_controller.rb index abc1234..def5678 100644 --- a/app/controllers/api/v1/api_keys_controller.rb +++ b/app/controllers/api/v1/api_keys_controller.rb @@ -20,7 +20,7 @@ def reset current_user.reset_api_key! - flash[:no...
Update location of rubygems.org credentials No longer using .gemrc, so tell them to update their .gem/credentials file instead! Ref: #694
diff --git a/app/models/task_list.rb b/app/models/task_list.rb index abc1234..def5678 100644 --- a/app/models/task_list.rb +++ b/app/models/task_list.rb @@ -1,6 +1,6 @@ class TaskList < ActiveRecord::Base belongs_to :owner, class_name: User - has_many :tasks, -> { order :priority }, foreign_key: :list_id + has_man...
Destroy associated tasks when deleting a list
diff --git a/scripts/add_img.rb b/scripts/add_img.rb index abc1234..def5678 100644 --- a/scripts/add_img.rb +++ b/scripts/add_img.rb @@ -0,0 +1,48 @@+#!/usr/bin/env ruby + +require 'fileutils' +require 'pathname' +require 'pp' + +unless ARGV.length == 2 then + print "add_img <img_file> <post_file>\n" + exit +end + +img...
Bring the script for images.
diff --git a/arm-eabi-binutils220.rb b/arm-eabi-binutils220.rb index abc1234..def5678 100644 --- a/arm-eabi-binutils220.rb +++ b/arm-eabi-binutils220.rb @@ -0,0 +1,25 @@+require 'formula' + +class ArmEabiBinutils220 <Formula + url 'http://ftp.gnu.org/gnu/binutils/binutils-2.20.1a.tar.bz2' + homepage 'http://www.gnu.o...
Add ARM EABI binutils 2.20
diff --git a/spec/rules_spec.rb b/spec/rules_spec.rb index abc1234..def5678 100644 --- a/spec/rules_spec.rb +++ b/spec/rules_spec.rb @@ -27,14 +27,14 @@ rules.accept?(3).should == true end - it "should reject data that does not match any acceptance rules" do + it "should reject data that does not match any a...
Use the terminology "patterns" wrt to specing Spidr::Rules.
diff --git a/app/models/cart_item.rb b/app/models/cart_item.rb index abc1234..def5678 100644 --- a/app/models/cart_item.rb +++ b/app/models/cart_item.rb @@ -5,4 +5,8 @@ def weight product.weight * quantity end + + def cost + product.price * quantity + end end
Add cost method for CartItem model
diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb index abc1234..def5678 100644 --- a/app/controllers/activities_controller.rb +++ b/app/controllers/activities_controller.rb @@ -9,7 +9,7 @@ filter = PublicActivity::Activity.arel_table[:key].matches("#{params[:filter]...
Revert amount of loaded activities to 100
diff --git a/Casks/opera-beta.rb b/Casks/opera-beta.rb index abc1234..def5678 100644 --- a/Casks/opera-beta.rb +++ b/Casks/opera-beta.rb @@ -1,6 +1,6 @@ cask :v1 => 'opera-beta' do - version '30.0.1835.47' - sha256 '97817b3a4bbf6eb7e92493f241665012f42592b3b404e888ad3cb05f61c8b39c' + version '30.0.1835.49' + sha256 ...
Upgrade Opera Beta.app to v30.0.1835.49
diff --git a/Casks/sourcetree.rb b/Casks/sourcetree.rb index abc1234..def5678 100644 --- a/Casks/sourcetree.rb +++ b/Casks/sourcetree.rb @@ -1,8 +1,8 @@ class Sourcetree < Cask - url 'http://downloads.atlassian.com/software/sourcetree/SourceTree_1.9.1.dmg' + url 'http://downloads.atlassian.com/software/sourcetree/Sou...
Update SourceTree to version 1.9.2
diff --git a/Casks/steermouse.rb b/Casks/steermouse.rb index abc1234..def5678 100644 --- a/Casks/steermouse.rb +++ b/Casks/steermouse.rb @@ -4,4 +4,6 @@ version '4.1.9' sha256 '4704aa8b01842c2e619db546fa045e515ee7e3a94d9d339f4650f2f8684b1280' install 'SteerMouse Installer.app/Contents/Resources/SteerMouse.pkg' ...
Add uninstall stanza for SteerMouse
diff --git a/Casks/switchresx.rb b/Casks/switchresx.rb index abc1234..def5678 100644 --- a/Casks/switchresx.rb +++ b/Casks/switchresx.rb @@ -1,8 +1,8 @@ class Switchresx < Cask url 'http://www.madrau.com/data/switchresx/SwitchResX4.zip' homepage 'http://www.madrau.com' - version '4.x' - sha256 :no_check + vers...
Fix SwitchResX with a version and sha256 to pass test
diff --git a/features/support/app_life_cycle_hooks.rb b/features/support/app_life_cycle_hooks.rb index abc1234..def5678 100644 --- a/features/support/app_life_cycle_hooks.rb +++ b/features/support/app_life_cycle_hooks.rb @@ -7,7 +7,7 @@ After do |scenario| if scenario.failed? - screenshot_embed + # screensho...
Disable automatic screenshotting of failed tests as it slows down test runs during development
diff --git a/delayed_job_web.gemspec b/delayed_job_web.gemspec index abc1234..def5678 100644 --- a/delayed_job_web.gemspec +++ b/delayed_job_web.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |gem| gem.name = "delayed_job_web" - gem.version = "1.2.10" + gem.version = "1.3" gem.author = "E...
Prepare to release version 1.3
diff --git a/lib/gitlab/ci/pipeline/chain/sequence.rb b/lib/gitlab/ci/pipeline/chain/sequence.rb index abc1234..def5678 100644 --- a/lib/gitlab/ci/pipeline/chain/sequence.rb +++ b/lib/gitlab/ci/pipeline/chain/sequence.rb @@ -5,20 +5,19 @@ class Sequence def initialize(pipeline, command, sequence) ...
Reduce pipeline chain life span to minimize side effects
diff --git a/lib/shared/adapters/test_unit_adapter.rb b/lib/shared/adapters/test_unit_adapter.rb index abc1234..def5678 100644 --- a/lib/shared/adapters/test_unit_adapter.rb +++ b/lib/shared/adapters/test_unit_adapter.rb @@ -4,7 +4,7 @@ def self.command(project_path, ruby_interpreter, files) ruby_command = R...
Use full path with test unit files to support ruby 1.9.
diff --git a/dpl-cloud_files.gemspec b/dpl-cloud_files.gemspec index abc1234..def5678 100644 --- a/dpl-cloud_files.gemspec +++ b/dpl-cloud_files.gemspec @@ -1,3 +1,7 @@ require './gemspec_helper' -gemspec_for 'cloud_files', [['net-ssh'], ['mime-types'], ['nokogiri'], ['fog-rackspace']] +if Gem::Version.new(RUBY_VERSI...
Fix cloud_files gemspec: nokogiri <1.10 for ruby <2.3
diff --git a/lib/brightbox-cli/commands/users/update.rb b/lib/brightbox-cli/commands/users/update.rb index abc1234..def5678 100644 --- a/lib/brightbox-cli/commands/users/update.rb +++ b/lib/brightbox-cli/commands/users/update.rb @@ -17,7 +17,7 @@ user = User.find args.first if options[:f] == "-" - ...
Switch to use global `$stdin` Rather than the constant, this uses the global standard input variable instead.
diff --git a/lib/endpoint_base/concerns/response_dsl.rb b/lib/endpoint_base/concerns/response_dsl.rb index abc1234..def5678 100644 --- a/lib/endpoint_base/concerns/response_dsl.rb +++ b/lib/endpoint_base/concerns/response_dsl.rb @@ -25,6 +25,14 @@ payload: payload } end + def add_me...
Create a `add_messages` to ResponseDSL
diff --git a/lib/overcommit/hook/pre_commit/rubo_cop.rb b/lib/overcommit/hook/pre_commit/rubo_cop.rb index abc1234..def5678 100644 --- a/lib/overcommit/hook/pre_commit/rubo_cop.rb +++ b/lib/overcommit/hook/pre_commit/rubo_cop.rb @@ -8,7 +8,7 @@ end def run - result = execute(command + applicable_files) ...
Split file args for RuboCop hook
diff --git a/features/support/env.rb b/features/support/env.rb index abc1234..def5678 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -2,11 +2,9 @@ ENV["RAILS_ENV"] = "test" require File.expand_path(File.dirname(__FILE__) + '/../../config/environment') require 'cucumber/rails/world' -require 'cu...
Fix cucumber configuration for integrity
diff --git a/features/support/vcr.rb b/features/support/vcr.rb index abc1234..def5678 100644 --- a/features/support/vcr.rb +++ b/features/support/vcr.rb @@ -4,7 +4,8 @@ conf.hook_into :webmock conf.cassette_library_dir = 'features/cassettes' conf.default_cassette_options = { :record => :new_episodes } - conf.f...
Remove sensitive data from feature recordings.
diff --git a/spec/unit/battlenet_authentication_spec.rb b/spec/unit/battlenet_authentication_spec.rb index abc1234..def5678 100644 --- a/spec/unit/battlenet_authentication_spec.rb +++ b/spec/unit/battlenet_authentication_spec.rb @@ -5,7 +5,7 @@ let(:auth) { Battlenet::Authentication.new 'private' } before(:each)...
Use UTC time in Authentication spec
diff --git a/app/models/story.rb b/app/models/story.rb index abc1234..def5678 100644 --- a/app/models/story.rb +++ b/app/models/story.rb @@ -15,9 +15,8 @@ def collaborators collaborators = users - collaborators.merge(owner) unless collaborators.include?(owner) - - collaborators + return collaborators ...
Fix issue with AR merge
diff --git a/app/models/thing.rb b/app/models/thing.rb index abc1234..def5678 100644 --- a/app/models/thing.rb +++ b/app/models/thing.rb @@ -2,7 +2,7 @@ has_many :check_outs, dependent: :destroy validates :quantity, numericality: { greater_than_or_equal_to: 0 } - validates :name, presence: true + validates :na...
Add unique validation to Thing Fixes #3
diff --git a/lib/dimples/renderer.rb b/lib/dimples/renderer.rb index abc1234..def5678 100644 --- a/lib/dimples/renderer.rb +++ b/lib/dimples/renderer.rb @@ -12,6 +12,7 @@ context[:pagination] ||= nil output = engine.render(scope, context) { body } + @source.metadata[:rendered_contents] = output ...
Set the rendered_contents in the source's metadata
diff --git a/lib/rubotium/devices.rb b/lib/rubotium/devices.rb index abc1234..def5678 100644 --- a/lib/rubotium/devices.rb +++ b/lib/rubotium/devices.rb @@ -8,7 +8,7 @@ def all raise NoDevicesError if attached_devices.empty? - raise NoMatchedDevicesError if matched_devices.empty? + raise NoMatche...
Handle cases were no match categories have been specified. Since [].reduce( :& ) will return nil
diff --git a/lib/tasks/test_sweet.rb b/lib/tasks/test_sweet.rb index abc1234..def5678 100644 --- a/lib/tasks/test_sweet.rb +++ b/lib/tasks/test_sweet.rb @@ -12,14 +12,19 @@ if TestSweet.verify_initialized ENV['test_sweet-target'] = Motion::Project::App.config.deployment_target || ENV['target'] ENV['te...
Verify application has been built before running tests
diff --git a/merb_datamapper.gemspec b/merb_datamapper.gemspec index abc1234..def5678 100644 --- a/merb_datamapper.gemspec +++ b/merb_datamapper.gemspec @@ -16,7 +16,6 @@ gem.description = "Merb plugin that provides support for datamapper" gem.summary = "Merb plugin that allows you to use datamapper with your ...
Remove invalid directive from gemspec
diff --git a/config/initializers/sidekiq-superworkers.rb b/config/initializers/sidekiq-superworkers.rb index abc1234..def5678 100644 --- a/config/initializers/sidekiq-superworkers.rb +++ b/config/initializers/sidekiq-superworkers.rb @@ -1,4 +1,7 @@ # frozen_string_literal: true + +require 'import_subscription_worker' +...
Remove a zeitwerk initialization warning
diff --git a/lib/atlas/gquery.rb b/lib/atlas/gquery.rb index abc1234..def5678 100644 --- a/lib/atlas/gquery.rb +++ b/lib/atlas/gquery.rb @@ -5,7 +5,6 @@ FILE_SUFFIX = 'gql' DIRECTORY = 'gqueries' - attribute :comments, String attribute :query, String attribute :unit, S...
Remove unnecessary comments attribute on Gquery
diff --git a/lib/dir_friend/f.rb b/lib/dir_friend/f.rb index abc1234..def5678 100644 --- a/lib/dir_friend/f.rb +++ b/lib/dir_friend/f.rb @@ -5,7 +5,7 @@ def initialize(name, level:0) @path = File.expand_path(name) @name = File.basename(@path) - @stat = File.stat(@path) + @stat = File.lstat(@...
Fix a issue when symbolic link included
diff --git a/lib/gir_ffi/core.rb b/lib/gir_ffi/core.rb index abc1234..def5678 100644 --- a/lib/gir_ffi/core.rb +++ b/lib/gir_ffi/core.rb @@ -40,11 +40,6 @@ raise ArgumentError, "#{klass} is not a user-defined class" end - if block_given? - warn "Using define_type with a block is deprecated....
Remove deprecated option of passing a block to GirFFI.define_type
diff --git a/lib/github-pages.rb b/lib/github-pages.rb index abc1234..def5678 100644 --- a/lib/github-pages.rb +++ b/lib/github-pages.rb @@ -1,5 +1,5 @@ class GitHubPages - VERSION = 19 + VERSION = 20 # Jekyll and related dependency versions as used by GitHub Pages. # For more information see:
Bump :gem: version to 20.
diff --git a/lib/iamfindbykey.rb b/lib/iamfindbykey.rb index abc1234..def5678 100644 --- a/lib/iamfindbykey.rb +++ b/lib/iamfindbykey.rb @@ -22,25 +22,23 @@ puts "#{key}: #{value}" end - def keymap - @keymap ||= begin - connection.users.reduce({}) do |m, user| - connection.list_acce...
Speed up the loop a lot
diff --git a/lib/tasks/brew.rake b/lib/tasks/brew.rake index abc1234..def5678 100644 --- a/lib/tasks/brew.rake +++ b/lib/tasks/brew.rake @@ -4,7 +4,7 @@ task :refresh do puts "#{time}: Checking if any brew upgrades are required ..." if brew_outdated? - `brew upgrade && brew cleanup` + puts `brew u...
Print output from upgrade and cleanup.
diff --git a/lib/tasks/temp.rake b/lib/tasks/temp.rake index abc1234..def5678 100644 --- a/lib/tasks/temp.rake +++ b/lib/tasks/temp.rake @@ -21,10 +21,10 @@ :updated_at => update.updated_at, :mark_fixed => update.mark_fixed,...
Set status on new campaign comment
diff --git a/lib/version_info.rb b/lib/version_info.rb index abc1234..def5678 100644 --- a/lib/version_info.rb +++ b/lib/version_info.rb @@ -11,7 +11,7 @@ # end # module VersionInfo - GITHUB_REPO_OWNER = 'churchio' + GITHUB_REPO_OWNER = 'seven1m' GITHUB_REPO_NAME = 'onebody' def current_version
Update github repo owner name
diff --git a/lib/fulmar/service/common_helper_service.rb b/lib/fulmar/service/common_helper_service.rb index abc1234..def5678 100644 --- a/lib/fulmar/service/common_helper_service.rb +++ b/lib/fulmar/service/common_helper_service.rb @@ -13,11 +13,11 @@ end def full_configuration - @config_se...
[FEATURE] Allow direct access to raw configuration
diff --git a/IRC/plugins/I18N/I18N.rb b/IRC/plugins/I18N/I18N.rb index abc1234..def5678 100644 --- a/IRC/plugins/I18N/I18N.rb +++ b/IRC/plugins/I18N/I18N.rb @@ -20,6 +20,7 @@ def on_privmsg(msg) case msg.bot_command when :i18n_reload + I18n.load_path = Dir[File.join(File.dirname(__FILE__), 'locales...
Refresh translation files too during .i18n_reload
diff --git a/resources/common.rb b/resources/common.rb index abc1234..def5678 100644 --- a/resources/common.rb +++ b/resources/common.rb @@ -7,6 +7,7 @@ attribute :path, 'kind_of' => String, :default => '/opt/app/' attribute :owner, 'kind_of' => String, :default => 'chef' attribute :group, 'kind_of' => String, :defau...
Add a mode for the directory git will create
diff --git a/scraperwiki.gemspec b/scraperwiki.gemspec index abc1234..def5678 100644 --- a/scraperwiki.gemspec +++ b/scraperwiki.gemspec @@ -1,14 +1,19 @@-Gem::Specification.new do |s| - s.name = 'scraperwiki' - s.version = '2.0.6' - s.date = '2013-04-04' - s.summary = "ScraperWiki" - s.descr...
Switch gemspec to Bundler's default format
diff --git a/app/inputs/inet_input.rb b/app/inputs/inet_input.rb index abc1234..def5678 100644 --- a/app/inputs/inet_input.rb +++ b/app/inputs/inet_input.rb @@ -0,0 +1,16 @@+class InetInput < Formtastic::Inputs::StringInput + def input_html_options + super.tap do |options| + options[:class] = [options[:class],...
Add input for INET type
diff --git a/burlesque-client.gemspec b/burlesque-client.gemspec index abc1234..def5678 100644 --- a/burlesque-client.gemspec +++ b/burlesque-client.gemspec @@ -8,9 +8,9 @@ spec.version = Burlesque::VERSION spec.authors = ['Gregory Eremin'] spec.email = ['g@erem.in'] - spec.summary = ...
Add gem summary and description
diff --git a/spec/client_spec.rb b/spec/client_spec.rb index abc1234..def5678 100644 --- a/spec/client_spec.rb +++ b/spec/client_spec.rb @@ -2,7 +2,7 @@ describe EventGirl::Client do - subject { described_class.new('http://example.com', 'foobar') } + subject { described_class.new('http://example.com/incoming_even...
Test with mocked http request
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -48,12 +48,6 @@ } end -class ROM::Mapper - def self.build(header, model) - new(Mapper::Loader::ObjectBuilder.new(header, model), Mapper::Dumper.new(header, model)) - end ...
Update to work with latest API changes in relation/mapper
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,7 +1,7 @@ require 'config/boot' RSpec.configure do |config| - include Rack::Test::Methods + config.include Rack::Test::Methods def app Acme::Application
Fix include syntax in RSpec configuration
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -15,4 +15,7 @@ end config.shared_context_metadata_behavior = :apply_to_host_groups + + config.filter_run_including :focus => true + config.run_all_when_everything_filtered...
Allow focusing on examples in RSpec
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -22,11 +22,12 @@ end def mock_mapper(model_class) - Class.new(DataMapper::Mapper) do - model model_class + Class.new(DataMapper::Mapper::Relation) do + model...
Improve model and mapper mocking in specs
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -8,15 +8,11 @@ require 'capybara' require 'capybara/dsl' -$LOAD_PATH << './test_site' $LOAD_PATH << './lib' +$LOAD_PATH << './features/support' require 'site_prism' -require...
Fix Unit tests on CI