diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
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 @@ -4,9 +4,14 @@ require 'shared_examples' require 'puppet-openstack_spec_helper/facts' +fixture_path = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures')) + RSpec.con...
Set fixture paths for unit tests This change defines manifest_dir and module_path expicitly in unit tests so that modules installed under fixtures directory is properly loaded. Closes-Bug: #1930403 Change-Id: Ic6af657059b55368897b04e2f537bb0b60298b31
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 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__) -require 'codeclimate-test-reporter' -CodeClimate::TestReporter.start +# require 'codeclimate-test-reporte...
Disable code coverage to see if it fixes travis
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,3 +1,7 @@ require 'perpetuity' -Perpetuity.data_source :mongodb, 'perpetuity_gem_test' +if ENV['PERPETUITY_ADAPTER'] == 'postgres' + Perpetuity.data_source :postgres, 'perpet...
Allow specs to be run with Postgres adapter
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 @@ -17,5 +17,6 @@ super(*args, &block) raise Sequel::Error::Rollback end + true end end
Exit with 'success' status when running 'rake spec'.
diff --git a/app/models/medicine_usage.rb b/app/models/medicine_usage.rb index abc1234..def5678 100644 --- a/app/models/medicine_usage.rb +++ b/app/models/medicine_usage.rb @@ -7,9 +7,9 @@ child_properties(name: :medicine_usage_medicines) def display - result = Myp.display_datetime_short(usage_time, User.cu...
Add year to medicine usage display
diff --git a/lib/reddit_api/query.rb b/lib/reddit_api/query.rb index abc1234..def5678 100644 --- a/lib/reddit_api/query.rb +++ b/lib/reddit_api/query.rb @@ -35,23 +35,21 @@ def add_multiple_records(new_records) new_records.each do |record| - add_single_record(record) + record_id = record["dat...
Refactor Query to account for records w/ data attr Not all records returned by api responses have a data attribute Specifically, those returned from a query for a singular record seem to lack a data attribute
diff --git a/app/services/channels/sms.rb b/app/services/channels/sms.rb index abc1234..def5678 100644 --- a/app/services/channels/sms.rb +++ b/app/services/channels/sms.rb @@ -3,6 +3,7 @@ module Channels class SMS < Base FROM_NUMBER = ENV.fetch('TWILIO_FROM_NUMBER') + UNSUBSCRIBED_ERROR_CODE...
Revert "Back out logic to skip retries for unsubscribed numbers" This reverts commit e0c9e93b9128a129ff42b4890dfb44866d41eaab.
diff --git a/app/services/mybb_service.rb b/app/services/mybb_service.rb index abc1234..def5678 100644 --- a/app/services/mybb_service.rb +++ b/app/services/mybb_service.rb @@ -0,0 +1,67 @@+class MybbService + def self.convert_text(text) + text.gsub('[hr]', '<hr>').gsub(/\[quote="[^\]]+\]/, '<blockquote>').gsub('[/quo...
Add import script for mybb posts
diff --git a/app/services/query_sparql.rb b/app/services/query_sparql.rb index abc1234..def5678 100644 --- a/app/services/query_sparql.rb +++ b/app/services/query_sparql.rb @@ -15,8 +15,12 @@ ) end - params = "#{query_type}=#{query}" - response = RestClient.post(ENV.fetch('NEPTUNE_SPARQL_ENDPOINT'), ...
Disable RestClient timeout when querying SPARQL Also, improve error handling of SPARQL proxy Fixes CredentialEngine/CredentialRegistry#313
diff --git a/lib/pesapal/railtie.rb b/lib/pesapal/railtie.rb index abc1234..def5678 100644 --- a/lib/pesapal/railtie.rb +++ b/lib/pesapal/railtie.rb @@ -9,10 +9,15 @@ begin config.pesapal_credentials = YAML::load(IO.read(path_to_yaml))[Rails.env] rescue Errno::ENOENT - logger.info('...
Set default values if YAML file is missing
diff --git a/lib/google/apis/version.rb b/lib/google/apis/version.rb index abc1234..def5678 100644 --- a/lib/google/apis/version.rb +++ b/lib/google/apis/version.rb @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +require 'open3' + module Goog...
fix: Switch to safer Open3 to determine OS_VERSION
diff --git a/lib/tasks/importer.rake b/lib/tasks/importer.rake index abc1234..def5678 100644 --- a/lib/tasks/importer.rake +++ b/lib/tasks/importer.rake @@ -11,7 +11,7 @@ desc "Import new Noko entries" task entries: [:users, :projects, :environment] do start_date = Time.now.beginning_of_week.to_date - end_...
Extend rake task to saturday
diff --git a/lib/inherited_attribute.rb b/lib/inherited_attribute.rb index abc1234..def5678 100644 --- a/lib/inherited_attribute.rb +++ b/lib/inherited_attribute.rb @@ -20,7 +20,9 @@ " def share_#{attribute}_with(person) read_attribute(:visible) and - family and family.visib...
Fix bug rendering printed directory pdf in some cases. This was being called on Family, and this part of the code assumed it would be called on Person.
diff --git a/spec/features/remote/github/miscellaneous/emojis_spec.rb b/spec/features/remote/github/miscellaneous/emojis_spec.rb index abc1234..def5678 100644 --- a/spec/features/remote/github/miscellaneous/emojis_spec.rb +++ b/spec/features/remote/github/miscellaneous/emojis_spec.rb @@ -0,0 +1,11 @@+require 'github_he...
Add spec for GitHub emojis
diff --git a/app/helpers/crops_helper.rb b/app/helpers/crops_helper.rb index abc1234..def5678 100644 --- a/app/helpers/crops_helper.rb +++ b/app/helpers/crops_helper.rb @@ -1,12 +1,7 @@ module CropsHelper def display_seed_availability(member, crop) - total_quantity = 0 - - seeds = member.seeds.select { |seed| ...
Reduce the number of queries to find if member has seed of this crop
diff --git a/lib/loady/memory_logger.rb b/lib/loady/memory_logger.rb index abc1234..def5678 100644 --- a/lib/loady/memory_logger.rb +++ b/lib/loady/memory_logger.rb @@ -2,7 +2,7 @@ class MemoryLogger attr_reader :messages - def initialize(options = {}) + def initialize @messages = [] end
Remove unused argument from MemoryLogger constructor
diff --git a/app/models/shipment_decorator.rb b/app/models/shipment_decorator.rb index abc1234..def5678 100644 --- a/app/models/shipment_decorator.rb +++ b/app/models/shipment_decorator.rb @@ -1,6 +1,8 @@ module SolidusShipwire - module Shipment - prepend SolidusShipwire::Proxy + module ShipmentDecorator + def ...
Use Shipwireable module on Spree::Shipment
diff --git a/lib/teaas/overlayer.rb b/lib/teaas/overlayer.rb index abc1234..def5678 100644 --- a/lib/teaas/overlayer.rb +++ b/lib/teaas/overlayer.rb @@ -39,7 +39,7 @@ end image << img - image.gravity = Magick::CenterGravity + image.gravity = Magick::SouthGravity image = image.composite_l...
Use SouthGravity instead of CenterGravity for centering overlayed images
diff --git a/flay-haml.gemspec b/flay-haml.gemspec index abc1234..def5678 100644 --- a/flay-haml.gemspec +++ b/flay-haml.gemspec @@ -3,7 +3,7 @@ # Describe your gem and declare its dependencies: Gem::Specification.new do |s| s.name = 'flay-haml' - s.version = '0.0.4' + s.version = '0.0.5' s.auth...
Fix haml dependency to <6
diff --git a/core/db/migrate/20150309161154_ensure_payments_have_numbers.rb b/core/db/migrate/20150309161154_ensure_payments_have_numbers.rb index abc1234..def5678 100644 --- a/core/db/migrate/20150309161154_ensure_payments_have_numbers.rb +++ b/core/db/migrate/20150309161154_ensure_payments_have_numbers.rb @@ -2,7 +2,...
Update only the payment's number during migration. Fixes #6327 Fixes #6328
diff --git a/config/initializers/raven.rb b/config/initializers/raven.rb index abc1234..def5678 100644 --- a/config/initializers/raven.rb +++ b/config/initializers/raven.rb @@ -1,5 +1,5 @@ require 'raven' Raven.configure do |config| - config.dsn = 'https://166e257bdc0a4464b4aa03076d0a0cda:43cdd2f177b04fe3b7723422bb...
Use ENV Variable for getsentry
diff --git a/app/services/dwp_monitor.rb b/app/services/dwp_monitor.rb index abc1234..def5678 100644 --- a/app/services/dwp_monitor.rb +++ b/app/services/dwp_monitor.rb @@ -25,7 +25,7 @@ # When DWP is offline it returns 400 Bad Request # maybe extend to search for x00 as first 3 chars to check for 500 errors t...
Update sum for explicit precedence
diff --git a/lib/Server.rb b/lib/Server.rb index abc1234..def5678 100644 --- a/lib/Server.rb +++ b/lib/Server.rb @@ -10,7 +10,7 @@ attr_accessor :robots, :maze, :robotController - def initialize host = "localhost", port = RobotState::Server::PORT + def initialize host = "localhost", port = 0 @maz...
Set default server port to 0 to fix problem with tests failing because port already in use
diff --git a/app/classes/forest/markdown_renderer.rb b/app/classes/forest/markdown_renderer.rb index abc1234..def5678 100644 --- a/app/classes/forest/markdown_renderer.rb +++ b/app/classes/forest/markdown_renderer.rb @@ -1,6 +1,4 @@ class Forest::MarkdownRenderer < Redcarpet::Render::HTML - include Redcarpet::Render::...
Fix SmartyPants in markdown renderer
diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb index abc1234..def5678 100644 --- a/app/controllers/merchants_controller.rb +++ b/app/controllers/merchants_controller.rb @@ -1,6 +1,14 @@ class MerchantsController < ApplicationController def index @merchants = M...
Add Json to merchants index path
diff --git a/app/controllers/platforms_controller.rb b/app/controllers/platforms_controller.rb index abc1234..def5678 100644 --- a/app/controllers/platforms_controller.rb +++ b/app/controllers/platforms_controller.rb @@ -5,8 +5,8 @@ def show find_platform - @updated = Project.search('*', filters: {platform:...
Revert "Make sure new and updated look different" This reverts commit f89c97bd019c07b178c5dd7a78d8b91c8e8603c8.
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 @@ -2,7 +2,6 @@ def index @questions = Question.all - respond_to do |format| for...
Modify Questions controller to render json
diff --git a/bool2num.rb b/bool2num.rb index abc1234..def5678 100644 --- a/bool2num.rb +++ b/bool2num.rb @@ -20,25 +20,23 @@ end if value.is_a?(String) - # We consider all the yes, no, y, n and so on too ... - result = case value + value = case value # # This is how undef l...
Change boolean detecion from string to make entire function more robust. Signed-off-by: Krzysztof Wilczynski <9bf091559fc98493329f7d619638c79e91ccf029@linux.com>
diff --git a/db/migrate/20170221093606_update_old_redirect_unpublishings.rb b/db/migrate/20170221093606_update_old_redirect_unpublishings.rb index abc1234..def5678 100644 --- a/db/migrate/20170221093606_update_old_redirect_unpublishings.rb +++ b/db/migrate/20170221093606_update_old_redirect_unpublishings.rb @@ -0,0 +1,...
Add a migration to update old-style redirect unpublishings
diff --git a/git_snip.gemspec b/git_snip.gemspec index abc1234..def5678 100644 --- a/git_snip.gemspec +++ b/git_snip.gemspec @@ -17,6 +17,8 @@ spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] + spec.required_ruby_version = '>= 2.0' + spec.add_runtime_dependency "g...
Set required_ruby_version to >= 2.0.
diff --git a/gitnesse.gemspec b/gitnesse.gemspec index abc1234..def5678 100644 --- a/gitnesse.gemspec +++ b/gitnesse.gemspec @@ -16,7 +16,7 @@ gem.test_files = gem.files.grep(%r{^(test|spec|features)/}) gem.require_paths = ["lib"] gem.add_dependency("bundler","~> 1.2.1") - gem.add_dependency("gollum","~> 2....
Update gollum dependency to the lastest version.
diff --git a/core/app/models/spree/option_type.rb b/core/app/models/spree/option_type.rb index abc1234..def5678 100644 --- a/core/app/models/spree/option_type.rb +++ b/core/app/models/spree/option_type.rb @@ -9,7 +9,7 @@ has_many :option_type_prototypes, class_name: 'Spree::OptionTypePrototype' has_many :proto...
Add allow_blank to uniqueness validation of option type name
diff --git a/plugin_gems.rb b/plugin_gems.rb index abc1234..def5678 100644 --- a/plugin_gems.rb +++ b/plugin_gems.rb @@ -10,7 +10,7 @@ download "mongo", "1.10.2" download "fluent-plugin-mongo", "0.7.4" download "aws-sdk", "1.56.0" -download "fluent-plugin-s3", "0.4.1" +download "fluent-plugin-s3", "0.4.3" download "...
Update s3 plugin to v0.4.3
diff --git a/pronto.gemspec b/pronto.gemspec index abc1234..def5678 100644 --- a/pronto.gemspec +++ b/pronto.gemspec @@ -22,7 +22,7 @@ s.add_dependency 'rugged', '~> 0.19.0' s.add_dependency 'thor', '~> 0.18.0' - s.add_dependency 'octokit', '~> 2.6.0' + s.add_dependency 'octokit', '~> 2.7.1' s.add_dependenc...
Update octokit dependency to latest version
diff --git a/Casks/justlooking.rb b/Casks/justlooking.rb index abc1234..def5678 100644 --- a/Casks/justlooking.rb +++ b/Casks/justlooking.rb @@ -3,4 +3,5 @@ homepage 'http://chipmunkninja.com/JustLooking' version '3.3.3' sha1 'ac082882d21e77c5c77e99f8fa7bae9f72bac75c' + link 'JustLooking.app' end
Add link field to JustLooking Cask
diff --git a/attribute_predicates.gemspec b/attribute_predicates.gemspec index abc1234..def5678 100644 --- a/attribute_predicates.gemspec +++ b/attribute_predicates.gemspec @@ -14,4 +14,7 @@ s.test_files = `git ls-files -- test/*`.split("\n") s.rdoc_options = %w(--line-numbers --inline-source --title a...
Add missing dependencies to gemspec
diff --git a/curation_concerns-models/app/models/concerns/curation_concerns/ability.rb b/curation_concerns-models/app/models/concerns/curation_concerns/ability.rb index abc1234..def5678 100644 --- a/curation_concerns-models/app/models/concerns/curation_concerns/ability.rb +++ b/curation_concerns-models/app/models/conce...
Refactor Ability so you can override admin functionality easier
diff --git a/subtle.gemspec b/subtle.gemspec index abc1234..def5678 100644 --- a/subtle.gemspec +++ b/subtle.gemspec @@ -8,9 +8,13 @@ gem.version = Subtle::VERSION gem.authors = ["Utkarsh Kukreti"] gem.email = ["utkarshkukreti@gmail.com"] - gem.description = %q{TODO: Write a gem descripti...
Add gem description, summary, and homepage.
diff --git a/config/software/chef-init.rb b/config/software/chef-init.rb index abc1234..def5678 100644 --- a/config/software/chef-init.rb +++ b/config/software/chef-init.rb @@ -25,12 +25,10 @@ dependency "runit" dependency "chef" -env = with_embedded_path() -env = with_standard_compiler_flags(env) +env = with_standa...
Update chef-container to use new Omnibus APIs
diff --git a/test/controllers/custom_registrations_controller_test.rb b/test/controllers/custom_registrations_controller_test.rb index abc1234..def5678 100644 --- a/test/controllers/custom_registrations_controller_test.rb +++ b/test/controllers/custom_registrations_controller_test.rb @@ -12,24 +12,24 @@ end test...
Upgrade stray legacy hash syntax to 1.9 syntax.
diff --git a/config/unicorn/production.rb b/config/unicorn/production.rb index abc1234..def5678 100644 --- a/config/unicorn/production.rb +++ b/config/unicorn/production.rb @@ -14,7 +14,7 @@ stdout_path "log/unicorn.stdout.log" # workers -worker_processes 2 +worker_processes 8 # use correct Gemfile on restarts b...
Change worker_processes because excloud server has 8 cores
diff --git a/core/file/birthtime_spec.rb b/core/file/birthtime_spec.rb index abc1234..def5678 100644 --- a/core/file/birthtime_spec.rb +++ b/core/file/birthtime_spec.rb @@ -24,12 +24,13 @@ end end - # TODO: fix it. - #platform_is :linux, :openbsd do - # it "raises an NotImplementedError" do - # lambda ...
Revise the example on OpenBSD git-svn-id: ab86ecd26fe50a6a239cacb71380e346f71cee7d@67101 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/optional/capi/time_spec.rb b/optional/capi/time_spec.rb index abc1234..def5678 100644 --- a/optional/capi/time_spec.rb +++ b/optional/capi/time_spec.rb @@ -9,7 +9,8 @@ describe "rb_time_new" do it "creates a Time from the sec and usec" do - @s.rb_time_new(1232141421, 1413123123).should == Tim...
Support the environment whose long is 64bit.
diff --git a/app/views/workflows/index.json.jbuilder b/app/views/workflows/index.json.jbuilder index abc1234..def5678 100644 --- a/app/views/workflows/index.json.jbuilder +++ b/app/views/workflows/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@workflows) do |workflow| - json.extract! workflow, :id + json.extract! w...
Update the workflows JSON output. Now outputs title and description.
diff --git a/spec/paypal_express/remote/build_plugin_helpers.rb b/spec/paypal_express/remote/build_plugin_helpers.rb index abc1234..def5678 100644 --- a/spec/paypal_express/remote/build_plugin_helpers.rb +++ b/spec/paypal_express/remote/build_plugin_helpers.rb @@ -9,8 +9,14 @@ file = File.new(File.join(dir, 'pa...
Revise indent format for yml loading
diff --git a/lib/devise/jwt/token_coder.rb b/lib/devise/jwt/token_coder.rb index abc1234..def5678 100644 --- a/lib/devise/jwt/token_coder.rb +++ b/lib/devise/jwt/token_coder.rb @@ -36,7 +36,7 @@ end def check_in_blacklist(payload, blacklist) - raise JWT::DecodeError if blacklist.include?(payload['...
Fix name collision with expected method in blacklist Instead of expect `include?` method, which is defined in `Module` module, use `member?`. This still allow us to mock using a simple array
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb index abc1234..def5678 100644 --- a/test/integration/routing_test.rb +++ b/test/integration/routing_test.rb @@ -0,0 +1,10 @@+require "#{File.dirname(__FILE__)}/../test_helper" + +class RoutingTest < ActionController::IntegrationTest + # f...
Add stub for routing tests git-svn-id: 801577a2cbccabf54a3a609152c727abd26e524a@1226 a18515e9-6cfd-0310-9624-afb4ebaee84e
diff --git a/lib/migration_data/testing.rb b/lib/migration_data/testing.rb index abc1234..def5678 100644 --- a/lib/migration_data/testing.rb +++ b/lib/migration_data/testing.rb @@ -17,6 +17,8 @@ def all_migrations(path) if Rails::VERSION::MAJOR >= 5 && Rails::VERSION::MINOR >= 2 ActiveRecord::MigrationContext.n...
Fix for tests running against Rails 6
diff --git a/lib/griddler.rb b/lib/griddler.rb index abc1234..def5678 100644 --- a/lib/griddler.rb +++ b/lib/griddler.rb @@ -1,3 +1,5 @@+require 'rails/engine' +require 'action_view' require 'griddler/errors' require 'griddler/engine' require 'griddler/email'
Allow for some console hacking Make `bundle console` and `irb -Ilib -rgriddler` work as expected.
diff --git a/lib/inch/cli.rb b/lib/inch/cli.rb index abc1234..def5678 100644 --- a/lib/inch/cli.rb +++ b/lib/inch/cli.rb @@ -10,9 +10,13 @@ # @param default [Fixnum] default value for columns # @return [Fixnum] def get_term_columns(default = 80) - str = `stty size` - rows_cols = str.sp...
Fix stty warning when reading terminal size
diff --git a/vmdb/spec/controllers/container_group_controller_spec.rb b/vmdb/spec/controllers/container_group_controller_spec.rb index abc1234..def5678 100644 --- a/vmdb/spec/controllers/container_group_controller_spec.rb +++ b/vmdb/spec/controllers/container_group_controller_spec.rb @@ -13,6 +13,7 @@ end it "re...
Add support for verifying the Kubernetes connection This will prevent worker cycling when the Kubernetes endpoint is not available. (transferred from ManageIQ/manageiq@51a2ddc09113bc25b046a7f2a18a24f6c872f34f)
diff --git a/test/helper.rb b/test/helper.rb index abc1234..def5678 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -1,6 +1,6 @@ if ENV['CODECLIMATE_REPO_TOKEN'] - require "codeclimate-test-reporter" - CodeClimate::TestReporter.start + require 'simplecov' + SimpleCov.start end require 'simplecov' if ENV['CO...
Fix coverage generation on Travis Failing build: https://travis-ci.org/neopoly/neo-rails/jobs/210938081 Fix from: https://github.com/codeclimate/ruby-test-reporter/blob/master/CHANGELOG.md#v100-2016-11-03
diff --git a/lib/rake/swift/module_task.rb b/lib/rake/swift/module_task.rb index abc1234..def5678 100644 --- a/lib/rake/swift/module_task.rb +++ b/lib/rake/swift/module_task.rb @@ -35,6 +35,7 @@ end def define_wrapper_task + desc "Build module '#{module_name}'" ModuleWrapperTask.define_task(modul...
Add description for module tasks
diff --git a/lib/rake_job.rb b/lib/rake_job.rb index abc1234..def5678 100644 --- a/lib/rake_job.rb +++ b/lib/rake_job.rb @@ -8,13 +8,18 @@ rake.chomp end - def initialize(task) + def initialize(task, args = {}) @@rake ||= RakeJob.find_rake @task = task + @args = args end def run! - co...
Use correct environment and add parameters
diff --git a/lib/wingtips/configuration.rb b/lib/wingtips/configuration.rb index abc1234..def5678 100644 --- a/lib/wingtips/configuration.rb +++ b/lib/wingtips/configuration.rb @@ -9,6 +9,8 @@ self.instance_eval(File.read(file)) unless file == path end + # the empty slide at the start is needed as...
Move comment where it belongs
diff --git a/app/helpers/application_helper/button/chargeback_rates.rb b/app/helpers/application_helper/button/chargeback_rates.rb index abc1234..def5678 100644 --- a/app/helpers/application_helper/button/chargeback_rates.rb +++ b/app/helpers/application_helper/button/chargeback_rates.rb @@ -4,6 +4,6 @@ end ...
Bring chargeback rates buttons back Hidden since fd0e99728920fc2ee3491dba1e46349d0d0206a0. (transferred from ManageIQ/manageiq@20940f46183c9ecde3cedf01576146b36e02e936)
diff --git a/test/cookbooks/mumble_server_test/recipes/default.rb b/test/cookbooks/mumble_server_test/recipes/default.rb index abc1234..def5678 100644 --- a/test/cookbooks/mumble_server_test/recipes/default.rb +++ b/test/cookbooks/mumble_server_test/recipes/default.rb @@ -24,3 +24,5 @@ include_recipe 'mumble_server' ...
Install lsof for integration tests
diff --git a/test/cookbooks/python-webapp-test/recipes/default.rb b/test/cookbooks/python-webapp-test/recipes/default.rb index abc1234..def5678 100644 --- a/test/cookbooks/python-webapp-test/recipes/default.rb +++ b/test/cookbooks/python-webapp-test/recipes/default.rb @@ -24,7 +24,7 @@ repository 'https://github.com/...
Change destination of the config file
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 @@ -20,7 +20,10 @@ end def alternative_locales - I18n.available_locales - [I18n.locale] + # This disables the link...
Disable the link to Welsh (until they’re approved)
diff --git a/app/models/world_location_type.rb b/app/models/world_location_type.rb index abc1234..def5678 100644 --- a/app/models/world_location_type.rb +++ b/app/models/world_location_type.rb @@ -19,6 +19,6 @@ [WorldLocation] end - WorldLocation = create(id: 1, key: "world_location", name: "World location ne...
Fix name of world location model This was changed in https://github.com/alphagov/whitehall/pull/3384 but the type should still be “world location” whereas whitehall-admin can refer to the pages as “world location news”.
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index abc1234..def5678 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -18,9 +18,12 @@ it { should compile.with_all_deps } it { should contain_class('users') } - it { should contain_file('/home/bob') } it { s...
Add unit test for users. Check the absent user is really absent.
diff --git a/spec/hash/fetcher_spec.rb b/spec/hash/fetcher_spec.rb index abc1234..def5678 100644 --- a/spec/hash/fetcher_spec.rb +++ b/spec/hash/fetcher_spec.rb @@ -0,0 +1,29 @@+require 'spec_helper' + +require 'observed/hash/fetcher' + +describe Observed::Hash::Fetcher do + + subject { + described_class.new(hash) ...
Add the spec for the hash fetcher
diff --git a/lib/comma/extractors.rb b/lib/comma/extractors.rb index abc1234..def5678 100644 --- a/lib/comma/extractors.rb +++ b/lib/comma/extractors.rb @@ -45,8 +45,10 @@ arg.each do |k, v| @results << @instance.send(sym).send(k).to_s end - when Symbol, String + when Sym...
Adjust meaning of a string parameter passed as an argument to be the specified header name rather than treated like a symbol, this makes it a bit cleaner to specify a header name when no sub-attribute/method needs to be called (eg. created_at 'Date').
diff --git a/lib/emotions/emotion.rb b/lib/emotions/emotion.rb index abc1234..def5678 100644 --- a/lib/emotions/emotion.rb +++ b/lib/emotions/emotion.rb @@ -6,23 +6,10 @@ validates :emotional, presence: true validates :emotive, presence: true - validates_each :emotion do |record, attr, value| - unles...
Refactor validations to create methods
diff --git a/lib/nesta/navigation.rb b/lib/nesta/navigation.rb index abc1234..def5678 100644 --- a/lib/nesta/navigation.rb +++ b/lib/nesta/navigation.rb @@ -7,20 +7,23 @@ if options[:levels] > 0 haml_tag :ul, :class => options[:class] do menu.each do |item| - haml_tag :li do...
Split display_menu() into two methods.
diff --git a/lib/archivable/model.rb b/lib/archivable/model.rb index abc1234..def5678 100644 --- a/lib/archivable/model.rb +++ b/lib/archivable/model.rb @@ -18,9 +18,9 @@ archived end - def archive! + def archive!(save_args = {}) self.archived = true - save + save(save_args) end...
Allow save options to be passed in to archive! method
diff --git a/lib/bunny/ssl_socket.rb b/lib/bunny/ssl_socket.rb index abc1234..def5678 100644 --- a/lib/bunny/ssl_socket.rb +++ b/lib/bunny/ssl_socket.rb @@ -7,6 +7,11 @@ # TLS-enabled TCP socket that implements convenience # methods found in Bunny::Socket. class SSLSocket < OpenSSL::SSL::SSLSocket + + ...
Use Ruby version-specific retry exception list for SSL socket
diff --git a/lib/cloudwatch_rails.rb b/lib/cloudwatch_rails.rb index abc1234..def5678 100644 --- a/lib/cloudwatch_rails.rb +++ b/lib/cloudwatch_rails.rb @@ -1,7 +1,7 @@ require 'cloudwatch_rails/version' require 'cloudwatch_rails/railtie' if defined?(Rails) require 'cloudwatch_rails/config' -require 'cloudwatch_rails...
Fix require for Async Queue
diff --git a/activesupport/lib/active_support/testing/setup_and_teardown.rb b/activesupport/lib/active_support/testing/setup_and_teardown.rb index abc1234..def5678 100644 --- a/activesupport/lib/active_support/testing/setup_and_teardown.rb +++ b/activesupport/lib/active_support/testing/setup_and_teardown.rb @@ -4,20 +4...
Kill not used constant since removal of runner method Runner method was removed in ada571bfcdbad669ae43a4dd18277ef227680a0b.
diff --git a/lib/gitlab_git/popen.rb b/lib/gitlab_git/popen.rb index abc1234..def5678 100644 --- a/lib/gitlab_git/popen.rb +++ b/lib/gitlab_git/popen.rb @@ -10,9 +10,9 @@ @cmd_output = "" @cmd_status = 0 Open3.popen3(vars, cmd, options) do |stdin, stdout, stderr, wait_thr| - @cmd_stat...
Read output before waiting for process to end Sometimes a subprocess will not exit until it was able to write its output to stdout/stderr. By waiting _after_ we read the subprocess output, we avoid this potential bug.
diff --git a/lib/install/template.rb b/lib/install/template.rb index abc1234..def5678 100644 --- a/lib/install/template.rb +++ b/lib/install/template.rb @@ -27,7 +27,7 @@ end puts "Installing all JavaScript dependencies" -run "yarn add webpacker" +run "yarn add @rails/webpacker" puts "Installing dev server for li...
Update to scoped package name
diff --git a/lib/metrics/rails/group.rb b/lib/metrics/rails/group.rb index abc1234..def5678 100644 --- a/lib/metrics/rails/group.rb +++ b/lib/metrics/rails/group.rb @@ -7,17 +7,17 @@ end def group(prefix) - prefix = @prefix + prefix + prefix = "#{@prefix}#{prefix}" yield self...
Improve handling of non-strings with Group methods.
diff --git a/lib/potemkin/builder.rb b/lib/potemkin/builder.rb index abc1234..def5678 100644 --- a/lib/potemkin/builder.rb +++ b/lib/potemkin/builder.rb @@ -26,11 +26,13 @@ ENV[key] = new_value end - yield + return_value = yield env_vars.each_key do |key| ENV[key] = old_valu...
Return the value returned by the block
diff --git a/config/initializers/ticket_dispenser.rb b/config/initializers/ticket_dispenser.rb index abc1234..def5678 100644 --- a/config/initializers/ticket_dispenser.rb +++ b/config/initializers/ticket_dispenser.rb @@ -5,7 +5,7 @@ Rails.application.config.to_prepare do TicketDispenser::Ticket.class_eval do de...
Update TD initializer to cope with deleting tickets
diff --git a/lib/rdf/rdfa/version.rb b/lib/rdf/rdfa/version.rb index abc1234..def5678 100644 --- a/lib/rdf/rdfa/version.rb +++ b/lib/rdf/rdfa/version.rb @@ -1,11 +1,8 @@ module RDF::RDFa::VERSION - MAJOR = 0 - MINOR = 2 - TINY = 2 - EXTRA = nil + VERSION_FILE = File.join(File.expand_path(File.dirname(__FILE__)), ...
Implement RDF::RDFa::VERSION by parsing VERSION file.
diff --git a/lib/overcommit/hook/pre_commit/brakeman.rb b/lib/overcommit/hook/pre_commit/brakeman.rb index abc1234..def5678 100644 --- a/lib/overcommit/hook/pre_commit/brakeman.rb +++ b/lib/overcommit/hook/pre_commit/brakeman.rb @@ -6,13 +6,11 @@ return :warn, 'Run `gem install brakeman`' end - re...
Clean up Brakeman pre-commit hook Change-Id: If8ca86338b4d85a0d761ade716c8697ad69178b8 Reviewed-on: http://gerrit.causes.com/37961 Tested-by: jenkins <d95b56ce41a2e1ac4cecdd398defd7414407cc08@causes.com> Reviewed-by: Shane da Silva <6f6e68d1df92f30cb4b3ce35260ddf94a402f33d@causes.com>
diff --git a/lib/planaria/generator/builder/executer.rb b/lib/planaria/generator/builder/executer.rb index abc1234..def5678 100644 --- a/lib/planaria/generator/builder/executer.rb +++ b/lib/planaria/generator/builder/executer.rb @@ -14,7 +14,8 @@ instance_variable_set("@#{k}", v) end - ...
Change new file build rule
diff --git a/lib/salt/publishable.rb b/lib/salt/publishable.rb index abc1234..def5678 100644 --- a/lib/salt/publishable.rb +++ b/lib/salt/publishable.rb @@ -20,7 +20,7 @@ raise "Syntax error in #{path.gsub(site.source_paths[:root], '')}" end - if @layout && @site.templates[@layout] && use_layout +...
Check the use_layout variable before anything else.
diff --git a/lib/traitify/request.rb b/lib/traitify/request.rb index abc1234..def5678 100644 --- a/lib/traitify/request.rb +++ b/lib/traitify/request.rb @@ -9,16 +9,10 @@ end def request(method, path, options = {}) - begin - conn(url: host).send(method) do |request| - request.url [versio...
Allow errors to be raised
diff --git a/db/data_migration/20161205141503_republish_html_attachments_via_attachables.rb b/db/data_migration/20161205141503_republish_html_attachments_via_attachables.rb index abc1234..def5678 100644 --- a/db/data_migration/20161205141503_republish_html_attachments_via_attachables.rb +++ b/db/data_migration/20161205...
Add migration to republish `Attachable` This migration republishes all documents that are `Attachable` and have an `HtmlAttachment`. This will cause the `HtmlAttachment`s to be republished too allowing us to get an up to date view of any remaining issues with the migration to Publishing API before switching them over...
diff --git a/app/controllers/francis_cms/syndications_controller.rb b/app/controllers/francis_cms/syndications_controller.rb index abc1234..def5678 100644 --- a/app/controllers/francis_cms/syndications_controller.rb +++ b/app/controllers/francis_cms/syndications_controller.rb @@ -0,0 +1,43 @@+require_dependency 'franci...
Add syndications controller with create/destroy actions.
diff --git a/lib/zemanta/enhancer.rb b/lib/zemanta/enhancer.rb index abc1234..def5678 100644 --- a/lib/zemanta/enhancer.rb +++ b/lib/zemanta/enhancer.rb @@ -28,7 +28,7 @@ url = strip_query_string(url) if @opts[:strip_query_string] - link = "<a href='#{url}'>#{dictionary[:word]}</a>)" + link = ...
Remove stray bracket from string
diff --git a/lib/web_console/testing/fake_middleware.rb b/lib/web_console/testing/fake_middleware.rb index abc1234..def5678 100644 --- a/lib/web_console/testing/fake_middleware.rb +++ b/lib/web_console/testing/fake_middleware.rb @@ -19,7 +19,10 @@ end def call(env) - [ 200, @headers, [ render(req_...
Set content-length header in the FakeMiddleware Similar change as rails/web-console#290
diff --git a/elasticsearch-simple.gemspec b/elasticsearch-simple.gemspec index abc1234..def5678 100644 --- a/elasticsearch-simple.gemspec +++ b/elasticsearch-simple.gemspec @@ -8,8 +8,8 @@ spec.version = Elasticsearch::Simple::VERSION spec.authors = ["Jiří Zajpt"] spec.email = ["jzajpt@blu...
Add description and summary to gemspec file
diff --git a/qa/qa/specs/features/project/add_secret_variable_spec.rb b/qa/qa/specs/features/project/add_secret_variable_spec.rb index abc1234..def5678 100644 --- a/qa/qa/specs/features/project/add_secret_variable_spec.rb +++ b/qa/qa/specs/features/project/add_secret_variable_spec.rb @@ -4,7 +4,7 @@ Runtime::Brow...
Remove useless assignment in secret variables specs
diff --git a/cookbooks/bcpc/recipes/rotate_chef_nginx_access_log.rb b/cookbooks/bcpc/recipes/rotate_chef_nginx_access_log.rb index abc1234..def5678 100644 --- a/cookbooks/bcpc/recipes/rotate_chef_nginx_access_log.rb +++ b/cookbooks/bcpc/recipes/rotate_chef_nginx_access_log.rb @@ -10,6 +10,6 @@ path '/var/log/chef-ser...
Fix Chef server Nginx logrotate configuration - Add `copytruncate`, `notifempty` and `delaycompress` options to ensure we get the behavior we actually want. - With `copytruncate` chosen, we can then remove the existing `postrotate` command and replace it with a `SIGUSR1`, known as a `reopen` to the Nginx daemon, which ...
diff --git a/paperclip_waveform.gemspec b/paperclip_waveform.gemspec index abc1234..def5678 100644 --- a/paperclip_waveform.gemspec +++ b/paperclip_waveform.gemspec @@ -19,5 +19,6 @@ s.add_dependency "paperclip" s.add_dependency "waveform" + s.add_development_dependency "rails" s.add_development_dependency "...
Add rails as development dependency
diff --git a/access2rails.gemspec b/access2rails.gemspec index abc1234..def5678 100644 --- a/access2rails.gemspec +++ b/access2rails.gemspec @@ -8,7 +8,7 @@ gem.summary = %q{Convert MS Access xsl files to rails models and migrations, and import xml data.} gem.homepage = "" - gem.files = `git ...
Fix handling spaces in filenames for gemspec
diff --git a/activeportal.gemspec b/activeportal.gemspec index abc1234..def5678 100644 --- a/activeportal.gemspec +++ b/activeportal.gemspec @@ -14,9 +14,13 @@ s.files = Dir['{app,config,db,lib}/**/*', 'MIT-LICENSE', 'Rakefile', 'README.rdoc'] s.add_dependency 'rails', '~> 4.1.0' - s.add_dependency 'devise', '~...
Add I18n support and capybara
diff --git a/lib/libra2/app/controllers/concerns/authentication_behavior.rb b/lib/libra2/app/controllers/concerns/authentication_behavior.rb index abc1234..def5678 100644 --- a/lib/libra2/app/controllers/concerns/authentication_behavior.rb +++ b/lib/libra2/app/controllers/concerns/authentication_behavior.rb @@ -22,6 +2...
Fix 500 error when requesting the favicon when not logged in.
diff --git a/spec/importers/data_transformers/csv_transformer_spec.rb b/spec/importers/data_transformers/csv_transformer_spec.rb index abc1234..def5678 100644 --- a/spec/importers/data_transformers/csv_transformer_spec.rb +++ b/spec/importers/data_transformers/csv_transformer_spec.rb @@ -19,6 +19,21 @@ ]) ...
Revert "Remove spec for scenario that doesn't exist in the project (no headers in CSV export file)" This reverts commit d2c16d9d8bf849a459900e6bc6e4b6b1a3fd27a8.
diff --git a/cranium.gemspec b/cranium.gemspec index abc1234..def5678 100644 --- a/cranium.gemspec +++ b/cranium.gemspec @@ -13,7 +13,7 @@ spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ['lib'] - spec.add_runtime_dependency 'pg', '~> 1' + spec.add_runtime_dependency 'pg', '>...
AA-8903: Allow to use older version of pg too
diff --git a/effective_datatables.gemspec b/effective_datatables.gemspec index abc1234..def5678 100644 --- a/effective_datatables.gemspec +++ b/effective_datatables.gemspec @@ -20,5 +20,5 @@ s.add_dependency 'coffee-rails' s.add_dependency 'effective_bootstrap' s.add_dependency 'effective_resources' - s.add_de...
Drop sass-rails dependency, so sites can use sassc-rails or sass-rails.
diff --git a/config/initializers/slack_api.rb b/config/initializers/slack_api.rb index abc1234..def5678 100644 --- a/config/initializers/slack_api.rb +++ b/config/initializers/slack_api.rb @@ -12,4 +12,6 @@ Slack.chat_postMessage(options) end -client.start +Thread.new do + client.start +end
Send websocket work to background thread
diff --git a/db/migrate/20210319155627_update_return_adjustments.rb b/db/migrate/20210319155627_update_return_adjustments.rb index abc1234..def5678 100644 --- a/db/migrate/20210319155627_update_return_adjustments.rb +++ b/db/migrate/20210319155627_update_return_adjustments.rb @@ -0,0 +1,17 @@+class UpdateReturnAdjustme...
Migrate return adjustments source to originator
diff --git a/event_store-client.gemspec b/event_store-client.gemspec index abc1234..def5678 100644 --- a/event_store-client.gemspec +++ b/event_store-client.gemspec @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- Gem::Specification.new do |s| s.name = 'event_store-client' - s.version = '0.0.1.3' + s.version = '0.0.1.4'...
Increase version from 0.0.1.3 to 0.0.1.4
diff --git a/sms_ru.gemspec b/sms_ru.gemspec index abc1234..def5678 100644 --- a/sms_ru.gemspec +++ b/sms_ru.gemspec @@ -17,9 +17,8 @@ spec.require_paths = ['lib'] spec.required_ruby_version = '>= 2.0.0' - spec.add_dependency 'activesupport', '~> 4.2.0' spec.add_dependency 'launchy', '~> 2.4' - spec.add_dep...
Remove outdated activesupport dependency Update webmock dependency version
diff --git a/rails_presenter.gemspec b/rails_presenter.gemspec index abc1234..def5678 100644 --- a/rails_presenter.gemspec +++ b/rails_presenter.gemspec @@ -1,3 +1,5 @@+# encoding: utf-8 + $:.push File.expand_path("../lib", __FILE__) # Maintain your gem's version:
Add encoding: utf-8 to gemspec
diff --git a/spec/models.rb b/spec/models.rb index abc1234..def5678 100644 --- a/spec/models.rb +++ b/spec/models.rb @@ -8,5 +8,5 @@ class Note include NoBrainer::Document field :body, default: 'made by orm' - belongs_to :user, foreign_key: :owner_id + belongs_to :owner, foreign_key: :owner_id, class_name: 'Use...
Tweak associations to better match reference implementation
diff --git a/app/controllers/renalware/system/errors_controller.rb b/app/controllers/renalware/system/errors_controller.rb index abc1234..def5678 100644 --- a/app/controllers/renalware/system/errors_controller.rb +++ b/app/controllers/renalware/system/errors_controller.rb @@ -13,7 +13,9 @@ def generate_test_int...
Add padding to test error to check party_foul title length This is to test our assertion that party_foul is posting titles longer than 256 chars.