diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/vim-flavor.gemspec b/vim-flavor.gemspec index abc1234..def5678 100644 --- a/vim-flavor.gemspec +++ b/vim-flavor.gemspec @@ -15,6 +15,7 @@ gem.require_paths = ['lib'] gem.version = Vim::Flavor::VERSION + gem.add_dependency('thor', '~> 0.14.6') + gem.add_development_dependency('rspec', '~> 2...
Fix dependency type for thor Thor is a runtime dependency, not a development dependency.
diff --git a/core/app/models/mno_enterprise/app_question.rb b/core/app/models/mno_enterprise/app_question.rb index abc1234..def5678 100644 --- a/core/app/models/mno_enterprise/app_question.rb +++ b/core/app/models/mno_enterprise/app_question.rb @@ -5,6 +5,6 @@ belongs_to :app scope :approved, -> { where(stat...
Fix specs on MRI 2.1
diff --git a/FDStatusBarNotifierView.podspec b/FDStatusBarNotifierView.podspec index abc1234..def5678 100644 --- a/FDStatusBarNotifierView.podspec +++ b/FDStatusBarNotifierView.podspec @@ -4,7 +4,7 @@ s.summary = "FDStatusBarNotifier is a UIView subclass that lets you display notifications using the space in whi...
Change the podspec source URL
diff --git a/spec/unit/lib/infrataster/contexts/dns_contexts_spec.rb b/spec/unit/lib/infrataster/contexts/dns_contexts_spec.rb index abc1234..def5678 100644 --- a/spec/unit/lib/infrataster/contexts/dns_contexts_spec.rb +++ b/spec/unit/lib/infrataster/contexts/dns_contexts_spec.rb @@ -4,12 +4,13 @@ # Infrataster conte...
Replace tests have_entry with a test with stub
diff --git a/lib/backup/finder.rb b/lib/backup/finder.rb index abc1234..def5678 100644 --- a/lib/backup/finder.rb +++ b/lib/backup/finder.rb @@ -22,7 +22,7 @@ ## # Loads the backup configuration file - instance_eval(File.read(config)) + instance_eval(File.read(config), config, 1) ## ...
Support require with relative path (from current file) in Backup config files. Without giving the second and third args, the string-based instance_eval doesn't provide valid __FILE__ and __LINE__ references within the backup config file. Useful for building a relative path, among other things.
diff --git a/lib/notifier/base.rb b/lib/notifier/base.rb index abc1234..def5678 100644 --- a/lib/notifier/base.rb +++ b/lib/notifier/base.rb @@ -20,7 +20,7 @@ def notify_once(message, device_tokens, payload = nil) if FwtPushNotificationServer.delivery_method == :test - FwtPushNotificationServer.d...
Update testing code for notifier code
diff --git a/lib/marples/model_action_broadcast.rb b/lib/marples/model_action_broadcast.rb index abc1234..def5678 100644 --- a/lib/marples/model_action_broadcast.rb +++ b/lib/marples/model_action_broadcast.rb @@ -9,7 +9,6 @@ class_attribute :marples_transport # You *will* need to set this yourself in e...
Remove automagic implicit default for marples_client_name The application should set this explicitly. The implicit behaviour is brittle since it depends on the application's directory name, which can change between environments (e.g. it's different in Jenkins), and is therefore a potential source of bugs.
diff --git a/gotero.rb b/gotero.rb index abc1234..def5678 100644 --- a/gotero.rb +++ b/gotero.rb @@ -32,7 +32,7 @@ OUT - diag << {:message => method} + diag << {:message => method, :receiver => binding.eval('self')} end end @@ -43,11 +43,13 @@ set_trace_func nil def assert(value, expected = true) - if v...
Test sender and receiver of first node
diff --git a/lib/tasks/update_mainstream_slug.rake b/lib/tasks/update_mainstream_slug.rake index abc1234..def5678 100644 --- a/lib/tasks/update_mainstream_slug.rake +++ b/lib/tasks/update_mainstream_slug.rake @@ -2,5 +2,5 @@ See original documentation @ https://github.com/alphagov/wiki/wiki/Changing-GOV.UK-URLs#making-...
Add STDOUT logging to slug changes In order to give some feedback add some logging to STDOUT so we know whats happening
diff --git a/app/helpers/devise_helper.rb b/app/helpers/devise_helper.rb index abc1234..def5678 100644 --- a/app/helpers/devise_helper.rb +++ b/app/helpers/devise_helper.rb @@ -1,14 +1,26 @@ # frozen_string_literal: true module DeviseHelper - # Retain this method for backwards compatibility, deprecated in favour of...
Improve deprecation message with example of how to remove it The deprecation of `devise_error_messages!` wasn't super clear on what was happening and how to get rid of the message, not it has a more detailed explanation with an example of what to look for and what to replace it with. Closes #5257.
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index abc1234..def5678 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -28,11 +28,16 @@ end end def already_registered?(event_id) - binding.pry if current_user.registrations.where("id = ?",event_id) tr...
Add helper method for displaying event type
diff --git a/app/mailers/person_mailer.rb b/app/mailers/person_mailer.rb index abc1234..def5678 100644 --- a/app/mailers/person_mailer.rb +++ b/app/mailers/person_mailer.rb @@ -8,8 +8,6 @@ @screen_name = person.read_attribute(:twitter_id) subject = "New person added from Twitter: #{@screen_name}" - UserRo...
Fix staff member notification of twitter user Supports #255
diff --git a/app/models/reports/graphs.rb b/app/models/reports/graphs.rb index abc1234..def5678 100644 --- a/app/models/reports/graphs.rb +++ b/app/models/reports/graphs.rb @@ -25,7 +25,7 @@ order_details = OrderDetail.joins(:order).where(orders: { status: 6 }) .group_by { |m| ...
Update month year for items by month
diff --git a/test/helper/testgem/testgem.gemspec b/test/helper/testgem/testgem.gemspec index abc1234..def5678 100644 --- a/test/helper/testgem/testgem.gemspec +++ b/test/helper/testgem/testgem.gemspec @@ -11,6 +11,6 @@ s.license = 'BSD-3-Clause' s.require_paths << 'lib' s.required_ruby_version = '>= 2.1.0' - s...
Add a second dependency and version constraints for "gem install" test ... to make sure they are handled properly
diff --git a/test/integration/navigation_test.rb b/test/integration/navigation_test.rb index abc1234..def5678 100644 --- a/test/integration/navigation_test.rb +++ b/test/integration/navigation_test.rb @@ -5,7 +5,7 @@ test 'can render default landing page' do visit '/' - assert page.has_text? "That was easy,...
Update integration test for new welcome page copy.
diff --git a/lib/gdata.rb b/lib/gdata.rb index abc1234..def5678 100644 --- a/lib/gdata.rb +++ b/lib/gdata.rb @@ -18,5 +18,5 @@ require 'gdata/client' require 'gdata/auth' # This is for Unicode "support" -require 'jcode' -$KCODE = 'UTF8'+require 'jcode' if RUBY_VERSION < '1.9' +$KCODE = 'UTF8'
Fix for new Ruby version.
diff --git a/db/migrate/20110707234802_likes_on_comments.rb b/db/migrate/20110707234802_likes_on_comments.rb index abc1234..def5678 100644 --- a/db/migrate/20110707234802_likes_on_comments.rb +++ b/db/migrate/20110707234802_likes_on_comments.rb @@ -1,5 +1,5 @@ class LikesOnComments < ActiveRecord::Migration - class Li...
Fix likes on comments migration
diff --git a/lib/omniauth/multiprovider/models/email_mockups.rb b/lib/omniauth/multiprovider/models/email_mockups.rb index abc1234..def5678 100644 --- a/lib/omniauth/multiprovider/models/email_mockups.rb +++ b/lib/omniauth/multiprovider/models/email_mockups.rb @@ -8,7 +8,7 @@ end def mocked_email? - ...
Fix for non initialised emails this could happen when the record is not persisted
diff --git a/hodgepodge.gemspec b/hodgepodge.gemspec index abc1234..def5678 100644 --- a/hodgepodge.gemspec +++ b/hodgepodge.gemspec @@ -11,16 +11,8 @@ spec.summary = %q{Brew your mac system packages.} spec.description = %q{Install and manage your system binaries and system app packages.} - spec.homepag...
Remove unwanted code from the homepage.
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 @@ -17,7 +17,7 @@ end def cuketagger - "ruby -rubygems #{ROOT}/bin/cuketagger" + "ruby -W0 -rubygems #{ROOT}/bin/cuketagger" end end
Make features pass on 1.9
diff --git a/foodspot_friend_oga.rb b/foodspot_friend_oga.rb index abc1234..def5678 100644 --- a/foodspot_friend_oga.rb +++ b/foodspot_friend_oga.rb @@ -0,0 +1,87 @@+#!/usr/bin/env ruby + +# This script uses Selenium WebDriver, Nokogiri and Safari to scrape the +# friends and followers lists of the currently logged-in ...
Add Oga version of foodspot_friend
diff --git a/lib/sastrawi/morphology/disambiguator/disambiguator_prefix_rule11.rb b/lib/sastrawi/morphology/disambiguator/disambiguator_prefix_rule11.rb index abc1234..def5678 100644 --- a/lib/sastrawi/morphology/disambiguator/disambiguator_prefix_rule11.rb +++ b/lib/sastrawi/morphology/disambiguator/disambiguator_pref...
Add implementation of eleventh rule of disambiguator prefix
diff --git a/SwiftLintFramework.podspec b/SwiftLintFramework.podspec index abc1234..def5678 100644 --- a/SwiftLintFramework.podspec +++ b/SwiftLintFramework.podspec @@ -10,5 +10,5 @@ s.source_files = 'Source/SwiftLintFramework/**/*.swift' s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }...
Update Yams to 1.0 in podspec
diff --git a/app/models/cohort.rb b/app/models/cohort.rb index abc1234..def5678 100644 --- a/app/models/cohort.rb +++ b/app/models/cohort.rb @@ -4,4 +4,11 @@ def organisations groups.where('parent_id IS NULL') end + + def activated_organisations + #organisation_visits_count + subquery = GroupMeasuremen...
Put activated_organisations method back in
diff --git a/pre_commit/resources/empty_template/pre_commit_dummy_package.gemspec b/pre_commit/resources/empty_template/pre_commit_dummy_package.gemspec index abc1234..def5678 100644 --- a/pre_commit/resources/empty_template/pre_commit_dummy_package.gemspec +++ b/pre_commit/resources/empty_template/pre_commit_dummy_pac...
Make the dummy gem valid by giving it a summary
diff --git a/spec/support/features/fill_addresses_fields.rb b/spec/support/features/fill_addresses_fields.rb index abc1234..def5678 100644 --- a/spec/support/features/fill_addresses_fields.rb +++ b/spec/support/features/fill_addresses_fields.rb @@ -8,7 +8,7 @@ zipcode phone ] - fields += if Spree::...
Check for combined first and last name We need to use the SolidusSupport method for checking for the combined first and last name since Solidus 3 has removed the deprecated methods from the config.
diff --git a/update_commands.rb b/update_commands.rb index abc1234..def5678 100644 --- a/update_commands.rb +++ b/update_commands.rb @@ -0,0 +1,36 @@+#!/usr/bin/env ruby + +# Use this script to update the commands auto-completed in plugin/packer.vim. + +require 'open3' + +command_re = /^\s\s\s\s(\w+)/ +plugin_file = 'p...
Add script to update auto-completed commands
diff --git a/YouboraLib.podspec b/YouboraLib.podspec index abc1234..def5678 100644 --- a/YouboraLib.podspec +++ b/YouboraLib.podspec @@ -19,7 +19,7 @@ s.author = { "Nice People at Work" => "support@nicepeopleatwork.com" } # Platforms - s.ios.deployment_target = "8.0" + s.ios.deployment_target = "9....
Upgrade podspec to iOS 9.0 to avoid missing methods
diff --git a/features/step_definitions/crudecumber_steps.rb b/features/step_definitions/crudecumber_steps.rb index abc1234..def5678 100644 --- a/features/step_definitions/crudecumber_steps.rb +++ b/features/step_definitions/crudecumber_steps.rb @@ -1,5 +1,9 @@ Then(/^.*$/) do Cucumber.trap_interrupt key = capture...
Add prompt to capture tester report when failing
diff --git a/jeet-rails.gemspec b/jeet-rails.gemspec index abc1234..def5678 100644 --- a/jeet-rails.gemspec +++ b/jeet-rails.gemspec @@ -6,8 +6,8 @@ Gem::Specification.new do |spec| spec.name = 'jeet-rails' spec.version = Jeet::Rails::VERSION - spec.authors = ['Cory Simmons'] - spec.email ...
Add author, email to gemspec
diff --git a/Casks/adium-beta.rb b/Casks/adium-beta.rb index abc1234..def5678 100644 --- a/Casks/adium-beta.rb +++ b/Casks/adium-beta.rb @@ -3,8 +3,15 @@ sha256 'e7690718f14defa3bc08cd3949a4eab52e942abd47f7ac2ce7157ed7295658c6' url "https://adiumx.cachefly.net/Adium_#{version}.dmg" + name 'Adium' homepage 'h...
Add missing stanzas to Adium Beta
diff --git a/lib/aequitas/rule/confirmation.rb b/lib/aequitas/rule/confirmation.rb index abc1234..def5678 100644 --- a/lib/aequitas/rule/confirmation.rb +++ b/lib/aequitas/rule/confirmation.rb @@ -6,15 +6,15 @@ class Rule class Confirmation < Rule - equalize_on superclass.equalizer.keys + [:confirmation_a...
Fix inconsistent instance variable name in Rule::Confirmation. Settled on @confirmation_attribute_name.
diff --git a/guard-minitest.gemspec b/guard-minitest.gemspec index abc1234..def5678 100644 --- a/guard-minitest.gemspec +++ b/guard-minitest.gemspec @@ -1,5 +1,6 @@ # encoding: utf-8 -Kernel.load File.expand_path('../lib/guard/minitest/version.rb', __FILE__) +$:.push File.expand_path('../lib', __FILE__) +require 'guard...
Fix already defined VERSION error
diff --git a/lib/backports/2.6.0/hash/merge.rb b/lib/backports/2.6.0/hash/merge.rb index abc1234..def5678 100644 --- a/lib/backports/2.6.0/hash/merge.rb +++ b/lib/backports/2.6.0/hash/merge.rb @@ -3,8 +3,8 @@ class Hash unless instance_method(:merge).arity < 0 def merge_with_backports(first = {}, *others, &bloc...
Fix backport for Ruby 1.8.7
diff --git a/lib/gracefully/circuit_breaker.rb b/lib/gracefully/circuit_breaker.rb index abc1234..def5678 100644 --- a/lib/gracefully/circuit_breaker.rb +++ b/lib/gracefully/circuit_breaker.rb @@ -10,6 +10,7 @@ end @closed = true + @health = options && options[:health] || Gracefully::ConsecutiveFail...
Make CircuitBreaker rely on ConsecutiveFailuresBasedHealth by default
diff --git a/gir_ffi-tracker.gemspec b/gir_ffi-tracker.gemspec index abc1234..def5678 100644 --- a/gir_ffi-tracker.gemspec +++ b/gir_ffi-tracker.gemspec @@ -5,6 +5,9 @@ s.version = "0.3.0" s.summary = "GirFFI-based binding to Tracker" + s.description = "Bindings for Tracker generated by GirFFI, with overrides."...
Add description and license fields to gemspec
diff --git a/lib/spice.rb b/lib/spice.rb index abc1234..def5678 100644 --- a/lib/spice.rb +++ b/lib/spice.rb @@ -1,4 +1,5 @@ require 'open-uri' +require 'yaml' class Spice
Fix test failure do to missing YAML constant
diff --git a/SNSServices.podspec b/SNSServices.podspec index abc1234..def5678 100644 --- a/SNSServices.podspec +++ b/SNSServices.podspec @@ -8,7 +8,7 @@ spec.source = { :git => 'ihttps://github.com/Joohae/SNSServices.git', :tag => '#{s.version}' } - spec.source_files = 'SNSServices/*.{h,m}' + spec.s...
Change pod spec to include sub-folders
diff --git a/equalizer.gemspec b/equalizer.gemspec index abc1234..def5678 100644 --- a/equalizer.gemspec +++ b/equalizer.gemspec @@ -16,5 +16,5 @@ gem.test_files = `git ls-files -- {spec}/*`.split("\n") gem.extra_rdoc_files = %w[LICENSE README.md TODO] - gem.add_dependency 'ice_nine', '~> 0.4.0' + gem....
Bump ice_nine dep to ~> 0.5.0
diff --git a/lib/ridgepole_rake/ext/bundler.rb b/lib/ridgepole_rake/ext/bundler.rb index abc1234..def5678 100644 --- a/lib/ridgepole_rake/ext/bundler.rb +++ b/lib/ridgepole_rake/ext/bundler.rb @@ -18,7 +18,8 @@ if config.bundler[:use] && config.bundler[:clean_system] ::Bundler.clean_system(command) ...
Fix stack level too deep
diff --git a/config/initializers/pagy.rb b/config/initializers/pagy.rb index abc1234..def5678 100644 --- a/config/initializers/pagy.rb +++ b/config/initializers/pagy.rb @@ -2,14 +2,14 @@ # Pagy Variables # See https://ddnexus.github.io/pagy/api/pagy#variables -Pagy::VARS[:items] = 100 +Pagy::DEFAULT[:items] = 100 ...
Update Pagy config for version 5 Some variables were renamed.
diff --git a/config/initializers/sass.rb b/config/initializers/sass.rb index abc1234..def5678 100644 --- a/config/initializers/sass.rb +++ b/config/initializers/sass.rb @@ -3,7 +3,7 @@ module Sass::Script::Functions def settings_style(setting) assert_type setting, :String - return_value = ActiveRecord::Base....
Fix default setting for styles
diff --git a/test/everypolitician/popolo/person_real_methods_test.rb b/test/everypolitician/popolo/person_real_methods_test.rb index abc1234..def5678 100644 --- a/test/everypolitician/popolo/person_real_methods_test.rb +++ b/test/everypolitician/popolo/person_real_methods_test.rb @@ -0,0 +1,59 @@+require 'test_helper' ...
Test Person class against real data Tests Person against Estonia data
diff --git a/config/initializers/api.rb b/config/initializers/api.rb index abc1234..def5678 100644 --- a/config/initializers/api.rb +++ b/config/initializers/api.rb @@ -1,13 +1,13 @@ # frozen_string_literal: true Rails.application.configure do - config.x.core_api_sign_alg = ENV['CORE_API_SIGN_ALG'] if ENV['CORE_API...
Add default values to core API configuration [SCI-4098]
diff --git a/spec/integration/auth_spec.rb b/spec/integration/auth_spec.rb index abc1234..def5678 100644 --- a/spec/integration/auth_spec.rb +++ b/spec/integration/auth_spec.rb @@ -11,7 +11,7 @@ fill_in 'Password', :with => pass fill_in 'Password confirmation', :with => pass - click_button 'S...
Test for button being called Register
diff --git a/continuent-tools-monitoring.gemspec b/continuent-tools-monitoring.gemspec index abc1234..def5678 100644 --- a/continuent-tools-monitoring.gemspec +++ b/continuent-tools-monitoring.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| s.name = 'continuent-tools-monitoring' - s.version = '...
Increase the gem dependency and version to 0.7.0
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 @@ -30,7 +30,7 @@ end def github - Octokit::Client.new(:login => username, :oauth_token => github_access_token) + Octokit::Client.new(:login => username, :oauth_token => gith...
Enable auto traversal for full results list
diff --git a/lib/bonz/mat_general_mixin.rb b/lib/bonz/mat_general_mixin.rb index abc1234..def5678 100644 --- a/lib/bonz/mat_general_mixin.rb +++ b/lib/bonz/mat_general_mixin.rb @@ -38,7 +38,9 @@ when 1 then self.GRAY2BGR when 3 then self when 4 then self.BGRA2BGR - else raise ArgumentError # am...
Clean up gross debug logic
diff --git a/lib/bunny/heartbeat_sender.rb b/lib/bunny/heartbeat_sender.rb index abc1234..def5678 100644 --- a/lib/bunny/heartbeat_sender.rb +++ b/lib/bunny/heartbeat_sender.rb @@ -50,6 +50,7 @@ stop rescue Exception => e puts e.message + stop end end
Stop heartbeat sender on any exception it encounters
diff --git a/lib/tasks/export_content_by_organisations.rake b/lib/tasks/export_content_by_organisations.rake index abc1234..def5678 100644 --- a/lib/tasks/export_content_by_organisations.rake +++ b/lib/tasks/export_content_by_organisations.rake @@ -0,0 +1,53 @@+namespace :govuk do + # bundle exec rake govuk:export_con...
Add rake task to generate CSV(s) for tagathons We've repurposed the rake task that was introduced for the transport tagathon. For a given list of organisations, we extract all of the content that the organisation is the primary publisher and save it to a CSV named after the orgniasation.
diff --git a/lib/spree.rb b/lib/spree.rb index abc1234..def5678 100644 --- a/lib/spree.rb +++ b/lib/spree.rb @@ -8,12 +8,14 @@ module Spree module Version Major = '0' - Minor = '9' - Tiny = '99' + Minor = '10' + Tiny = '0' + Pre = nil # 'beta' class << self ...
Allow for pre-release gem versions.
diff --git a/lib/sugar.rb b/lib/sugar.rb index abc1234..def5678 100644 --- a/lib/sugar.rb +++ b/lib/sugar.rb @@ -20,6 +20,7 @@ def redis_url=(new_url) @redis = nil + @config = nil @redis_url = new_url end
Reset config when Redis URL changes
diff --git a/lib/gaku/config.rb b/lib/gaku/config.rb index abc1234..def5678 100644 --- a/lib/gaku/config.rb +++ b/lib/gaku/config.rb @@ -4,14 +4,6 @@ class Config attr_accessor :deck_root, :initial_distance attr_writer :monochrome, :utf8 - - def monochrome? - !!@monochrome - end - - def utf8? ...
Order methods of Gaku::Config better
diff --git a/lib/gogo_driver.rb b/lib/gogo_driver.rb index abc1234..def5678 100644 --- a/lib/gogo_driver.rb +++ b/lib/gogo_driver.rb @@ -3,11 +3,12 @@ class GogoDriver attr_accessor :driver - def initialize - @driver = Selenium::WebDriver.for(:chrome) + def initialize(browser=:chrome) + @driver = Selenium:...
Add logging and chnageable browser
diff --git a/command_line/rubylib_spec.rb b/command_line/rubylib_spec.rb index abc1234..def5678 100644 --- a/command_line/rubylib_spec.rb +++ b/command_line/rubylib_spec.rb @@ -0,0 +1,68 @@+require_relative '../spec_helper' + +describe "The RUBYLIB environment variable" do + before (:each) do + @rubylib, ENV["RUBYL...
Add specs for the RUBYLIB environment variable
diff --git a/app/reader.rb b/app/reader.rb index abc1234..def5678 100644 --- a/app/reader.rb +++ b/app/reader.rb @@ -37,7 +37,11 @@ article_widget = Widget::Article.new(article) comments = Widget::Comments.new(ENV["RACK_ENV"]) - render_page :articles_show, :article => article_widget, :comments...
Make category active for article view
diff --git a/config/deploy/new_staging.rb b/config/deploy/new_staging.rb index abc1234..def5678 100644 --- a/config/deploy/new_staging.rb +++ b/config/deploy/new_staging.rb @@ -2,4 +2,5 @@ set :rvm_ruby_version, '2.2.0@ridepilot' set :deploy_to, '/home/deploy/rails/ridepilot' set :rails_env, 'staging' +set :default_e...
Make sure Capistrano knows about RAILS_RELATIVE_URL_ROOT when it compiles assets
diff --git a/config/initializers/islay.rb b/config/initializers/islay.rb index abc1234..def5678 100644 --- a/config/initializers/islay.rb +++ b/config/initializers/islay.rb @@ -2,6 +2,6 @@ e.namespace :islay_shop # Navigation - e.nav_entry('Products', :catalogue) - e.nav_entry('Orders', :orders) + e.nav_entry...
Apply icons to the main nav entries.
diff --git a/spec/gemfile_version_match_spec.rb b/spec/gemfile_version_match_spec.rb index abc1234..def5678 100644 --- a/spec/gemfile_version_match_spec.rb +++ b/spec/gemfile_version_match_spec.rb @@ -1,10 +1,5 @@ # frozen_string_literal: true RSpec.describe "Gemfile Version Match" do - it "rails_4.0.gemfile.lock" do...
Update ActiveMocker Gem Version check
diff --git a/app/models/test.rb b/app/models/test.rb index abc1234..def5678 100644 --- a/app/models/test.rb +++ b/app/models/test.rb @@ -16,6 +16,11 @@ where(key: key, baseline: true).first end + def as_json(options) + run = super(options) + run[:url] = self.url + return run + end def pass? ...
Add URL to model's JSON output
diff --git a/app/helpers/sync_helper.rb b/app/helpers/sync_helper.rb index abc1234..def5678 100644 --- a/app/helpers/sync_helper.rb +++ b/app/helpers/sync_helper.rb @@ -2,7 +2,7 @@ def sync_user(user) unless user.is_syncing? if Travis::Features.enabled_for_all?(:sync_via_sidekiq) - Travis::Sidekiq:...
Use user_id only when triggering Sidekiq.
diff --git a/app/mailers/post_mailer.rb b/app/mailers/post_mailer.rb index abc1234..def5678 100644 --- a/app/mailers/post_mailer.rb +++ b/app/mailers/post_mailer.rb @@ -1,4 +1,4 @@-class GameMailer < ActionMailer::Base +class PostMailer < ActionMailer::Base default from: "uro@fantasygame.pl" def notify_user(use...
Fix post mailer class name [#89850862]
diff --git a/beans.gemspec b/beans.gemspec index abc1234..def5678 100644 --- a/beans.gemspec +++ b/beans.gemspec @@ -19,4 +19,5 @@ spec.add_development_dependency 'bundler', '~> 1.6' spec.add_development_dependency 'rake' spec.add_development_dependency 'rspec' + spec.add_development_dependency 'pry' end
Add pry, because it's awesome
diff --git a/lib/cc/analyzer/filesystem.rb b/lib/cc/analyzer/filesystem.rb index abc1234..def5678 100644 --- a/lib/cc/analyzer/filesystem.rb +++ b/lib/cc/analyzer/filesystem.rb @@ -39,7 +39,9 @@ def file_paths @file_paths ||= Dir.chdir(@root) do - `find . -type f`.strip.split("\n") + ...
Split on null chars not newline
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 @@ -17,7 +17,7 @@ end if !url.start_with?('www.') - url.prepend!('www.') + url.prepend('www.') end ...
Fix incorrect call to prepend
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,6 +20,7 @@ end def gallery_referer?(picture) + return false unless request.referer URI(request.referer).p...
Fix exception in gallery_referer? helper, if referer nil.
diff --git a/week-4/variables-methods.rb b/week-4/variables-methods.rb index abc1234..def5678 100644 --- a/week-4/variables-methods.rb +++ b/week-4/variables-methods.rb @@ -13,4 +13,27 @@ puts 'What\'s your favorite number?' favorite_num = gets.chomp.to_i + 1 -puts 'That\'s nice, but don\'t you think #{favorite_num}...
Update variable-methods.rb file to include my refleciton and links to exercise solution files
diff --git a/db/migrate/20180502160657_make_can_play_concurrently_default_false.rb b/db/migrate/20180502160657_make_can_play_concurrently_default_false.rb index abc1234..def5678 100644 --- a/db/migrate/20180502160657_make_can_play_concurrently_default_false.rb +++ b/db/migrate/20180502160657_make_can_play_concurrently_...
Fix bad data during migration
diff --git a/lib/sendvia/resources/base.rb b/lib/sendvia/resources/base.rb index abc1234..def5678 100644 --- a/lib/sendvia/resources/base.rb +++ b/lib/sendvia/resources/base.rb @@ -1,6 +1,7 @@ module Sendvia class Base < ActiveResource::Base self.include_format_in_path = false + self.include_root_in_json = f...
Remove debug and set class variable include_root_in_json
diff --git a/lib/spring/watcher/polling.rb b/lib/spring/watcher/polling.rb index abc1234..def5678 100644 --- a/lib/spring/watcher/polling.rb +++ b/lib/spring/watcher/polling.rb @@ -1,3 +1,5 @@+require "spring/watcher/abstract" + module Spring module Watcher class Polling < Abstract
Add 'require "spring/watcher/abstract"' to fix isolated unit test.
diff --git a/lib/swa/cli/item_behaviour.rb b/lib/swa/cli/item_behaviour.rb index abc1234..def5678 100644 --- a/lib/swa/cli/item_behaviour.rb +++ b/lib/swa/cli/item_behaviour.rb @@ -4,8 +4,6 @@ module ItemBehaviour def self.included(target) - - target.default_subcommand = "summary" target....
Remove default command for individual items.
diff --git a/lib/tic_tac_toe/rack_shell.rb b/lib/tic_tac_toe/rack_shell.rb index abc1234..def5678 100644 --- a/lib/tic_tac_toe/rack_shell.rb +++ b/lib/tic_tac_toe/rack_shell.rb @@ -15,7 +15,7 @@ req = Rack::Request.new(env) if req.path =~ %r{^/$} - [200, {}, ["Hello, and welcome to Tic-Tac-Toe!"]]...
Use the home view on the index route
diff --git a/app/controllers/metal_decorator.rb b/app/controllers/metal_decorator.rb index abc1234..def5678 100644 --- a/app/controllers/metal_decorator.rb +++ b/app/controllers/metal_decorator.rb @@ -1,6 +1,6 @@ # For the API ActionController::Metal.class_eval do def spree_current_user - @spree_current_user ||=...
Fix `env` deprecated in Rails 5.0 I found it at the very bottom of the `test-consumer-features` CI build job. See: https://github.com/rails/rails/issues/23294.
diff --git a/form_object_model.gemspec b/form_object_model.gemspec index abc1234..def5678 100644 --- a/form_object_model.gemspec +++ b/form_object_model.gemspec @@ -6,7 +6,7 @@ gem.email = ["sean@seangeo.me"] gem.description = %q{An OO form testing helper that makes Capayaba-based form testing easy.} ...
Add link to github page.
diff --git a/lib/amazon-drs/base.rb b/lib/amazon-drs/base.rb index abc1234..def5678 100644 --- a/lib/amazon-drs/base.rb +++ b/lib/amazon-drs/base.rb @@ -34,6 +34,6 @@ def parse_body(body) # abstract end - private parse_body + private :parse_body end end
Fix forgotten ':' for symbol
diff --git a/lib/audited/sweeper.rb b/lib/audited/sweeper.rb index abc1234..def5678 100644 --- a/lib/audited/sweeper.rb +++ b/lib/audited/sweeper.rb @@ -1,15 +1,13 @@ require 'rails-observers' +require 'rails/observers/active_model' module Audited class Sweeper < ActiveModel::Observer observe Audited.audit_c...
Remove deprecation warning of filter object
diff --git a/lib/capybara/server.rb b/lib/capybara/server.rb index abc1234..def5678 100644 --- a/lib/capybara/server.rb +++ b/lib/capybara/server.rb @@ -1,3 +1,4 @@+require 'uri' require 'net/http' require 'rack' require 'rack/handler/mongrel' @@ -18,6 +19,7 @@ end def url(path) + path = URI.parse(path).re...
Handle absolute URIs (happens with Rails)
diff --git a/lib/chef_zero/rspec.rb b/lib/chef_zero/rspec.rb index abc1234..def5678 100644 --- a/lib/chef_zero/rspec.rb +++ b/lib/chef_zero/rspec.rb @@ -0,0 +1,69 @@+require 'thin' +require 'tempfile' +require 'chef_zero/server' +require 'chef/config' + +module ChefZero + module RSpec + def when_the_chef_server(des...
Add RSpec DSL for working with a ChefZero server
diff --git a/examples/multi/files.rb b/examples/multi/files.rb index abc1234..def5678 100644 --- a/examples/multi/files.rb +++ b/examples/multi/files.rb @@ -0,0 +1,16 @@+# encoding: utf-8 + +require 'tty-spinner' +require 'pastel' + +pastel = Pastel.new +spinners = TTY::Spinner::Multi.new("[:spinner] Downloading files....
Add multi life downloading example
diff --git a/lib/rbac/authorizer.rb b/lib/rbac/authorizer.rb index abc1234..def5678 100644 --- a/lib/rbac/authorizer.rb +++ b/lib/rbac/authorizer.rb @@ -10,8 +10,17 @@ end - def role_allows(user:, feature:, any: nil) - auth = any.present? ? user.role_allows_any?(:identifiers => [feature]) : user.role_al...
Use legacy options hash signature Time to party like it's 2007! ...until we get this working :sob:
diff --git a/coremidi.rb b/coremidi.rb index abc1234..def5678 100644 --- a/coremidi.rb +++ b/coremidi.rb @@ -11,11 +11,11 @@ end class Packet - attr_accessor :note, :duration, :volume + attr_accessor :type, :note, :volume def initialize(api_packet) - self.note = api_packet.data[0] - se...
Fix up the packet transformation - type is probably still not 100% correct
diff --git a/lib/tmdb-api/person.rb b/lib/tmdb-api/person.rb index abc1234..def5678 100644 --- a/lib/tmdb-api/person.rb +++ b/lib/tmdb-api/person.rb @@ -8,13 +8,29 @@ attr_reader *ATTRIBUTES + # Public: Get the basic person information for a specific person ID. + # + # id - The ID of the person. +...
Add comments on find and images methods on Person.
diff --git a/lib/weather_jp/city.rb b/lib/weather_jp/city.rb index abc1234..def5678 100644 --- a/lib/weather_jp/city.rb +++ b/lib/weather_jp/city.rb @@ -1,5 +1,30 @@ module WeatherJp - class City < Struct.new(:name, :area_code) + class City + attr_reader :name + + def initialize(name, attrs = {}) + @name =...
Update Weatherjp::City for new xml
diff --git a/features/support/env.rb b/features/support/env.rb index abc1234..def5678 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -2,4 +2,5 @@ Before do @dirs = ["features/xml"] + @aruba_timeout_seconds = 30 end
Increase aruba timeout to allow for jRuby startup
diff --git a/Ressources/Private/Sass/functions.rb b/Ressources/Private/Sass/functions.rb index abc1234..def5678 100644 --- a/Ressources/Private/Sass/functions.rb +++ b/Ressources/Private/Sass/functions.rb @@ -1,13 +1,13 @@ # # Ruby functions -# -# @author 'Hopper' <http://stackoverflow.com/users/1026353/hopper> -# @li...
[MISC] Move the credits for the timestamp function into its section-header comment
diff --git a/box-ios-browse-sdk.podspec b/box-ios-browse-sdk.podspec index abc1234..def5678 100644 --- a/box-ios-browse-sdk.podspec +++ b/box-ios-browse-sdk.podspec @@ -27,6 +27,7 @@ # Build settings s.requires_arc = true s.ios.header_dir = "BoxBrowseSDK" +s.module_name = "BoxBrowseSDK" s.d...
Fix the framework naming issue preventing pod install in swift to find the source
diff --git a/cookbooks/mas/recipes/mas.rb b/cookbooks/mas/recipes/mas.rb index abc1234..def5678 100644 --- a/cookbooks/mas/recipes/mas.rb +++ b/cookbooks/mas/recipes/mas.rb @@ -1,4 +1,2 @@-mas 'Popclip' { app_id '445189367' } -mas 'Reeder' { app_id '880001334' } mas 'SafariMarkdownLinker' { app_id '1289119450' } mas ...
Delete apps that does not free
diff --git a/db/seeds.rb b/db/seeds.rb index abc1234..def5678 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -10,4 +10,9 @@ event = Event.create!(name: "White Christmas") snow = Outcome.create!(event: event, name: 'Snow at Christmas') no_snow = Outcome.create!(event: event, name: 'No snow at Christmas') -Holding....
Add multi-outcome event to seed data.
diff --git a/lib/circle/cli/model.rb b/lib/circle/cli/model.rb index abc1234..def5678 100644 --- a/lib/circle/cli/model.rb +++ b/lib/circle/cli/model.rb @@ -1,3 +1,5 @@+require 'time' + module Circle module CLI class Model
Make sure Time is loaded
diff --git a/lib/dateslices/mysql.rb b/lib/dateslices/mysql.rb index abc1234..def5678 100644 --- a/lib/dateslices/mysql.rb +++ b/lib/dateslices/mysql.rb @@ -24,7 +24,7 @@ when :year "DATE_FORMAT(#{column}, '%Y-01-01 00:00:00 UTC')" when :week # Sigh... - "DATE_FORMAT( date_sub( crea...
Fix week for columns other than created_at
diff --git a/app/models/audit_certificate.rb b/app/models/audit_certificate.rb index abc1234..def5678 100644 --- a/app/models/audit_certificate.rb +++ b/app/models/audit_certificate.rb @@ -6,7 +6,7 @@ validates :attachment, presence: true, on: :create, file_si...
Increase upload file size for audit certificates
diff --git a/core/thread/critical_spec.rb b/core/thread/critical_spec.rb index abc1234..def5678 100644 --- a/core/thread/critical_spec.rb +++ b/core/thread/critical_spec.rb @@ -1,2 +1,22 @@ require File.dirname(__FILE__) + '/../../spec_helper' -require File.dirname(__FILE__) + '/fixtures/classes'+require File.dirname(_...
Add most basic critical= specs and guard for 1.9.
diff --git a/lib/emergency_banner.rb b/lib/emergency_banner.rb index abc1234..def5678 100644 --- a/lib/emergency_banner.rb +++ b/lib/emergency_banner.rb @@ -4,11 +4,7 @@ end def enabled? - content && has_campaign_class? - end - - def has_campaign_class? - content.has_key?(:campaign_class) && content.fetc...
Hide the implementation of campaign_class Setting campaign class should be a private affair
diff --git a/app/models/album.rb b/app/models/album.rb index abc1234..def5678 100644 --- a/app/models/album.rb +++ b/app/models/album.rb @@ -4,7 +4,7 @@ before_create :generate_slug - scope :active, -> { where.not(cover_photo_id: nil) } + scope :active, -> { where.not(published_at: nil, cover_photo_id: nil) } ...
Include published_at in active scope
diff --git a/tasks/spec.rake b/tasks/spec.rake index abc1234..def5678 100644 --- a/tasks/spec.rake +++ b/tasks/spec.rake @@ -17,7 +17,7 @@ t.spec_opts = ['--format', 'html:doc/spec/index.html', '--color'] # t.out = 'doc/spec/index.html' t.rcov = true - t.rcov_opts = ['--html', '--exclude', "#{ENV['HOME'...
Exclude /usr/lib/ruby from RCov C0 code coverage report
diff --git a/qa/qa/vendor/github/page/login.rb b/qa/qa/vendor/github/page/login.rb index abc1234..def5678 100644 --- a/qa/qa/vendor/github/page/login.rb +++ b/qa/qa/vendor/github/page/login.rb @@ -12,9 +12,7 @@ fill_in 'password', with: QA::Runtime::Env.github_password click_on 'Sign in' - ...
Fix GitHub OAuth e2e spec
diff --git a/docs/examples/clean_acls.rb b/docs/examples/clean_acls.rb index abc1234..def5678 100644 --- a/docs/examples/clean_acls.rb +++ b/docs/examples/clean_acls.rb @@ -0,0 +1,35 @@+# Remove clients from the admins group +chef_group 'admins' do + remove_groups 'clients' +end + +valid_nodes = search(:node, '*:*').m...
Add a recipe that cleans up ACLs for those who did the "add clients to admins group" thing
diff --git a/providers/project.rb b/providers/project.rb index abc1234..def5678 100644 --- a/providers/project.rb +++ b/providers/project.rb @@ -1,26 +1,26 @@+use_inline_resources + action :create do - ruby_block "create / update Rundeck project #{new_resource.name}" do - block do - new_resource.api_client.ta...
Convert ruby_block to a true LWRP Signed-off-by: Tim Smith <tsmith@chef.io> Former-commit-id: 2108f4269fdb5f77bb83bc940483a77965617585
diff --git a/bmff.gemspec b/bmff.gemspec index abc1234..def5678 100644 --- a/bmff.gemspec +++ b/bmff.gemspec @@ -8,16 +8,18 @@ spec.version = BMFF::VERSION spec.authors = ["Takayuki Ogiso"] spec.email = ["gomatofu@gmail.com"] - spec.summary = %q{ISO Base Media File Format Parser} + s...
Exclude an asset file from a gem package. Exclude an asset movie file from a gem package. A movie file is too large to include in a gem package file. Some other properties are changed to more appropriate values.
diff --git a/config/schedule.rb b/config/schedule.rb index abc1234..def5678 100644 --- a/config/schedule.rb +++ b/config/schedule.rb @@ -12,6 +12,6 @@ rake "rummager:index:consultations" end -every :hour, roles: [:backend] do +every 10.minutes, roles: [:backend] do rake "taxonomy:rebuild_cache" end
Increase the number of cache refreshes for taxonomy This will make it easier to observe the behaviour. Once we're confident this works we can dial down the frequency. https://trello.com/c/fsehBQ7s