diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/week-9/ruby-review-1/ruby-review.rb b/week-9/ruby-review-1/ruby-review.rb index abc1234..def5678 100644 --- a/week-9/ruby-review-1/ruby-review.rb +++ b/week-9/ruby-review-1/ruby-review.rb @@ -0,0 +1,139 @@+# Create a Car Class from User Stories + + +# I worked on this challenge [by myself, with: ]. + + +# ...
Add ruby review 1 again
diff --git a/config/initializers/logging.rb b/config/initializers/logging.rb index abc1234..def5678 100644 --- a/config/initializers/logging.rb +++ b/config/initializers/logging.rb @@ -1,4 +1,5 @@ def log(msg, level = :info) + msg = msg.to_s if Sidekiq::Logging.logger Sidekiq::Logging.logger.send level, msg ...
Convert log message to format; fails on array, int, etc.
diff --git a/cf-cli.rb b/cf-cli.rb index abc1234..def5678 100644 --- a/cf-cli.rb +++ b/cf-cli.rb @@ -9,7 +9,7 @@ depends_on :arch => :x86_64 - conflicts_with "cloudfoundry-cli", :because => "the Pivotal tap ships an older cli distribution" + conflicts_with "pivotal/tap/cloudfoundry-cli", :because => "the Pivota...
Use fully-qualified tap name in conflicts_with Signed-off-by: Muhammad Altaf <62c4feecf50ce9eaca6c8296bee7297f5ed184af@gmail.com>
diff --git a/plugins/morse.rb b/plugins/morse.rb index abc1234..def5678 100644 --- a/plugins/morse.rb +++ b/plugins/morse.rb @@ -1,7 +1,7 @@ class Morse < Linkbot::Plugin Linkbot::Plugin.register('morse', self, { - :message => {:regex => /\A[\s\/\.-]+\z/i, :handler => :on_message} + :message => {:regex => /\...
Support | as spaces and ? for unmappable characters.
diff --git a/app/policies/document_policy.rb b/app/policies/document_policy.rb index abc1234..def5678 100644 --- a/app/policies/document_policy.rb +++ b/app/policies/document_policy.rb @@ -17,20 +17,4 @@ alias_method :unpublish?, :publish? alias_method :discard?, :publish? - - def user_organisation_owns_documen...
Remove redundant methods from DocumentPolicy DocumentPolicy inherits from ApplicationPolicy where these methods are already defined, so we can drop them.
diff --git a/config.ru b/config.ru index abc1234..def5678 100644 --- a/config.ru +++ b/config.ru @@ -1,6 +1,7 @@ # This file is used by Rack-based servers to start the application. unless defined?(PhusionPassenger) + require 'unicorn' # Unicorn self-process killer require 'unicorn/worker_killer'
Fix 'uninitialized constant Unicorn' error
diff --git a/config.ru b/config.ru index abc1234..def5678 100644 --- a/config.ru +++ b/config.ru @@ -13,6 +13,16 @@ ). reject { |key, _| key == 'HTTP_ACCEPT_ENCODING' } end + + def rewrite_response(response) + status, headers, body = response + + [ + status, + headers.reject { |key, _| ...
Remove Status header from response gov.uk sends this header, but the Rack specification says that it shouldn't be part of the response.
diff --git a/acceptance/tests/reports/basic_event_query.rb b/acceptance/tests/reports/basic_event_query.rb index abc1234..def5678 100644 --- a/acceptance/tests/reports/basic_event_query.rb +++ b/acceptance/tests/reports/basic_event_query.rb @@ -0,0 +1,70 @@+require 'json' +require 'time' +require 'uri' + +test_name "va...
Add basic acceptance test for event queries
diff --git a/cocoapods-bugsnag.gemspec b/cocoapods-bugsnag.gemspec index abc1234..def5678 100644 --- a/cocoapods-bugsnag.gemspec +++ b/cocoapods-bugsnag.gemspec @@ -6,11 +6,17 @@ spec.summary = "To get meaningful stacktraces from your crashes, the Bugsnag service needs your dSYM file for your build. This plugin adds ...
[gemspec] Fix specification warning, add cocoapods dependency
diff --git a/lib/capistrano/tasks/nexus.rake b/lib/capistrano/tasks/nexus.rake index abc1234..def5678 100644 --- a/lib/capistrano/tasks/nexus.rake +++ b/lib/capistrano/tasks/nexus.rake @@ -1,6 +1,6 @@ namespace :nexus do def strategy - @strategy ||= Capistrano::Nexus.new(self, Capistrano::Nexus::DefaultStrategy) ...
Allow overriding the default strategy
diff --git a/lib/custom_public_exceptions.rb b/lib/custom_public_exceptions.rb index abc1234..def5678 100644 --- a/lib/custom_public_exceptions.rb +++ b/lib/custom_public_exceptions.rb @@ -1,7 +1,8 @@ class CustomPublicExceptions < ActionDispatch::PublicExceptions def call(env) status = env["PATH_INFO"][1..-1] ...
Add logic to our customer dispatcher to catch 500 errors in addition to 400 errors.
diff --git a/lib/discordrb/events/message.rb b/lib/discordrb/events/message.rb index abc1234..def5678 100644 --- a/lib/discordrb/events/message.rb +++ b/lib/discordrb/events/message.rb @@ -1,4 +1,4 @@-module Discordrb +module Discordrb::Events class MessageEvent attr_reader :message
Use the proper namespace for MessageEvent
diff --git a/app/controllers/password_resets_controller.rb b/app/controllers/password_resets_controller.rb index abc1234..def5678 100644 --- a/app/controllers/password_resets_controller.rb +++ b/app/controllers/password_resets_controller.rb @@ -28,13 +28,25 @@ return end - @user.password_confirmation = para...
Add Provident User From Entering Blanks Add validation to provident the User from entering blanks into the Reset Password form because they should not be doing so. Also this will make the site hard to use since they having if they do not enter a password then they would have to do the reset password again.
diff --git a/lib/panther/operation/errors.rb b/lib/panther/operation/errors.rb index abc1234..def5678 100644 --- a/lib/panther/operation/errors.rb +++ b/lib/panther/operation/errors.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Panther module Operation - class OperationError + class OperationError <...
Make OperationError inherit from StandardError
diff --git a/lib/voicearchive/task_client.rb b/lib/voicearchive/task_client.rb index abc1234..def5678 100644 --- a/lib/voicearchive/task_client.rb +++ b/lib/voicearchive/task_client.rb @@ -11,10 +11,10 @@ JSON.parse(response.body) end - def create_retake(task_id, reason_id) - response = call("task/...
Add support for custom params on the create retake method
diff --git a/rconomic.gemspec b/rconomic.gemspec index abc1234..def5678 100644 --- a/rconomic.gemspec +++ b/rconomic.gemspec @@ -17,7 +17,7 @@ s.version = Rconomic::VERSION s.platform = Gem::Platform::RUBY - s.add_runtime_dependency "savon", "~> 2.2", "< 2.11.2" + s.add_runtime_dependency "savon", "~> 2...
Revert "Force usage of Savon prior to 2.11.2" This reverts commit 3d653902f78c14788dc62e993da658f8f53f59a2. Now that we no longer need to support connect_with_credentials, we don't need to monkeypatch Savon, thus we can work on newer versions as well, yay!
diff --git a/recipes/rspec.rb b/recipes/rspec.rb index abc1234..def5678 100644 --- a/recipes/rspec.rb +++ b/recipes/rspec.rb @@ -1,4 +1,4 @@-gem 'rspec-rails', '>= 2.0.0.beta.22', :group => [:development, :test] +gem 'rspec-rails', '>= 2.0.1', :group => [:development, :test] stategies << lambda do generate 'rspec...
Update RSpec to version 2.0.1
diff --git a/test/functional/browse_controller_test.rb b/test/functional/browse_controller_test.rb index abc1234..def5678 100644 --- a/test/functional/browse_controller_test.rb +++ b/test/functional/browse_controller_test.rb @@ -0,0 +1,41 @@+require_relative "../test_helper" + +class BrowseControllerTest < ActionContro...
Add tests for browse controller
diff --git a/hero_mapper/app/controllers/heroes_controller.rb b/hero_mapper/app/controllers/heroes_controller.rb index abc1234..def5678 100644 --- a/hero_mapper/app/controllers/heroes_controller.rb +++ b/hero_mapper/app/controllers/heroes_controller.rb @@ -8,7 +8,7 @@ end def all - url = 'https://gateway.marv...
Update api query to maximum limit
diff --git a/week-4/factorial/my_solution.rb b/week-4/factorial/my_solution.rb index abc1234..def5678 100644 --- a/week-4/factorial/my_solution.rb +++ b/week-4/factorial/my_solution.rb @@ -10,7 +10,7 @@ if number == 0 return 1 else - while number > n + while number > 0 x = x * number numbe...
Add final changes to factorial solution
diff --git a/app/controllers/review_controller.rb b/app/controllers/review_controller.rb index abc1234..def5678 100644 --- a/app/controllers/review_controller.rb +++ b/app/controllers/review_controller.rb @@ -6,8 +6,8 @@ @incomplete = {} Body.all.each do |b| @incomplete[b.state] = [] - @incomplete[...
Review: Fix duplicate papers, lower min length for ministry name
diff --git a/app/controllers/routes_controller.rb b/app/controllers/routes_controller.rb index abc1234..def5678 100644 --- a/app/controllers/routes_controller.rb +++ b/app/controllers/routes_controller.rb @@ -1,23 +1,26 @@ require 'lib/route_collection' +require 'lib/engine_route_collection' module Roots class Ro...
Use new EngineRouteCollection in controller
diff --git a/app/helpers/authentication_helper.rb b/app/helpers/authentication_helper.rb index abc1234..def5678 100644 --- a/app/helpers/authentication_helper.rb +++ b/app/helpers/authentication_helper.rb @@ -19,7 +19,7 @@ end def api_token - @api_token ||= params[:api_token] + @api_token ||= request['X-AP...
Allow authentication with X-API-TOKEN headder
diff --git a/scube-cli.gemspec b/scube-cli.gemspec index abc1234..def5678 100644 --- a/scube-cli.gemspec +++ b/scube-cli.gemspec @@ -17,6 +17,7 @@ s.add_dependency 'faraday', '~> 0.9' s.add_dependency 'faraday_middleware', '~> 0.9' + s.add_dependency 'id3tag', '~> 0.8' s.add_development_dependency 'aruba',...
Declare id3tag gem as runtime dependency
diff --git a/app/models/eventable.rb b/app/models/eventable.rb index abc1234..def5678 100644 --- a/app/models/eventable.rb +++ b/app/models/eventable.rb @@ -6,7 +6,7 @@ belongs_to :created_by, :foreign_key => "created_by_id", :class_name => "Person", :dependent => :destroy has_many :events, :as => :eventable, :dep...
Fix typo so that created_by in Eventables is set correctly
diff --git a/lib/formtastic-bootstrap/helpers/input_helper.rb b/lib/formtastic-bootstrap/helpers/input_helper.rb index abc1234..def5678 100644 --- a/lib/formtastic-bootstrap/helpers/input_helper.rb +++ b/lib/formtastic-bootstrap/helpers/input_helper.rb @@ -16,6 +16,20 @@ raise Formtastic::UnknownInputError, "...
Support for non standard input classes Avoids the exception when using an input class not defined in FormtasticBootstrap namespace. For example, this error raises when using activeadmin-select2 gem with FormtasticBootstrap form builder.
diff --git a/lib/luban/deployment/packages/monit/installer.rb b/lib/luban/deployment/packages/monit/installer.rb index abc1234..def5678 100644 --- a/lib/luban/deployment/packages/monit/installer.rb +++ b/lib/luban/deployment/packages/monit/installer.rb @@ -3,8 +3,6 @@ module Packages class Monit cla...
Use "etc" as the default search path for control file
diff --git a/app/models/tree_node.rb b/app/models/tree_node.rb index abc1234..def5678 100644 --- a/app/models/tree_node.rb +++ b/app/models/tree_node.rb @@ -1,7 +1,7 @@ class TreeNode attr_reader :taxon, :children - delegate :title, :base_path, :content_id, :parent_taxons, :parent_taxons=, to: :taxon attr_access...
Remove unused methods in TreeNode
diff --git a/scaffolding_extensions.gemspec b/scaffolding_extensions.gemspec index abc1234..def5678 100644 --- a/scaffolding_extensions.gemspec +++ b/scaffolding_extensions.gemspec @@ -1,6 +1,6 @@ spec = Gem::Specification.new do |s| s.name = "scaffolding_extensions" - s.version = '1.1.5' + s.version = '1.1.6' ...
Add LICENSE and documenation files to the gem RDoc; Bump version to 1.1.6
diff --git a/etc/deploy/tasks/doctrine.rake b/etc/deploy/tasks/doctrine.rake index abc1234..def5678 100644 --- a/etc/deploy/tasks/doctrine.rake +++ b/etc/deploy/tasks/doctrine.rake @@ -26,7 +26,7 @@ desc "Execute doctrine migrations" task :migrate do on roles(:db) do - symfo...
Fix deployment config when there are no migrations
diff --git a/revenant.gemspec b/revenant.gemspec index abc1234..def5678 100644 --- a/revenant.gemspec +++ b/revenant.gemspec @@ -2,19 +2,16 @@ Gem::Specification.new do |s| s.name = %q{revenant} - s.version = "0.0.2" + s.version = "0.0.3" s.required_rubygems_version = Gem::Requirement.new(">= 1.3.7") s.a...
Add missing LICENSE, README, and example files to gemspec
diff --git a/csv_shaper.gemspec b/csv_shaper.gemspec index abc1234..def5678 100644 --- a/csv_shaper.gemspec +++ b/csv_shaper.gemspec @@ -13,6 +13,8 @@ comes with support for it's own template handling. } + gem.licenses = ['MIT'] + gem.homepage = "http://github.com/paulspringett/csv_shaper" g...
Add MIT license to gemspec
diff --git a/spec/factories.rb b/spec/factories.rb index abc1234..def5678 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -8,6 +8,7 @@ factory :entry do user + date Time.zone.now body 'Entry body' end
Add date to Entry factory
diff --git a/chrono_model.gemspec b/chrono_model.gemspec index abc1234..def5678 100644 --- a/chrono_model.gemspec +++ b/chrono_model.gemspec @@ -16,4 +16,5 @@ gem.version = ChronoModel::VERSION gem.add_dependency "activerecord", "~> 3.0" + gem.add_dependency "pg" end
Add the PG driver as an explicit dependency
diff --git a/devise-dummy_authenticable.gemspec b/devise-dummy_authenticable.gemspec index abc1234..def5678 100644 --- a/devise-dummy_authenticable.gemspec +++ b/devise-dummy_authenticable.gemspec @@ -18,6 +18,8 @@ spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = %w(lib) + s...
Add Devise as a dependency
diff --git a/NSData+TDTImageMIMEDetection.podspec b/NSData+TDTImageMIMEDetection.podspec index abc1234..def5678 100644 --- a/NSData+TDTImageMIMEDetection.podspec +++ b/NSData+TDTImageMIMEDetection.podspec @@ -3,7 +3,7 @@ s.version = "0.1.0" s.summary = "Category on NSData to check if it represent...
Remove text for license from podspec
diff --git a/lib/sequel/extensions/seek_pagination.rb b/lib/sequel/extensions/seek_pagination.rb index abc1234..def5678 100644 --- a/lib/sequel/extensions/seek_pagination.rb +++ b/lib/sequel/extensions/seek_pagination.rb @@ -2,35 +2,33 @@ require 'sequel/extensions/seek_pagination/version' module Sequel - class Dat...
Move SeekPagination out of Sequel::Dataset to Sequel, to keep it simple.
diff --git a/lib/sparkle_formation/resources/azure.rb b/lib/sparkle_formation/resources/azure.rb index abc1234..def5678 100644 --- a/lib/sparkle_formation/resources/azure.rb +++ b/lib/sparkle_formation/resources/azure.rb @@ -9,7 +9,7 @@ class Azure < Resources # Characters to be removed from supplied key o...
Update type character replacement to be regular underscore
diff --git a/lib/tasks/taxonomy/fixup_taxon_urls.rake b/lib/tasks/taxonomy/fixup_taxon_urls.rake index abc1234..def5678 100644 --- a/lib/tasks/taxonomy/fixup_taxon_urls.rake +++ b/lib/tasks/taxonomy/fixup_taxon_urls.rake @@ -0,0 +1,39 @@+namespace :taxonomy do + desc "fixup taxon URLs" + task fixup_taxon_urls: :envir...
Add rake task to update taxon URLs
diff --git a/kapachow_yo.rb b/kapachow_yo.rb index abc1234..def5678 100644 --- a/kapachow_yo.rb +++ b/kapachow_yo.rb @@ -18,6 +18,7 @@ fail unless CONFIG @gmail = nil @debug = CONFIG['debug_logging'] + @yo_attempts = 0 Yo.api_key = CONFIG['yo_api_key'] check end @...
Debug logging and multiple Yo attempts if sending fails.
diff --git a/minimal-mistakes-jekyll.gemspec b/minimal-mistakes-jekyll.gemspec index abc1234..def5678 100644 --- a/minimal-mistakes-jekyll.gemspec +++ b/minimal-mistakes-jekyll.gemspec @@ -15,14 +15,13 @@ f.match(%r{^(assets|_(includes|layouts|sass)/|(LICENSE|README|CHANGELOG)((\.(txt|md|markdown)|$)))}i) end ...
Change Jekyll to a runtime dependency
diff --git a/spec/centos/services_spec.rb b/spec/centos/services_spec.rb index abc1234..def5678 100644 --- a/spec/centos/services_spec.rb +++ b/spec/centos/services_spec.rb @@ -19,3 +19,11 @@ describe service('sshd') do it { should be_enabled } end + +describe service('ntpd') do + it { should be_enabled } +end + +...
Make sure ntpd and ntpdate are enabled
diff --git a/spec/classes/mod/dir_spec.rb b/spec/classes/mod/dir_spec.rb index abc1234..def5678 100644 --- a/spec/classes/mod/dir_spec.rb +++ b/spec/classes/mod/dir_spec.rb @@ -0,0 +1,27 @@+describe 'apache::mod::dir', :type => :class do + let :pre_condition do + 'include apache' + end + context "on a Debian OS" ...
Add basic spec test for mod_dir Note: No package test as it seems mod_dir is distributed _with_ the Apache package.
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index abc1234..def5678 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -1,10 +1,16 @@ require 'beaker-rspec' -hosts.each do |host| - # Install Puppet - install_package host, 'rubygems' - on host, 'gem i...
Make sure we handle PE properly.
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index abc1234..def5678 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -1,11 +1,12 @@+# This file is completely managed via modulesync require 'voxpupuli/acceptance/spec_helper_acceptance' -configure_beak...
Fix module dependencies for acceptance tests
diff --git a/performance/rubinius.rb b/performance/rubinius.rb index abc1234..def5678 100644 --- a/performance/rubinius.rb +++ b/performance/rubinius.rb @@ -18,4 +18,5 @@ end profile { 10000.times { Phony.normalize "+81-3-9999-9999" } } -profile { 10000.times { Phony.format "81399999999" } }+profile { 10000.times { ...
Add plausible? to performance script.
diff --git a/lib/cli.rb b/lib/cli.rb index abc1234..def5678 100644 --- a/lib/cli.rb +++ b/lib/cli.rb @@ -15,7 +15,7 @@ def ask(question, default=nil, valid_response=nil, invalid_message=nil) loop do print "#{question}" - print "[#{default}]" if default + print " [#{default}]" if default p...
Add space between question and default in ask
diff --git a/Casks/intellij-idea-ce.rb b/Casks/intellij-idea-ce.rb index abc1234..def5678 100644 --- a/Casks/intellij-idea-ce.rb +++ b/Casks/intellij-idea-ce.rb @@ -1,6 +1,6 @@ cask :v1 => 'intellij-idea-ce' do - version '15.0.1' - sha256 '70715153d78808493bd6f3da839b2f6872e4f94c423ca1f0d9fc848503a7e3ff' + version '...
Update IntelliJ Idea CE to v15.0.2
diff --git a/contrib/requirements-warning.rb b/contrib/requirements-warning.rb index abc1234..def5678 100644 --- a/contrib/requirements-warning.rb +++ b/contrib/requirements-warning.rb @@ -1,24 +1,19 @@-DEBUG = false - # Get the commits before the merge # ex. heads = ["<latest commit of master>", "<previous commit ...
Fix falsy test in pip requirements hook
diff --git a/cf-cli.rb b/cf-cli.rb index abc1234..def5678 100644 --- a/cf-cli.rb +++ b/cf-cli.rb @@ -5,7 +5,7 @@ head 'https://cli.run.pivotal.io/edge?arch=macosx64&source=homebrew' url 'https://cli.run.pivotal.io/stable?release=macosx64-binary&version=6.18.0&source=homebrew' version '6.18.0' - sha256 '9a60d75...
Update the sha256 of 6.18.0 [fixes #119335073]
diff --git a/core/app/models/spree/promotion/rules/user.rb b/core/app/models/spree/promotion/rules/user.rb index abc1234..def5678 100644 --- a/core/app/models/spree/promotion/rules/user.rb +++ b/core/app/models/spree/promotion/rules/user.rb @@ -6,7 +6,7 @@ has_many :promotion_rule_users, class_name: 'Spree::P...
Fix wrong association class bug in User PromotionRule We have a custom User class in our app. It is unsurprisingly called "User". The `Spree::Promotion::Rules::User` class has an association to `:users` set, where the class name is bound to be `::Spree.user_class`. In our app, this evaluates to `User`. Since the names...
diff --git a/spec/unit/veritas/tuple/class_methods/coerce_spec.rb b/spec/unit/veritas/tuple/class_methods/coerce_spec.rb index abc1234..def5678 100644 --- a/spec/unit/veritas/tuple/class_methods/coerce_spec.rb +++ b/spec/unit/veritas/tuple/class_methods/coerce_spec.rb @@ -20,7 +20,7 @@ it { should be_instance_of(...
Change spec to use a stronger matcher
diff --git a/db/migrate/20141231192544_allow_null_for_project_id_on_transactions.rb b/db/migrate/20141231192544_allow_null_for_project_id_on_transactions.rb index abc1234..def5678 100644 --- a/db/migrate/20141231192544_allow_null_for_project_id_on_transactions.rb +++ b/db/migrate/20141231192544_allow_null_for_project_i...
Make project_id nullable in database fpr transactions
diff --git a/db/migrate/20170402231018_remove_index_for_users_current_sign_in_at.rb b/db/migrate/20170402231018_remove_index_for_users_current_sign_in_at.rb index abc1234..def5678 100644 --- a/db/migrate/20170402231018_remove_index_for_users_current_sign_in_at.rb +++ b/db/migrate/20170402231018_remove_index_for_users_c...
Fix RuboCop for removing index
diff --git a/Library/Formula/gqview.rb b/Library/Formula/gqview.rb index abc1234..def5678 100644 --- a/Library/Formula/gqview.rb +++ b/Library/Formula/gqview.rb @@ -0,0 +1,14 @@+require 'formula' + +class Gqview <Formula + url 'http://downloads.sourceforge.net/project/gqview/gqview/2.0.4/gqview-2.0.4.tar.gz' + homepa...
Add formula for GQview, a gtk-based image browser. Signed-off-by: Adam Vandenberg <34c2b6407fd5a10249a15d699d40f9ed1782e98c@gmail.com>
diff --git a/Library/Formula/o-make.rb b/Library/Formula/o-make.rb index abc1234..def5678 100644 --- a/Library/Formula/o-make.rb +++ b/Library/Formula/o-make.rb @@ -31,3 +31,16 @@ module Exec = struct (* +diff --git a/OMakefile b/OMakefile +index 9b77a25..1d61d70 100644 +--- a/OMakefile ++++ b/OMakefile +@@ -57...
Patch OMake to build under OCaml 3.12 Signed-off-by: Adam Vandenberg <34c2b6407fd5a10249a15d699d40f9ed1782e98c@gmail.com>
diff --git a/app/controllers/api/drops_controller.rb b/app/controllers/api/drops_controller.rb index abc1234..def5678 100644 --- a/app/controllers/api/drops_controller.rb +++ b/app/controllers/api/drops_controller.rb @@ -3,6 +3,9 @@ def index if params[:longitude] && params[:latitude] + places_within_radi...
Add active record queries to retrieve drops within radius
diff --git a/app/helpers/multi_year_charts_helper.rb b/app/helpers/multi_year_charts_helper.rb index abc1234..def5678 100644 --- a/app/helpers/multi_year_charts_helper.rb +++ b/app/helpers/multi_year_charts_helper.rb @@ -11,11 +11,6 @@ def can_use_as_myc_scenario?(saved_scenario) scenario = saved_scenario.scen...
Allow MYC to use scenarios from any region Ref #3081
diff --git a/lib/after_do/logging/aspect.rb b/lib/after_do/logging/aspect.rb index abc1234..def5678 100644 --- a/lib/after_do/logging/aspect.rb +++ b/lib/after_do/logging/aspect.rb @@ -35,7 +35,7 @@ end def id(object) - "[#{id}]" if object.respond_to?(:id) + "[#{object.id}]" if object.respo...
Fix object id message on log
diff --git a/app/representers/service_representer.rb b/app/representers/service_representer.rb index abc1234..def5678 100644 --- a/app/representers/service_representer.rb +++ b/app/representers/service_representer.rb @@ -19,5 +19,6 @@ property :short_desc property :urls property :wait + property :updated_at ...
Add updated_at field to service representer
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index abc1234..def5678 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -1,5 +1,10 @@ class GroupsController < ApplicationController def inquire + end + + def reassign + curren...
Add a reassign route in the Group Controller. This route gives the user the ability to re-set their group to a nil status. The user will then be redirected to a form in which they can input their new neighborhood.
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index abc1234..def5678 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -0,0 +1,40 @@+class IssuesController < ApplicationController + + def index + @issues_report = Issue.aggregat...
Add methods to create, update, and view summary of issues pertaining to a congressional office.
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index abc1234..def5678 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -7,7 +7,12 @@ def show @topic = Topic.find(params[:id]) - render json: @topic.responses_json + ca...
Update topics controller to return the proper JSON response depending on topic
diff --git a/app/models/miq_web_service_worker.rb b/app/models/miq_web_service_worker.rb index abc1234..def5678 100644 --- a/app/models/miq_web_service_worker.rb +++ b/app/models/miq_web_service_worker.rb @@ -27,4 +27,15 @@ super Api::ApiConfig.collections.each { |_k, v| v.klass.try(:constantize).try(:descenda...
Enable httpd in the API pod - Add volume mounts for httpd configuration - Change the Rails port to 3001
diff --git a/lib/guard/rspectacle/runner.rb b/lib/guard/rspectacle/runner.rb index abc1234..def5678 100644 --- a/lib/guard/rspectacle/runner.rb +++ b/lib/guard/rspectacle/runner.rb @@ -1,11 +1,17 @@ # coding: utf-8 +require 'guard/rspectacle/notifier' + require 'rspec/core/runner' +require 'rspec/core/command_line' ...
Reset RSpec world and configuration.
diff --git a/lib/compare.rb b/lib/compare.rb index abc1234..def5678 100644 --- a/lib/compare.rb +++ b/lib/compare.rb @@ -31,5 +31,7 @@ end end -evaluate_turn -print_turn_result +if __FILE__ == $0 + evaluate_turn + print_turn_result +end
Add evaluation code example for run in place
diff --git a/lib/lita/handlers/web_title.rb b/lib/lita/handlers/web_title.rb index abc1234..def5678 100644 --- a/lib/lita/handlers/web_title.rb +++ b/lib/lita/handlers/web_title.rb @@ -12,7 +12,7 @@ def parse_uri_request(request) requestUri = URI::extract(request.message.body, URI_PROTOCOLS).first - ...
Use consistent style for ifs
diff --git a/config/initializers/site_settings.rb b/config/initializers/site_settings.rb index abc1234..def5678 100644 --- a/config/initializers/site_settings.rb +++ b/config/initializers/site_settings.rb @@ -1,3 +1,7 @@ RailsMultisite::ConnectionManagement.each_connection do - SiteSetting.refresh! + begin + SiteS...
Fix error during db:migrate on a new database
diff --git a/duckduckgo.gemspec b/duckduckgo.gemspec index abc1234..def5678 100644 --- a/duckduckgo.gemspec +++ b/duckduckgo.gemspec @@ -13,14 +13,6 @@ spec.homepage = 'https://github.com/stevesoltys/duckduckgo' spec.license = 'MIT' - # Prevent pushing this gem to RubyGems.org by setting 'allowed_pus...
Allow for pushing to RubyGems in gemspec
diff --git a/app/services/comment_look_manager.rb b/app/services/comment_look_manager.rb index abc1234..def5678 100644 --- a/app/services/comment_look_manager.rb +++ b/app/services/comment_look_manager.rb @@ -1,5 +1,7 @@ class CommentLookManager def self.comment_look(user, comment) + return unless user + par...
Return gracefully if no user. We know this is going to happen when comment looks are serlialized in the event stream.
diff --git a/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb b/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb index abc1234..def5678 100644 --- a/app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb +++ b/app/serializers/api/admin/for_order_cycle/enterprise_serialize...
Remove unnecessary order statement, the relation will only be used for counting products
diff --git a/cookbooks/vagrant/recipes/windows.rb b/cookbooks/vagrant/recipes/windows.rb index abc1234..def5678 100644 --- a/cookbooks/vagrant/recipes/windows.rb +++ b/cookbooks/vagrant/recipes/windows.rb @@ -1,6 +1,5 @@ # Make the path Windows-style if we're on Windows -package_name = node[:vagrant][:gem_name] -packag...
Windows: Use the new chef-built gem
diff --git a/lib/fauxhai.rb b/lib/fauxhai.rb index abc1234..def5678 100644 --- a/lib/fauxhai.rb +++ b/lib/fauxhai.rb @@ -1,8 +1,8 @@ module Fauxhai - require 'fauxhai/exception' - require 'fauxhai/fetcher' - require 'fauxhai/mocker' - require 'fauxhai/version' + autoload :Exception, 'fauxhai/exception' + autoload...
Switch these to autoloads to avoid loading net-ssh unless you actually use the Fetcher system.
diff --git a/railties/test/commands/dev_cache_test.rb b/railties/test/commands/dev_cache_test.rb index abc1234..def5678 100644 --- a/railties/test/commands/dev_cache_test.rb +++ b/railties/test/commands/dev_cache_test.rb @@ -22,8 +22,8 @@ test 'dev:cache deletes file and outputs message' do Dir.chdir(app_p...
Clarify the need to run command twice. We had 2 pull requests erronously trying to remove the first command. Add some comments for clarity.
diff --git a/config.rb b/config.rb index abc1234..def5678 100644 --- a/config.rb +++ b/config.rb @@ -1,6 +1,5 @@ # Compass configuration, used by cartodb UI grunt task. # Require any additional compass plugins here. - # Set this to the root of your project when deployed: http_path = "/"
Revert "check that canceling still working" This reverts commit cae99cbb58a1befb8729e8fd54d31c0593964f1d.
diff --git a/config.ru b/config.ru index abc1234..def5678 100644 --- a/config.ru +++ b/config.ru @@ -2,6 +2,7 @@ configure do set :auth_token, 'YOUR_AUTH_TOKEN' + set :default_dashboard, 'tv' helpers do def protected! @@ -15,4 +16,4 @@ run Sinatra::Application.sprockets end -run Sinatra::Applicatio...
Set tv as default route.
diff --git a/config.ru b/config.ru index abc1234..def5678 100644 --- a/config.ru +++ b/config.ru @@ -5,10 +5,14 @@ require "./lib/identity" +# initialization/configuration Airbrake.configure do |config| config.api_key = Identity::Config.airbrake_api_key end if Identity::Config.airbrake_api_key Excon.defaults[...
Use UUIDs for request identifiers
diff --git a/config.ru b/config.ru index abc1234..def5678 100644 --- a/config.ru +++ b/config.ru @@ -3,9 +3,9 @@ require ::File.expand_path('../config/environment', __FILE__) run Prometheus20::Application -#require 'unicorn/oob_gc' -# -#use Unicorn::OobGC, 10 +require 'unicorn/oob_gc' +GC.disable # Don't run GC dur...
Enable Out of band GC
diff --git a/lib/jpm/cli.rb b/lib/jpm/cli.rb index abc1234..def5678 100644 --- a/lib/jpm/cli.rb +++ b/lib/jpm/cli.rb @@ -6,6 +6,11 @@ module JPM class CLI < Thor + class_option :verbose, :type => :boolean, + :banner => 'Enable verbose output' + class_option :offline, :type => :boole...
Add the verbose and offline CLI options for later At some point I'll need to expose these down into the guts
diff --git a/lib/task.rb b/lib/task.rb index abc1234..def5678 100644 --- a/lib/task.rb +++ b/lib/task.rb @@ -40,6 +40,8 @@ add_extra_tags_in_list(new_tag_names) end + private + def remove_tags_not_in_list(new_tag_names) tags.select do |tag| !new_tag_names.include? tag.name
Add private scope to Task
diff --git a/app/controllers/api/srpms_controller.rb b/app/controllers/api/srpms_controller.rb index abc1234..def5678 100644 --- a/app/controllers/api/srpms_controller.rb +++ b/app/controllers/api/srpms_controller.rb @@ -17,7 +17,7 @@ end parameter do key :name, :branch_id - key :in...
Fix branch_id pass for srpms controller
diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb index abc1234..def5678 100644 --- a/app/controllers/questions_controller.rb +++ b/app/controllers/questions_controller.rb @@ -16,15 +16,15 @@ @question = Question.new(question_params) if @question.save - redir...
Fix Redirects And Names In Controller
diff --git a/db/migrate/20110715150711_add_profile_photo_remote_url_to_users.rb b/db/migrate/20110715150711_add_profile_photo_remote_url_to_users.rb index abc1234..def5678 100644 --- a/db/migrate/20110715150711_add_profile_photo_remote_url_to_users.rb +++ b/db/migrate/20110715150711_add_profile_photo_remote_url_to_user...
Add field for remote url that profile image was sourced from
diff --git a/db/migrate/20140122205815_rename_issues_version_to_flag_version.rb b/db/migrate/20140122205815_rename_issues_version_to_flag_version.rb index abc1234..def5678 100644 --- a/db/migrate/20140122205815_rename_issues_version_to_flag_version.rb +++ b/db/migrate/20140122205815_rename_issues_version_to_flag_versio...
Include migration for renaming Issues version column to flag_version
diff --git a/db/migrate/20180228092312_add_analytical_fields_journal_entries.rb b/db/migrate/20180228092312_add_analytical_fields_journal_entries.rb index abc1234..def5678 100644 --- a/db/migrate/20180228092312_add_analytical_fields_journal_entries.rb +++ b/db/migrate/20180228092312_add_analytical_fields_journal_entrie...
Add projects budget and equipments to journal_entry_items
diff --git a/app/helpers/blacklight_helper.rb b/app/helpers/blacklight_helper.rb index abc1234..def5678 100644 --- a/app/helpers/blacklight_helper.rb +++ b/app/helpers/blacklight_helper.rb @@ -31,4 +31,12 @@ has_user_authentication_provider? and current_or_guest_user.present? end + protected + + ## + # ...
Fix blacklight helper error (cucumber not passing)
diff --git a/app/models/concerns/from_gtfs.rb b/app/models/concerns/from_gtfs.rb index abc1234..def5678 100644 --- a/app/models/concerns/from_gtfs.rb +++ b/app/models/concerns/from_gtfs.rb @@ -2,6 +2,7 @@ extend ActiveSupport::Concern included do def self.from_gtfs(entity) + raise NotImplementedError ...
Mark as abstract method with NotImplementedError
diff --git a/app/controllers/shopping/api_controller.rb b/app/controllers/shopping/api_controller.rb index abc1234..def5678 100644 --- a/app/controllers/shopping/api_controller.rb +++ b/app/controllers/shopping/api_controller.rb @@ -1,14 +1,7 @@ module Shopping class ApiController < ApplicationController includ...
Remove CSRF check and comments
diff --git a/test/rails_translation_manager/validator_test.rb b/test/rails_translation_manager/validator_test.rb index abc1234..def5678 100644 --- a/test/rails_translation_manager/validator_test.rb +++ b/test/rails_translation_manager/validator_test.rb @@ -0,0 +1,51 @@+# encoding: utf-8 +require 'test_helper' +require ...
Add unit test for validator taken from the whitehall app
diff --git a/app/models/review_line.rb b/app/models/review_line.rb index abc1234..def5678 100644 --- a/app/models/review_line.rb +++ b/app/models/review_line.rb @@ -24,4 +24,8 @@ comments end + def title + self[:title] + end + end
Use proper titles in review lines
diff --git a/app/helpers/user_info_helper.rb b/app/helpers/user_info_helper.rb index abc1234..def5678 100644 --- a/app/helpers/user_info_helper.rb +++ b/app/helpers/user_info_helper.rb @@ -1,11 +1,36 @@ module UserInfoHelper + include PitchHelper def inject_extra_user_props(user) user_as_json = JSON.parse(us...
Add more vote information to user json
diff --git a/app/jobs/ahoy/geocode_v2_job.rb b/app/jobs/ahoy/geocode_v2_job.rb index abc1234..def5678 100644 --- a/app/jobs/ahoy/geocode_v2_job.rb +++ b/app/jobs/ahoy/geocode_v2_job.rb @@ -11,9 +11,9 @@ nil end - if location + if location && location.country.present? data = { - ...
Make sure country is present [skip ci]
diff --git a/lib/active_interaction/filters/hash_filter.rb b/lib/active_interaction/filters/hash_filter.rb index abc1234..def5678 100644 --- a/lib/active_interaction/filters/hash_filter.rb +++ b/lib/active_interaction/filters/hash_filter.rb @@ -10,7 +10,7 @@ def cast(value) case value when Hash - ...
Allow wildcard hashes with `strip: false`
diff --git a/lib/generators/mailboxer/install_generator.rb b/lib/generators/mailboxer/install_generator.rb index abc1234..def5678 100644 --- a/lib/generators/mailboxer/install_generator.rb +++ b/lib/generators/mailboxer/install_generator.rb @@ -17,16 +17,19 @@ end def copy_migrations - migrations = [["2011051...
Use rake migration generator in Rails > 3.0
diff --git a/lib/hamlit/block/script_compiler_extension.rb b/lib/hamlit/block/script_compiler_extension.rb index abc1234..def5678 100644 --- a/lib/hamlit/block/script_compiler_extension.rb +++ b/lib/hamlit/block/script_compiler_extension.rb @@ -10,7 +10,7 @@ [:block, "#{var} = #{node.value[:text]}", ...
Use another local variable inside block
diff --git a/lib/rspec/support/spec/deprecation_helpers.rb b/lib/rspec/support/spec/deprecation_helpers.rb index abc1234..def5678 100644 --- a/lib/rspec/support/spec/deprecation_helpers.rb +++ b/lib/rspec/support/spec/deprecation_helpers.rb @@ -1,7 +1,8 @@ module RSpecHelpers - def expect_deprecation_with_call_site(fi...
Allow `expect_deprecation_with_call_site` to take a snippet as well.
diff --git a/spec/models/alchemy/essence_file_spec.rb b/spec/models/alchemy/essence_file_spec.rb index abc1234..def5678 100644 --- a/spec/models/alchemy/essence_file_spec.rb +++ b/spec/models/alchemy/essence_file_spec.rb @@ -2,7 +2,7 @@ module Alchemy describe EssenceFile do - let(:attachment) { build_stubbed(:...
Create instead attachment in essence file spec Only stubbing it does not work because in the shared example we access the database. Factory Girl 4.8.0 complained about and was totally right.
diff --git a/rack-canonical-hostname.gemspec b/rack-canonical-hostname.gemspec index abc1234..def5678 100644 --- a/rack-canonical-hostname.gemspec +++ b/rack-canonical-hostname.gemspec @@ -15,4 +15,5 @@ gem.require_paths = ["lib"] gem.version = Rack::CanonicalHost::VERSION gem.add_development_dependency '...
Add development dependency in order to make specs pass
diff --git a/lib/handlebars_assets/engine.rb b/lib/handlebars_assets/engine.rb index abc1234..def5678 100644 --- a/lib/handlebars_assets/engine.rb +++ b/lib/handlebars_assets/engine.rb @@ -2,9 +2,10 @@ # NOTE: must be an engine because we are including assets in the gem class Engine < ::Rails::Engine initiali...
Handle when asset compilation is off in rails.
diff --git a/lib/icloud-reminders-cli/app.rb b/lib/icloud-reminders-cli/app.rb index abc1234..def5678 100644 --- a/lib/icloud-reminders-cli/app.rb +++ b/lib/icloud-reminders-cli/app.rb @@ -1,5 +1,6 @@ #!/usr/bin/env ruby # vim: et ts=2 sw=2 +# encoding: UTF-8 require "thor" @@ -18,10 +19,11 @@ if remind...
Add ridiculous(ly cute) unicode checkboxes