diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/lib/flor/punit/cron.rb b/lib/flor/punit/cron.rb index abc1234..def5678 100644 --- a/lib/flor/punit/cron.rb +++ b/lib/flor/punit/cron.rb @@ -47,7 +47,6 @@ th[1] << td th -.tap { |x| pp x } end end
Remove trailing pp debug output
diff --git a/app/workers/export_photos.rb b/app/workers/export_photos.rb index abc1234..def5678 100644 --- a/app/workers/export_photos.rb +++ b/app/workers/export_photos.rb @@ -3,7 +3,6 @@ # Copyright (c) 2010-2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. ...
Fix sending mails after photo export
diff --git a/lib/json_api_routes.rb b/lib/json_api_routes.rb index abc1234..def5678 100644 --- a/lib/json_api_routes.rb +++ b/lib/json_api_routes.rb @@ -10,15 +10,17 @@ constraints = { link_relation: links_regex }.merge(id_constraint(path)) post "/links/:link_relation", to: "#{ path }#update_links", - ...
Add id constraint to version routes
diff --git a/event_store-messaging.gemspec b/event_store-messaging.gemspec index abc1234..def5678 100644 --- a/event_store-messaging.gemspec +++ b/event_store-messaging.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.name = 'event_store-messaging' s.summary = 'Messaging primitives for EventStore using the...
Package version is increased from 0.1.13 to 0.1.14
diff --git a/config/initializers/delayed_job_config.rb b/config/initializers/delayed_job_config.rb index abc1234..def5678 100644 --- a/config/initializers/delayed_job_config.rb +++ b/config/initializers/delayed_job_config.rb @@ -0,0 +1,23 @@+# monkey patch BufferedLogger to allow a custom formatter +class ActiveSupport...
Isolate all DJ logging to the DJ log files.
diff --git a/lib/tasks/sidekiq.rake b/lib/tasks/sidekiq.rake index abc1234..def5678 100644 --- a/lib/tasks/sidekiq.rake +++ b/lib/tasks/sidekiq.rake @@ -6,7 +6,7 @@ # sidekiq is already running, don't need to run if Sidekiq::ProcessSet.new.size == 0 ss = Sidekiq::ScheduledSet.new - if ss.first.at <...
Handle case when ScheduledSet is empty
diff --git a/features/step_definitions/directory_steps.rb b/features/step_definitions/directory_steps.rb index abc1234..def5678 100644 --- a/features/step_definitions/directory_steps.rb +++ b/features/step_definitions/directory_steps.rb @@ -1,18 +1,4 @@ require 'tmpdir' - -Given /^a temporary directory called '(.+)'$/ ...
Delete legacy steps about $tmp and $home
diff --git a/lib/tiddle/strategy.rb b/lib/tiddle/strategy.rb index abc1234..def5678 100644 --- a/lib/tiddle/strategy.rb +++ b/lib/tiddle/strategy.rb @@ -13,7 +13,7 @@ return fail(:invalid_token) unless resource token = Tiddle::TokenIssuer.build.find_token(resource, token_from_headers) - if (to...
Improve code style by removing parenthesis
diff --git a/app/models/client.rb b/app/models/client.rb index abc1234..def5678 100644 --- a/app/models/client.rb +++ b/app/models/client.rb @@ -1,6 +1,9 @@ class Client include Mongoid::Document field :name, type: String - field :wisecrack_id, type: String embeds_many :projects + + def wisecrack_id + Wis...
Move the Wisecrack ID out of Mongo and to the API
diff --git a/db/seeds.rb b/db/seeds.rb index abc1234..def5678 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -19,16 +19,15 @@ ]) end -Jurisdiction.create([{ name: 'County Court', abbr: nil }, - { name: 'High Court', abbr: nil }, +Jurisdiction.create([{ name: 'County', abbr: nil }, + ...
Copy changed of jurisdiction names in seed data
diff --git a/db/seeds.rb b/db/seeds.rb index abc1234..def5678 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,9 +1,11 @@ require 'faker' - 20.times do - Question.create!( + question = Question.create!( title: Faker::Lorem.sentence, content: Faker::Lorem.paragraph, asker_id: rand(100), best_an...
Add seed file which populates questions with comments
diff --git a/spec/dummy/config/environments/development.rb b/spec/dummy/config/environments/development.rb index abc1234..def5678 100644 --- a/spec/dummy/config/environments/development.rb +++ b/spec/dummy/config/environments/development.rb @@ -19,9 +19,6 @@ # Print deprecation notices to the Rails logger. config....
Remove a missed reference to ActiveRecord.
diff --git a/spec/dummy/config/initializers/cornerstone.rb b/spec/dummy/config/initializers/cornerstone.rb index abc1234..def5678 100644 --- a/spec/dummy/config/initializers/cornerstone.rb +++ b/spec/dummy/config/initializers/cornerstone.rb @@ -5,7 +5,7 @@ # Specify the method in which your application accesses the a...
Test dummy app with current_user helper.
diff --git a/merb_datamapper.gemspec b/merb_datamapper.gemspec index abc1234..def5678 100644 --- a/merb_datamapper.gemspec +++ b/merb_datamapper.gemspec @@ -10,8 +10,8 @@ gem.name = 'merb_datamapper' gem.version = Merb::DataMapper::VERSION.dup gem.date = Date.today.to_s - gem.authors = [ ...
Make myself person to email
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index abc1234..def5678 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -16,4 +16,5 @@ ) end +Capybara.server = :webrick Capybara.javascript_driver = :headless_chrome
Configure Capybara to run `Webrick` in tests This commit resolves dependecy issues due to the absence of `puma` from the project's Gemfiles: ``` Failure/Error: raise LoadError, "Capybara is unable to load `puma` for its server, please add `puma` to your project or specify a different server via something like `Capyba...
diff --git a/spec/unit/client_spec.rb b/spec/unit/client_spec.rb index abc1234..def5678 100644 --- a/spec/unit/client_spec.rb +++ b/spec/unit/client_spec.rb @@ -2,11 +2,16 @@ describe Client do - # TODO: this entire class needs a test double for Resting - # which can receive messages - it "has a valid mock" do ...
Add unit tests for client
diff --git a/proxy/recipes/deploy.rb b/proxy/recipes/deploy.rb index abc1234..def5678 100644 --- a/proxy/recipes/deploy.rb +++ b/proxy/recipes/deploy.rb @@ -10,5 +10,17 @@ command "/usr/sbin/proxy2ensite #{application} #{deploy[:deploy_to]} #{deploy[:domains].join(',')}" notifies :reload, "service[nginx]" end + ...
Add automatically restart nodeJs App
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 @@ -14,6 +14,15 @@ include Capybara::DSL include RSpec::Expectations include RSpec::Matchers + + def db + @db ||= CouchRest.database(settings.db) + end +e...
Delete and create the database on each scenario
diff --git a/activelogic.gemspec b/activelogic.gemspec index abc1234..def5678 100644 --- a/activelogic.gemspec +++ b/activelogic.gemspec @@ -7,11 +7,11 @@ Gem::Specification.new do |s| s.name = "activelogic" s.version = Activelogic::VERSION - s.authors = ["TODO: Your name"] - s.email = ["TO...
Change author and app description in gemspec
diff --git a/db/migrate/20160204120652_change_publishing_app_for_email_campaign_content.rb b/db/migrate/20160204120652_change_publishing_app_for_email_campaign_content.rb index abc1234..def5678 100644 --- a/db/migrate/20160204120652_change_publishing_app_for_email_campaign_content.rb +++ b/db/migrate/20160204120652_cha...
Update EmailCampaignMigration to use the new object model
diff --git a/db/migrate/20161107113454_remove_deleted_removed_document_ids_from_manuals.rb b/db/migrate/20161107113454_remove_deleted_removed_document_ids_from_manuals.rb index abc1234..def5678 100644 --- a/db/migrate/20161107113454_remove_deleted_removed_document_ids_from_manuals.rb +++ b/db/migrate/20161107113454_rem...
Remove removed_document_ids entries that point to deleted documents At some point in the past, we fully deleted some sections from a manual so that they no longer exist. Unfortunately we left references to their ids in the removed_document_ids of the manual they used to belong to. This means that we can't republish t...
diff --git a/app/mailers/footprint_mailer.rb b/app/mailers/footprint_mailer.rb index abc1234..def5678 100644 --- a/app/mailers/footprint_mailer.rb +++ b/app/mailers/footprint_mailer.rb @@ -1,5 +1,5 @@ class FootprintMailer < ActionMailer::Base - default :from => "from@example.com" + default :from => "CO4Squared <no-r...
Update mailer address and subject
diff --git a/app/models/concerns/gravatar.rb b/app/models/concerns/gravatar.rb index abc1234..def5678 100644 --- a/app/models/concerns/gravatar.rb +++ b/app/models/concerns/gravatar.rb @@ -0,0 +1,80 @@+module Gravatar + # Provides methods for social data added through Gravatar's Verified Services + extend ActiveSuppo...
Add Gravatar module for User model. Prefills data on registration
diff --git a/app/models/departure_fetcher.rb b/app/models/departure_fetcher.rb index abc1234..def5678 100644 --- a/app/models/departure_fetcher.rb +++ b/app/models/departure_fetcher.rb @@ -10,7 +10,7 @@ @departures ||= stop_times.map { |stop_time| stop_time_update = realtime_updates.for_stop_time(stop_time) ...
Sort departures rather than stop_times There are cases where realtime updates change the order of departures. Ordering by departure.time ensures that they are always ordered by actual departure time.
diff --git a/app/models/role_payment_type.rb b/app/models/role_payment_type.rb index abc1234..def5678 100644 --- a/app/models/role_payment_type.rb +++ b/app/models/role_payment_type.rb @@ -3,8 +3,8 @@ attr_accessor :id, :name - Unpaied = create!(id: 1, name: "Unpaid") + Consultant = create!(id: 4, name: "Paid a...
Sort role payment type options alphabetically
diff --git a/lib/active_job/queue_adapters/que_adapter.rb b/lib/active_job/queue_adapters/que_adapter.rb index abc1234..def5678 100644 --- a/lib/active_job/queue_adapters/que_adapter.rb +++ b/lib/active_job/queue_adapters/que_adapter.rb @@ -5,7 +5,7 @@ class QueAdapter class << self def enqueue(job,...
Fix database serialization of job class names with Que When passing a class constant as a job argument, Que’s stored procedures serialize it to JSON in the database as `{}`. This means that when the job (the ActiveJob “wrapper”) is deserialized from the database, it can’t find the original job class to run again. Cha...
diff --git a/rack-honeytoken.gemspec b/rack-honeytoken.gemspec index abc1234..def5678 100644 --- a/rack-honeytoken.gemspec +++ b/rack-honeytoken.gemspec @@ -6,7 +6,7 @@ Gem::Specification.new do |spec| spec.name = "rack-honeytoken" spec.version = Rack::Honeytoken::VERSION - spec.license = "B...
Update gemspec licenses to be array of strings
diff --git a/test/server/feature_baseline_speed_test.rb b/test/server/feature_baseline_speed_test.rb index abc1234..def5678 100644 --- a/test/server/feature_baseline_speed_test.rb +++ b/test/server/feature_baseline_speed_test.rb @@ -10,7 +10,7 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - multi_os_tes...
Reduce maximum for baseline speed test
diff --git a/lib/kaminari/models/data_mapper_extension.rb b/lib/kaminari/models/data_mapper_extension.rb index abc1234..def5678 100644 --- a/lib/kaminari/models/data_mapper_extension.rb +++ b/lib/kaminari/models/data_mapper_extension.rb @@ -5,8 +5,10 @@ module Paginatable class_eval <<-RUBY, __FILE__, __LINE...
Fix for Model.all.page in DataMapper
diff --git a/lib/skeptic/rules/spaces_around_operators.rb b/lib/skeptic/rules/spaces_around_operators.rb index abc1234..def5678 100644 --- a/lib/skeptic/rules/spaces_around_operators.rb +++ b/lib/skeptic/rules/spaces_around_operators.rb @@ -41,4 +41,4 @@ end end end -end+end
Add newline at the end of a file
diff --git a/lib/sprockets/media_query_combiner/engine.rb b/lib/sprockets/media_query_combiner/engine.rb index abc1234..def5678 100644 --- a/lib/sprockets/media_query_combiner/engine.rb +++ b/lib/sprockets/media_query_combiner/engine.rb @@ -1,9 +1,9 @@ require 'sprockets/media_query_combiner/processor' -if defined?(R...
Use ::Rails instead of Rails Prevents Rails 4 Rake error: uninitialized constant Sprockets::Rails::Engine
diff --git a/app/models/delivery.rb b/app/models/delivery.rb index abc1234..def5678 100644 --- a/app/models/delivery.rb +++ b/app/models/delivery.rb @@ -7,15 +7,11 @@ after_save :update_status! def self.today - # Currently created_at on deliveries doesn't get set so have to get the time from emails - # T...
Use created_at time that is now set in deliveries table
diff --git a/ruby/resistor-color-duo/resistor_color_duo.rb b/ruby/resistor-color-duo/resistor_color_duo.rb index abc1234..def5678 100644 --- a/ruby/resistor-color-duo/resistor_color_duo.rb +++ b/ruby/resistor-color-duo/resistor_color_duo.rb @@ -4,10 +4,12 @@ "#{ColorArray.index(colors[0])}#{ColorArray.index(colors[...
Add red & make private
diff --git a/db/migrate/20160702205006_create_items.rb b/db/migrate/20160702205006_create_items.rb index abc1234..def5678 100644 --- a/db/migrate/20160702205006_create_items.rb +++ b/db/migrate/20160702205006_create_items.rb @@ -3,7 +3,7 @@ create_table :items do |t| t.integer :user_id, null: false ...
Add null:false constraint to item image attachment
diff --git a/lib/haproxy_weight/config.rb b/lib/haproxy_weight/config.rb index abc1234..def5678 100644 --- a/lib/haproxy_weight/config.rb +++ b/lib/haproxy_weight/config.rb @@ -29,7 +29,7 @@ tempfile = Tempfile.new('haproxy.cfg') tempfile.write(@lines.join("\n")) tempfile.close - File.mv tempfi...
Use FileUtils to move tempfile
diff --git a/lib/iban-tools/conversion.rb b/lib/iban-tools/conversion.rb index abc1234..def5678 100644 --- a/lib/iban-tools/conversion.rb +++ b/lib/iban-tools/conversion.rb @@ -33,7 +33,7 @@ def self.load_config(country_code) default_config = YAML. - load(File.read(File.dirname(__FILE__) + '/convers...
Use YAML.load_file instead of YAML.load(File.Read). Use File.join instead of concatenating bits of path.
diff --git a/lib/rolify/adapters/active_record/resource_adapter.rb b/lib/rolify/adapters/active_record/resource_adapter.rb index abc1234..def5678 100644 --- a/lib/rolify/adapters/active_record/resource_adapter.rb +++ b/lib/rolify/adapters/active_record/resource_adapter.rb @@ -1,25 +1,25 @@ require 'rolify/adapters/base...
Fix bug only primary key id.
diff --git a/lib/tasks/taxonomy/export_taxonomy_to_json.rake b/lib/tasks/taxonomy/export_taxonomy_to_json.rake index abc1234..def5678 100644 --- a/lib/tasks/taxonomy/export_taxonomy_to_json.rake +++ b/lib/tasks/taxonomy/export_taxonomy_to_json.rake @@ -1,59 +1,23 @@-require 'json' - namespace :taxonomy do - desc <<-D...
Add to_file task to export namespace This implements the build function on the new TaxonTreeExport class to build the taxon tree array and convert it to JSON. Then saves the JSON to a file in the temp directory The json task now also implements the TaxonTreeExport build function.
diff --git a/lib/liquid/newspaper_drop.rb b/lib/liquid/newspaper_drop.rb index abc1234..def5678 100644 --- a/lib/liquid/newspaper_drop.rb +++ b/lib/liquid/newspaper_drop.rb @@ -34,7 +34,7 @@ def latest_by_section unless @latest_articles_for_sections @latest_articles_for_sections = {} - for article in...
Fix typo in last commit.
diff --git a/lib/models/team/team_bnet.rb b/lib/models/team/team_bnet.rb index abc1234..def5678 100644 --- a/lib/models/team/team_bnet.rb +++ b/lib/models/team/team_bnet.rb @@ -9,11 +9,15 @@ if characters.any? results = [] characters.each do |character| - character.process_result(RBattl...
Handle HTTP errors in workaround.
diff --git a/spec/unit/templates/rabbitmq-server-version_spec.rb b/spec/unit/templates/rabbitmq-server-version_spec.rb index abc1234..def5678 100644 --- a/spec/unit/templates/rabbitmq-server-version_spec.rb +++ b/spec/unit/templates/rabbitmq-server-version_spec.rb @@ -0,0 +1,22 @@+require 'spec_helper' +require 'bosh/t...
Add test for new `rabbitmq-server-version` template [#155509097] Signed-off-by: Michal Kuratczyk <304440fa11254af9197fe70f6c35e6528f26afc4@pivotal.io>
diff --git a/rubygems-yardoc.gemspec b/rubygems-yardoc.gemspec index abc1234..def5678 100644 --- a/rubygems-yardoc.gemspec +++ b/rubygems-yardoc.gemspec @@ -21,5 +21,4 @@ gem.add_development_dependency 'bundler' gem.add_development_dependency 'rake' - gem.add_development_dependency 'redcarpet' end
Remove Redcarpet from dev dependencies
diff --git a/diffux-core.gemspec b/diffux-core.gemspec index abc1234..def5678 100644 --- a/diffux-core.gemspec +++ b/diffux-core.gemspec @@ -20,7 +20,7 @@ s.add_dependency 'phantomjs', '1.9.8.0' s.add_dependency 'diff-lcs', '~> 1.2' - s.add_development_dependency 'rspec', '~> 2.14' + s.add_development_dependen...
Update rspec dev dependency from 2.14 -> 3.3
diff --git a/lib/rackjson/rack/builder.rb b/lib/rackjson/rack/builder.rb index abc1234..def5678 100644 --- a/lib/rackjson/rack/builder.rb +++ b/lib/rackjson/rack/builder.rb @@ -1,11 +1,23 @@-module Rack #:nodoc: +module Rack class Builder + # Setup resource collections without authentication. + # + # ===Exa...
Add examples of using the Rack::Builder shortcuts
diff --git a/farmbot.god b/farmbot.god index abc1234..def5678 100644 --- a/farmbot.god +++ b/farmbot.god @@ -2,5 +2,6 @@ w.name = "farmbot_rpi_controller" w.dir = File.expand_path(File.dirname(__FILE__)) w.start = "ruby farmbot.rb" - w.keepalive + w.keepalive(memory_max: 150.megabytes, + cpu_max:...
Add sensible CPU/Mem restart thresholds
diff --git a/DFImageManager.podspec b/DFImageManager.podspec index abc1234..def5678 100644 --- a/DFImageManager.podspec +++ b/DFImageManager.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "DFImageManager" - s.version = "0.0.14" - s.summary = "Complete solution for fetching, preheating, ...
Update podspec to version 0.0.15
diff --git a/lib/web_console/evaluator.rb b/lib/web_console/evaluator.rb index abc1234..def5678 100644 --- a/lib/web_console/evaluator.rb +++ b/lib/web_console/evaluator.rb @@ -19,7 +19,14 @@ end def eval(input) - "=> #{@binding.eval(input).inspect}\n" + # Binding#source_location is available since...
Make binding.eval Ruby 3.0 compatible. Ruby 3.0 changes behavior of `binding.eval` [[1]] resulting in test failure: ~~~ WebConsole::EvaluatorTest#test_Evaluator_callers_are_cleaned_up_of_unneeded_backtraces [/home/travis/build/rails/web-console/test/web_console/evaluator_test.rb:63]: --- expected +++ actual @@ -1,3 +...
diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb index abc1234..def5678 100644 --- a/app/mailers/notifier.rb +++ b/app/mailers/notifier.rb @@ -17,7 +17,7 @@ end def self.admin_addresses - ['sheri.tibbs@duke.edu'] + ['sheri.tibbs@duke.edu','ctti@duke.edu'] end def instructions(user)
Add new citi service account email to Notifier
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,6 @@ if Supermarket::Config.sentry_url.present? && !Rails.env.test? require 'raven' + require 'raven/sidekiq' Raven.configure d...
Send Sidekiq errors to Sentry
diff --git a/web/lib/assets/umakadata/lib/umakadata/void.rb b/web/lib/assets/umakadata/lib/umakadata/void.rb index abc1234..def5678 100644 --- a/web/lib/assets/umakadata/lib/umakadata/void.rb +++ b/web/lib/assets/umakadata/lib/umakadata/void.rb @@ -25,16 +25,18 @@ # @return [Array] attr_reader :publisher ...
Change method call to compact.
diff --git a/lib/bond/missions/default_mission.rb b/lib/bond/missions/default_mission.rb index abc1234..def5678 100644 --- a/lib/bond/missions/default_mission.rb +++ b/lib/bond/missions/default_mission.rb @@ -6,14 +6,16 @@ "then", "true", "undef", "unless", "until", "when", "while", "yield" ] + + # Default ac...
Modify DefaultMission to be reusable, add ivars to default completion
diff --git a/lib/fulmar/service/helper_service.rb b/lib/fulmar/service/helper_service.rb index abc1234..def5678 100644 --- a/lib/fulmar/service/helper_service.rb +++ b/lib/fulmar/service/helper_service.rb @@ -6,6 +6,7 @@ ## # Reverse file lookup in path # @param path [String] + # @param...
[DOCS] Complete documentation of function arguments
diff --git a/spec/debian/grub_spec.rb b/spec/debian/grub_spec.rb index abc1234..def5678 100644 --- a/spec/debian/grub_spec.rb +++ b/spec/debian/grub_spec.rb @@ -4,4 +4,5 @@ it { should be_file } it { should contain "tsc=reliable" } it { should contain "divider=10" } + it { should contain "GRUB_TIMEOUT=5" } end
Test to ensure 5 second grub timout. IMAGE-543
diff --git a/lib/template/lib/endpoints/health.rb b/lib/template/lib/endpoints/health.rb index abc1234..def5678 100644 --- a/lib/template/lib/endpoints/health.rb +++ b/lib/template/lib/endpoints/health.rb @@ -14,11 +14,11 @@ private def database? - raise Pliny::Errors::NotFound if DB.nil? + ...
Use fail instead of raise
diff --git a/lib/virtual-attributes/base/casts.rb b/lib/virtual-attributes/base/casts.rb index abc1234..def5678 100644 --- a/lib/virtual-attributes/base/casts.rb +++ b/lib/virtual-attributes/base/casts.rb @@ -2,7 +2,7 @@ module Casts extend ActiveSupport::Concern - TYPES = ActiveRecord::Base.connection.nati...
Change the way the list of types is readen by relaying on classes
diff --git a/spec/models/grok_spec.rb b/spec/models/grok_spec.rb index abc1234..def5678 100644 --- a/spec/models/grok_spec.rb +++ b/spec/models/grok_spec.rb @@ -11,7 +11,7 @@ end it 'should handle timeout errors' do - stub_request(:any, %r{.*}) + stub_request(:any, %r{.*}).to_raise(Errno::ETIMEDOUT...
Fix timeout test for grok
diff --git a/spec/pomona/tree_spec.rb b/spec/pomona/tree_spec.rb index abc1234..def5678 100644 --- a/spec/pomona/tree_spec.rb +++ b/spec/pomona/tree_spec.rb @@ -0,0 +1,107 @@+require "spec_helper" + +describe Tree do + let(:tree) { Tree.new } + + describe "readable attributes" do + describe "data" do + it "sh...
Write Most of Tree Specs
diff --git a/app/models/kpi/report/dynamic_definitions.rb b/app/models/kpi/report/dynamic_definitions.rb index abc1234..def5678 100644 --- a/app/models/kpi/report/dynamic_definitions.rb +++ b/app/models/kpi/report/dynamic_definitions.rb @@ -10,7 +10,7 @@ end def method_blacklisted?(name) - n...
Fix for 1.8.7 and instance methods
diff --git a/git_info.rb b/git_info.rb index abc1234..def5678 100644 --- a/git_info.rb +++ b/git_info.rb @@ -41,7 +41,7 @@ def redmine_refs merge_base = `git merge-base HEAD master`.chomp `git log #{merge_base}..HEAD --format='%b' | grep refs`. - gsub('refs #', '').chomp.split(/\s /).uniq.sort_...
Fix issue reference number splitting Split on one or more whitespace characters, not one whitespace character and a space.
diff --git a/server.rb b/server.rb index abc1234..def5678 100644 --- a/server.rb +++ b/server.rb @@ -3,30 +3,45 @@ require './lib/GameStatistics' require 'curses' require './lib/CursesStatsPrinter' +require 'optparse' + +options = {} +OptionParser.new do |opts| + opts.banner = "Usage: server.rb [options]" + + opts....
Add ability to use or disable ncurses
diff --git a/concord_runner.rb b/concord_runner.rb index abc1234..def5678 100644 --- a/concord_runner.rb +++ b/concord_runner.rb @@ -2,7 +2,7 @@ date = "#{"%02d" % day}.09.2010" puts "date = #{date}" - starting_offset_x = 0 + starting_offset_x = 3800 starting_offset_y = 0 size = 4000
Set some offsets for the Concord data.
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb index abc1234..def5678 100644 --- a/config/initializers/carrierwave.rb +++ b/config/initializers/carrierwave.rb @@ -8,7 +8,7 @@ config.fog_directory = Configuration[:aws_bucket] config.fog_attributes = { 'Cache-Control' => 'm...
Add Fog Region When upload
diff --git a/cookbooks/bcpc/recipes/cpupower.rb b/cookbooks/bcpc/recipes/cpupower.rb index abc1234..def5678 100644 --- a/cookbooks/bcpc/recipes/cpupower.rb +++ b/cookbooks/bcpc/recipes/cpupower.rb @@ -18,7 +18,7 @@ # package "cpufrequtils" do - action :remove + action :purge end if node['bcpc']['hardware']['po...
Purge cpufrequtils instead of removing
diff --git a/cookbooks/npm_package_json/recipes/default.rb b/cookbooks/npm_package_json/recipes/default.rb index abc1234..def5678 100644 --- a/cookbooks/npm_package_json/recipes/default.rb +++ b/cookbooks/npm_package_json/recipes/default.rb @@ -1,3 +1,7 @@ execute "npm install" do - command "su -c \"cd /vagrant; npm i...
Split npm and bower install commands
diff --git a/aarons_gnuplot.gemspec b/aarons_gnuplot.gemspec index abc1234..def5678 100644 --- a/aarons_gnuplot.gemspec +++ b/aarons_gnuplot.gemspec @@ -8,9 +8,9 @@ gem.version = AaronsGnuplot::VERSION gem.authors = ["Aaron Marburg"] gem.email = ["amarburg@notetofutureself.org"] - gem.descr...
Set Gem description and summary.
diff --git a/route_downcaser.gemspec b/route_downcaser.gemspec index abc1234..def5678 100644 --- a/route_downcaser.gemspec +++ b/route_downcaser.gemspec @@ -22,4 +22,5 @@ s.files = Dir['{lib}/**/*'] + ['MIT-LICENSE', 'Rakefile', 'README.rdoc'] s.test_files = Dir['test/**/*'] s.add_runtime_dependency 'activesupp...
Add Standard as a development dependency https://github.com/testdouble/standard Let's just adhere to a common standard for Ruby style without configuration and discussions.
diff --git a/resources/clear_cache.rb b/resources/clear_cache.rb index abc1234..def5678 100644 --- a/resources/clear_cache.rb +++ b/resources/clear_cache.rb @@ -20,7 +20,7 @@ property :databases, Array, default: %w(passwd group hosts services netgroup) action :clear do - databases.each do |cmd| + new_resource.data...
Resolve Chef 14 deprecation warning Signed-off-by: Tim Smith <764ef62106582a09ed09dfa0b6bff7c05fd7d1e4@chef.io>
diff --git a/spec/connection_spec.rb b/spec/connection_spec.rb index abc1234..def5678 100644 --- a/spec/connection_spec.rb +++ b/spec/connection_spec.rb @@ -10,7 +10,7 @@ end describe "mysql adapter option" do - it "returns a new instance of MySql adapter" do + it "returns a new instance of MySQL adapter" ...
Clean up Postgres bits of connection spec
diff --git a/lib/data_structures_101/hash/base_hash_table.rb b/lib/data_structures_101/hash/base_hash_table.rb index abc1234..def5678 100644 --- a/lib/data_structures_101/hash/base_hash_table.rb +++ b/lib/data_structures_101/hash/base_hash_table.rb @@ -1,8 +1,9 @@ module DataStructures101 module Hash cl...
Include enumerable and each method implementation
diff --git a/definitions/iptables_rule.rb b/definitions/iptables_rule.rb index abc1234..def5678 100644 --- a/definitions/iptables_rule.rb +++ b/definitions/iptables_rule.rb @@ -22,7 +22,7 @@ template "/etc/iptables.d/#{params[:name]}" do source template_source - mode 0644 + mode '0644' cookbook pa...
Use a string for mode to preserve the leading 0
diff --git a/test/integration/local_transaction_creation_test.rb b/test/integration/local_transaction_creation_test.rb index abc1234..def5678 100644 --- a/test/integration/local_transaction_creation_test.rb +++ b/test/integration/local_transaction_creation_test.rb @@ -0,0 +1,17 @@+require 'integration_test_helper' + +c...
Add very basic integration test for local transaction creation
diff --git a/spec/statistics_spec.rb b/spec/statistics_spec.rb index abc1234..def5678 100644 --- a/spec/statistics_spec.rb +++ b/spec/statistics_spec.rb @@ -0,0 +1,12 @@+require_relative '../lib/statistics' + +describe Workerholic::Statistics do + it 'initializes attributes with without an argument' do + statistics...
Add spec for initialize method
diff --git a/Template/{PROJECT}.podspec b/Template/{PROJECT}.podspec index abc1234..def5678 100644 --- a/Template/{PROJECT}.podspec +++ b/Template/{PROJECT}.podspec @@ -13,6 +13,6 @@ s.watchos.deployment_target = "2.0" s.tvos.deployment_target = "9.0" s.source = { :git => "{URL}.git", :tag => "0.1" } - s...
Update source files in podspec template
diff --git a/config/initializers/geocoder.rb b/config/initializers/geocoder.rb index abc1234..def5678 100644 --- a/config/initializers/geocoder.rb +++ b/config/initializers/geocoder.rb @@ -1,2 +1,6 @@-Geocoder::Configuration.lookup = :yahoo -Geocoder::Configuration.api_key = "FZGMCffV34GyRHDpvcpT8NrASJtqaZ5_mdzn0gL5tAF...
Use Yahoo as Geocoding API in Tests. They know no limits.
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index abc1234..def5678 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -1,5 +1,10 @@ OmniAuth.config.logger = Rails.logger Rails.application.config.middleware.use OmniAuth::Builder do - provider :goo...
Configure Google auth to be less obnoxious. Also asking a properly-sized avatar image with a a square ratio.
diff --git a/test/appharbor_test.rb b/test/appharbor_test.rb index abc1234..def5678 100644 --- a/test/appharbor_test.rb +++ b/test/appharbor_test.rb @@ -12,6 +12,9 @@ @stubs.post "/application/#{application_slug}/build" do |env| assert_equal token, env[:params]["authorization"] assert_equal 'applicati...
Verify that there's only a single branch in request body
diff --git a/app/admin/users.rb b/app/admin/users.rb index abc1234..def5678 100644 --- a/app/admin/users.rb +++ b/app/admin/users.rb @@ -6,12 +6,6 @@ index :download_links => false do column :name column :email - column "Invitation Link" do |user| - if user.invitation_token - link_to "Invite ...
Remove invitation link from admin user list
diff --git a/lib/c2y/dsl/context/update.rb b/lib/c2y/dsl/context/update.rb index abc1234..def5678 100644 --- a/lib/c2y/dsl/context/update.rb +++ b/lib/c2y/dsl/context/update.rb @@ -11,14 +11,12 @@ instance_eval(&block) end - private + [:group, :reboot_strategy].each do |attr| + define_method(att...
Use dynamic method definition in Update
diff --git a/src/dec6/fire_hazard2.rb b/src/dec6/fire_hazard2.rb index abc1234..def5678 100644 --- a/src/dec6/fire_hazard2.rb +++ b/src/dec6/fire_hazard2.rb @@ -0,0 +1,35 @@+require 'pp' + +@light_grid = [] + + +@light_grid = 1000.times.map do |x| + 1000.times.map{ |y| false } +end + + +File.open('data/dec6/input.txt'...
Add copy of fire_hazard.rb to rewrite
diff --git a/lib/dhis2/api/data_element.rb b/lib/dhis2/api/data_element.rb index abc1234..def5678 100644 --- a/lib/dhis2/api/data_element.rb +++ b/lib/dhis2/api/data_element.rb @@ -15,7 +15,8 @@ domain_type: element[:domain_type] || "AGGREGATE", value_type: element[:value_typ...
Add more backward compatibility options
diff --git a/lib/docker-provider/config.rb b/lib/docker-provider/config.rb index abc1234..def5678 100644 --- a/lib/docker-provider/config.rb +++ b/lib/docker-provider/config.rb @@ -6,13 +6,12 @@ def initialize @image = nil @cmd = UNSET_VALUE - @ports = UNSET_VALUE + ...
Allow ports to be specified from the `Vagrantfile`
diff --git a/test/factories/user.rb b/test/factories/user.rb index abc1234..def5678 100644 --- a/test/factories/user.rb +++ b/test/factories/user.rb @@ -2,6 +2,8 @@ FactoryGirl.define do factory :user do + first_name { Faker::Name.first_name } + last_name { Faker::Name.last_name } email { Faker::Interne...
Fix up the User tests
diff --git a/app/controllers/admin/cache_purge_controller.rb b/app/controllers/admin/cache_purge_controller.rb index abc1234..def5678 100644 --- a/app/controllers/admin/cache_purge_controller.rb +++ b/app/controllers/admin/cache_purge_controller.rb @@ -5,6 +5,7 @@ logger.info "[Forest] Performing user-issued cache ...
Expire application cache key when purging cache from admin screen
diff --git a/app/controllers/browse/activities_controller.rb b/app/controllers/browse/activities_controller.rb index abc1234..def5678 100644 --- a/app/controllers/browse/activities_controller.rb +++ b/app/controllers/browse/activities_controller.rb @@ -8,8 +8,8 @@ end @material = ::Activity.find(params[:...
Fix flash notice on material preview page - Fix flash notice for anonymous users on material preview page.
diff --git a/app/models/document.rb b/app/models/document.rb index abc1234..def5678 100644 --- a/app/models/document.rb +++ b/app/models/document.rb @@ -8,6 +8,14 @@ Dir.glob("#{DIR_PATH}/*.md").sort.map do |filename| self.new(File.basename(filename, '.*')) end + end + + def first + sel...
Add first and last class method to Document model
diff --git a/semantic_logger.gemspec b/semantic_logger.gemspec index abc1234..def5678 100644 --- a/semantic_logger.gemspec +++ b/semantic_logger.gemspec @@ -1,4 +1,5 @@-$:.push File.expand_path("../lib", __FILE__) +lib = File.expand_path('../lib/', __FILE__) +$:.unshift lib unless $:.include?(lib) # Maintain your ge...
Update gem spec to pull in version form the source
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -6,4 +6,4 @@ long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) source_url 'https://github.com/GSI-HPC/sys-chef-cookbook' issues_url 'https://github.com/GSI-HPC/sys-chef-cookbo...
Add test for fuse recipe
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 @@ -4,4 +4,6 @@ devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable, :confirmable + has_many :users_questionnaires + has...
Add Questionnaire association to User model
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 @@ -24,4 +24,8 @@ end end + def hours_spent + self.projects.map {|p| p.hours}.sum + end + end
Add hours _spent instance method
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 @@ -8,5 +8,5 @@ validates :email, presence: true, length: { maximum: 255 }, uniqueness: { case_sensitive: false } has_secure_password - validates :password, presence: true, length...
Update password vallidation to only check length
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ maintainer 'Sous Chefs' maintainer_email 'help@sous-chefs.org' chef_version '>= 11' if respond_to?(:chef_version) -license 'Apache 2.0' +license 'Apache-2.0' description 'Installs and configures a...
Use a SPDX standard license string Signed-off-by: Tim Smith <764ef62106582a09ed09dfa0b6bff7c05fd7d1e4@chef.io>
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -11,7 +11,7 @@ recommends 'java', '>= 1.21.2' -%w(centos debian redhat scientific ubuntu).each do |os| +%w(amazon centos debian redhat scientific ubuntu).each do |os| supports os end
Add amazon to the list of supported operating systems
diff --git a/lib/sensu/plugin/check/cli.rb b/lib/sensu/plugin/check/cli.rb index abc1234..def5678 100644 --- a/lib/sensu/plugin/check/cli.rb +++ b/lib/sensu/plugin/check/cli.rb @@ -17,6 +17,16 @@ define_method(status.downcase) do |msg| puts "#{status}: #{msg}" code + end + ...
Allow setting a check_name and prepend to the output (default to class name)
diff --git a/app/models/carto/helpers/data_import_commons.rb b/app/models/carto/helpers/data_import_commons.rb index abc1234..def5678 100644 --- a/app/models/carto/helpers/data_import_commons.rb +++ b/app/models/carto/helpers/data_import_commons.rb @@ -2,7 +2,6 @@ require_dependency 'cartodb/import_error_codes' modu...
Fix format of DataImport error text
diff --git a/lib/teamcity/client/common.rb b/lib/teamcity/client/common.rb index abc1234..def5678 100644 --- a/lib/teamcity/client/common.rb +++ b/lib/teamcity/client/common.rb @@ -13,11 +13,10 @@ # Take a list of locators to search on multiple criterias # def locator(options={}) - test = opt...
Remove unnecessary storing of results in locator method
diff --git a/lib/veritas/aggregate/mean.rb b/lib/veritas/aggregate/mean.rb index abc1234..def5678 100644 --- a/lib/veritas/aggregate/mean.rb +++ b/lib/veritas/aggregate/mean.rb @@ -22,8 +22,8 @@ # @api public def self.call(accumulator, value) count, mean = accumulator - count = count....
Use Count.call instead of incrementing the count inline
diff --git a/spec/integration/nutrella/command_integration_spec.rb b/spec/integration/nutrella/command_integration_spec.rb index abc1234..def5678 100644 --- a/spec/integration/nutrella/command_integration_spec.rb +++ b/spec/integration/nutrella/command_integration_spec.rb @@ -2,6 +2,28 @@ vcr_options = { cassette_nam...
Implement a basic integration test.
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb index abc1234..def5678 100644 --- a/spec/controllers/sessions_controller_spec.rb +++ b/spec/controllers/sessions_controller_spec.rb @@ -0,0 +1,93 @@+require 'spec_helper' + +describe SessionsController do + describ...
Add specs for sessions controller including 2FA This also contains specs for a bug described in #14900
diff --git a/spec/lib/set_member_subject_selector_spec.rb b/spec/lib/set_member_subject_selector_spec.rb index abc1234..def5678 100644 --- a/spec/lib/set_member_subject_selector_spec.rb +++ b/spec/lib/set_member_subject_selector_spec.rb @@ -0,0 +1,31 @@+require 'spec_helper' + +describe SetMemberSubjectSelector do + l...
Bring SMSSelector somewhat under test
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 @@ -9,10 +9,10 @@ require 'simplecov' require 'sinatra' -SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ +SimpleCov.formatter = SimpleCov::Formatter::Mu...
Update to support newer version of cucumber