diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/config/environments/development.rb b/config/environments/development.rb index abc1234..def5678 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -36,4 +36,4 @@ # config.action_view.raise_on_missing_translations = true end -ENV["ELASTICSEARCH_URL"] |= "http://l...
Fix elasticsearch connection in dev
diff --git a/fluent-plugin-graphite.gemspec b/fluent-plugin-graphite.gemspec index abc1234..def5678 100644 --- a/fluent-plugin-graphite.gemspec +++ b/fluent-plugin-graphite.gemspec @@ -17,7 +17,7 @@ gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } gem.require_paths = ['lib'] - g...
Make gem installable with fluentd 0.12.x versions as well
diff --git a/lib/extensions/require_nested.rb b/lib/extensions/require_nested.rb index abc1234..def5678 100644 --- a/lib/extensions/require_nested.rb +++ b/lib/extensions/require_nested.rb @@ -6,6 +6,7 @@ filename = "#{self}::#{name}".underscore filename = name.to_s.underscore if self == Object if Rails.a...
Raise exception if nested file will never be found It is possible to give autoload an invalid path, and that issue will never be found until the associated constant is vivified. This causes issues where people forget to remove the require_nested calls when they remove the files. Now, it's not possible to forget, bec...
diff --git a/lib/heroku-request-id/railtie.rb b/lib/heroku-request-id/railtie.rb index abc1234..def5678 100644 --- a/lib/heroku-request-id/railtie.rb +++ b/lib/heroku-request-id/railtie.rb @@ -1,7 +1,7 @@ module HerokuRequestId class Railtie < Rails::Railtie initializer 'heroku_request_id.add_middleware' do |ap...
Insert the middleware absolutely first in the stack, instead of after Rack::Lock. This addresses : https://github.com/Octo-Labs/heroku-request-id/issues/1
diff --git a/lib/openid_token_proxy/config.rb b/lib/openid_token_proxy/config.rb index abc1234..def5678 100644 --- a/lib/openid_token_proxy/config.rb +++ b/lib/openid_token_proxy/config.rb @@ -18,6 +18,7 @@ end def provider_config + # TODO: Add support for refreshing provider configuration @provi...
Add TODO before we forget
diff --git a/lib/rom/support/class_builder.rb b/lib/rom/support/class_builder.rb index abc1234..def5678 100644 --- a/lib/rom/support/class_builder.rb +++ b/lib/rom/support/class_builder.rb @@ -1,10 +1,24 @@ module ROM + # Internal support class for generating classes + # + # @private class ClassBuilder inclu...
Add YARD docs to ClassBuilder support class
diff --git a/bldr.gemspec b/bldr.gemspec index abc1234..def5678 100644 --- a/bldr.gemspec +++ b/bldr.gemspec @@ -25,4 +25,5 @@ s.add_development_dependency 'sinatra', '~>1.2.6' s.add_development_dependency 'tilt', '~>1.3.2' s.add_development_dependency 'yajl-ruby' + s.add_development_dependency 'actionp...
Add actionpack 3.0.7 to development dependencies
diff --git a/lasp.gemspec b/lasp.gemspec index abc1234..def5678 100644 --- a/lasp.gemspec +++ b/lasp.gemspec @@ -13,7 +13,9 @@ spec.homepage = "https://github.com/alcesleo/lasp" spec.license = "MIT" - spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/})...
Use plain Ruby to select files in gemspec
diff --git a/jekyll-asciidoc.gemspec b/jekyll-asciidoc.gemspec index abc1234..def5678 100644 --- a/jekyll-asciidoc.gemspec +++ b/jekyll-asciidoc.gemspec @@ -17,5 +17,7 @@ s.require_paths = ['lib'] s.add_runtime_dependency 'asciidoctor', '>= 0.1.4' + + s.add_development_dependency 'rake', '~> 10.0' s.add_deve...
Add rake dependency to gemspec Bundler complains when running `bundle exec rake` without rake in gemspec/Gemfile.
diff --git a/lib/boxen/preflight/os.rb b/lib/boxen/preflight/os.rb index abc1234..def5678 100644 --- a/lib/boxen/preflight/os.rb +++ b/lib/boxen/preflight/os.rb @@ -1,11 +1,29 @@ require "boxen/preflight" class Boxen::Preflight::OS < Boxen::Preflight + SUPPORTED_RELEASES = %w(10.8 10.9) + def ok? - `sw_vers -...
Add 10.9 to list of supported OS X releases
diff --git a/lib/cloud_cost_tracker.rb b/lib/cloud_cost_tracker.rb index abc1234..def5678 100644 --- a/lib/cloud_cost_tracker.rb +++ b/lib/cloud_cost_tracker.rb @@ -21,13 +21,4 @@ logger end - # Returns a Class object, which is some subclass of BillingClass - # based on the +fog_provider+, +fog_service+, and...
Remove unneeded CloudCostTracker static class method
diff --git a/db/migrate/20110705003445_counter_cache_on_post_likes.rb b/db/migrate/20110705003445_counter_cache_on_post_likes.rb index abc1234..def5678 100644 --- a/db/migrate/20110705003445_counter_cache_on_post_likes.rb +++ b/db/migrate/20110705003445_counter_cache_on_post_likes.rb @@ -1,6 +1,11 @@ class CounterCache...
Update the Post counter caches when adding the counter cache column
diff --git a/db/migrate/20191203103441_set_new_heat_losses_to_zero.rb b/db/migrate/20191203103441_set_new_heat_losses_to_zero.rb index abc1234..def5678 100644 --- a/db/migrate/20191203103441_set_new_heat_losses_to_zero.rb +++ b/db/migrate/20191203103441_set_new_heat_losses_to_zero.rb @@ -0,0 +1,88 @@+class SetNewHeatLo...
Add migration for new heat loss key Commit message from old key is taken Demand is set to zero for all datasets with old key
diff --git a/db/migrate/20201227122327_add_included_to_adjustments.rb b/db/migrate/20201227122327_add_included_to_adjustments.rb index abc1234..def5678 100644 --- a/db/migrate/20201227122327_add_included_to_adjustments.rb +++ b/db/migrate/20201227122327_add_included_to_adjustments.rb @@ -1,4 +1,6 @@ class AddIncludedTo...
Update migration to include TaxRate model
diff --git a/lib/deptree/dependency.rb b/lib/deptree/dependency.rb index abc1234..def5678 100644 --- a/lib/deptree/dependency.rb +++ b/lib/deptree/dependency.rb @@ -7,20 +7,20 @@ def initialize(name, prerequisites = []) @name = name + @actions = [] @prerequisites = prerequisites - @actions...
Use an Array to store actions
diff --git a/lib/edition_duplicator.rb b/lib/edition_duplicator.rb index abc1234..def5678 100644 --- a/lib/edition_duplicator.rb +++ b/lib/edition_duplicator.rb @@ -8,7 +8,7 @@ self.actor = actor end - # new_format : A new format to create (eg. 'answer') + # new_format : The format of the new edit...
Update description of the new_format parameter
diff --git a/lib/eeny-meeny/railtie.rb b/lib/eeny-meeny/railtie.rb index abc1234..def5678 100644 --- a/lib/eeny-meeny/railtie.rb +++ b/lib/eeny-meeny/railtie.rb @@ -19,7 +19,7 @@ ActionController::Base.send :include, EenyMeeny::ExperimentHelper ActionView::Base.send :include, EenyMeeny::ExperimentHelper ...
Update syntax for middleware.insert_before to support rails 5
diff --git a/lib/yars/request_queue.rb b/lib/yars/request_queue.rb index abc1234..def5678 100644 --- a/lib/yars/request_queue.rb +++ b/lib/yars/request_queue.rb @@ -1,4 +1,5 @@ module Yars + # A thread safe queue built using monitors class AtomicQueue attr_reader :size @@ -32,8 +33,7 @@ @size == 0 ...
Add top level comments for queue
diff --git a/lib/rutty.rb b/lib/rutty.rb index abc1234..def5678 100644 --- a/lib/rutty.rb +++ b/lib/rutty.rb @@ -7,7 +7,19 @@ require 'rutty/node' require 'rutty/nodes' +## +# The RuTTY top-level module. Everything in the RuTTY gem is contained in this module. +# +# @author Josh Lindsey +# @since 2.0.0 module Rutty...
Add YARD docs to Rutty::Runner
diff --git a/lib/tasks.rb b/lib/tasks.rb index abc1234..def5678 100644 --- a/lib/tasks.rb +++ b/lib/tasks.rb @@ -34,7 +34,7 @@ namespace :package do @rapper.definitions.each do |type, definition| desc "Package all #{type} assets that need re-packaging" - task key do + ...
Fix typo in rake task.
diff --git a/spec/perpetuity/attribute_spec.rb b/spec/perpetuity/attribute_spec.rb index abc1234..def5678 100644 --- a/spec/perpetuity/attribute_spec.rb +++ b/spec/perpetuity/attribute_spec.rb @@ -2,7 +2,7 @@ module Perpetuity describe Attribute do - subject { Perpetuity::Attribute.new :article, Object } + s...
Remove explicit namespace from Attribute spec Unnecessary since the spec itself is wrapped in the namespace.
diff --git a/lib/memoizable.rb b/lib/memoizable.rb index abc1234..def5678 100644 --- a/lib/memoizable.rb +++ b/lib/memoizable.rb @@ -7,7 +7,7 @@ require 'memoizable/memory' require 'memoizable/version' -# Allow methods to be idempotent +# Allow methods to be memoized module Memoizable # Default freezer
Change comment to be more precise
diff --git a/lib/pygmentize.rb b/lib/pygmentize.rb index abc1234..def5678 100644 --- a/lib/pygmentize.rb +++ b/lib/pygmentize.rb @@ -1,20 +1,25 @@ require "shellwords" class Pygmentize - VERSION = "0.0.3" + VERSION = "0.0.3.1" def self.bin "/usr/bin/env python #{File.expand_path("../vendor/pygmentize.py"...
Support for multiple options through hash syntax.
diff --git a/lib/qu/payload.rb b/lib/qu/payload.rb index abc1234..def5678 100644 --- a/lib/qu/payload.rb +++ b/lib/qu/payload.rb @@ -4,7 +4,7 @@ class Payload < OpenStruct include Logger - undef_method :id + undef_method(:id) if method_defined?(:id) def initialize(options = {}) super
Fix Payload on Ruby 1.9
diff --git a/lib/sql_origin.rb b/lib/sql_origin.rb index abc1234..def5678 100644 --- a/lib/sql_origin.rb +++ b/lib/sql_origin.rb @@ -21,7 +21,7 @@ # Enables SQL:Origin backtrace logging to the Rails log. def self.append_to_log - %w( PostgreSQLAdapter MysqlAdapter Mysql2Adapter OracleAdapter SQLiteAdapter ).ea...
Fix for new SQLite adapter name
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake index abc1234..def5678 100644 --- a/lib/tasks/db.rake +++ b/lib/tasks/db.rake @@ -2,16 +2,9 @@ namespace :db do desc "Hard development sqlite3 reset && seed" task :hard_reset do - file_name = 'db/development.sqlite3' - print "[del] #{file_name}" - ...
Upgrade hard_reset for postgres && sqlite
diff --git a/Casks/google-play-music-desktop-player.rb b/Casks/google-play-music-desktop-player.rb index abc1234..def5678 100644 --- a/Casks/google-play-music-desktop-player.rb +++ b/Casks/google-play-music-desktop-player.rb @@ -0,0 +1,25 @@+cask 'google-play-music-desktop-player' do + version '3.0.0' + sha256 '7196a...
Add Google Play Music Desktop Player.app v3.0.0
diff --git a/core-library/bm_so_count_words.rb b/core-library/bm_so_count_words.rb index abc1234..def5678 100644 --- a/core-library/bm_so_count_words.rb +++ b/core-library/bm_so_count_words.rb @@ -6,7 +6,7 @@ 500.times do - input = open(File.join(File.dirname($0), 'wc.input'), 'rb') + input = open(File.dirname(__...
Set absolute path for input file.
diff --git a/test/integration/multisite_test.rb b/test/integration/multisite_test.rb index abc1234..def5678 100644 --- a/test/integration/multisite_test.rb +++ b/test/integration/multisite_test.rb @@ -12,15 +12,14 @@ def test_login site! 'site1' - sign_in_as people(:jim) post_sign_in_form 'tom@exampl...
Fix multisite test breakage due to changes in use of flash.
diff --git a/lib/gimei.rb b/lib/gimei.rb index abc1234..def5678 100644 --- a/lib/gimei.rb +++ b/lib/gimei.rb @@ -1,8 +1,8 @@+require 'forwardable' +require 'yaml' require 'gimei/version' require 'gimei/name' require 'gimei/address' -require 'yaml' -require 'forwardable' class Gimei extend Forwardable
Fix raise error due to order of `require`
diff --git a/app/controllers/robots_controller.rb b/app/controllers/robots_controller.rb index abc1234..def5678 100644 --- a/app/controllers/robots_controller.rb +++ b/app/controllers/robots_controller.rb @@ -1,7 +1,7 @@ # # == RobotsController # -class RobotsController < ApplicationController +class RobotsController...
Make RobotsController inherit from ActionController::Base
diff --git a/test/unit/recipes/nsswitch_spec.rb b/test/unit/recipes/nsswitch_spec.rb index abc1234..def5678 100644 --- a/test/unit/recipes/nsswitch_spec.rb +++ b/test/unit/recipes/nsswitch_spec.rb @@ -0,0 +1,35 @@+describe 'sys::nsswitch' do + + context "node['sys']['nsswitch'] is empty" do + let(:chef_run) { ChefS...
Add unit tests for sys::nsswitch
diff --git a/lib/axiom/types/type.rb b/lib/axiom/types/type.rb index abc1234..def5678 100644 --- a/lib/axiom/types/type.rb +++ b/lib/axiom/types/type.rb @@ -14,9 +14,9 @@ raise NotImplementedError, "#{inspect} should not be instantiated" end - def self.constraint(constraint = nil, &block) - ...
Change Type.constraint to not accept a nil value
diff --git a/lib/axiom/types/type.rb b/lib/axiom/types/type.rb index abc1234..def5678 100644 --- a/lib/axiom/types/type.rb +++ b/lib/axiom/types/type.rb @@ -36,7 +36,8 @@ def self.include?(object) included = constraint.call(object) if included != true && included != false - raise TypeEr...
Update error message to be more clear
diff --git a/app/services/analytics/index_page.rb b/app/services/analytics/index_page.rb index abc1234..def5678 100644 --- a/app/services/analytics/index_page.rb +++ b/app/services/analytics/index_page.rb @@ -24,7 +24,7 @@ result[:user_uid] = user.uid result[:user_name] = user.name resul...
Switch to using tr rather than gsub As gsub isn't necessary.
diff --git a/lib/files_for_backup.rb b/lib/files_for_backup.rb index abc1234..def5678 100644 --- a/lib/files_for_backup.rb +++ b/lib/files_for_backup.rb @@ -14,7 +14,16 @@ end end - all_files = remove_excludes(Find.find(@backup_folder).to_a, logger) + # exclude directories + find_files = Find.find...
Fix local file count (exclude directories).
diff --git a/lib/lager.rb b/lib/lager.rb index abc1234..def5678 100644 --- a/lib/lager.rb +++ b/lib/lager.rb @@ -37,8 +37,7 @@ halt(401, "Not authorized") unless services_params services_params["servers"].each do |server_name| server = Server.find_by(label: server_name) - service = Service.create(nam...
Remove append for creating a new service
diff --git a/app/uploaders/image_uploader_base.rb b/app/uploaders/image_uploader_base.rb index abc1234..def5678 100644 --- a/app/uploaders/image_uploader_base.rb +++ b/app/uploaders/image_uploader_base.rb @@ -32,6 +32,7 @@ io.download do |original| versions[:master] = ImageProcessing::MiniMagick. so...
Use page 0 image for master image
diff --git a/spec/models/article_spec.rb b/spec/models/article_spec.rb index abc1234..def5678 100644 --- a/spec/models/article_spec.rb +++ b/spec/models/article_spec.rb @@ -10,9 +10,9 @@ end it "only return published articles" do - @published.should_not be_empty + expect(@published).not_to be_empty ...
Use 'expect' instead of 'should'
diff --git a/doc/ex/tspan03.rb b/doc/ex/tspan03.rb index abc1234..def5678 100644 --- a/doc/ex/tspan03.rb +++ b/doc/ex/tspan03.rb @@ -7,9 +7,9 @@ canvas.g.translate(100, 60) do |grp| grp.text.styles(:font_family=>'Verdana', :font_size=>45) do |txt| - txt.tspan("Rotation ") - txt.tspa...
Fix text positioning to work better with IM 6.3.1
diff --git a/spec/mongo_doc/root_spec.rb b/spec/mongo_doc/root_spec.rb index abc1234..def5678 100644 --- a/spec/mongo_doc/root_spec.rb +++ b/spec/mongo_doc/root_spec.rb @@ -3,8 +3,12 @@ describe "MongoDoc::Root" do class RootTest include MongoDoc::Root - attr_accessor_with_default(:_associations) {[]} + a...
Refactor spec to remove AS 3.1 deprecation warning
diff --git a/spec/ruby_tokenizer_spec.rb b/spec/ruby_tokenizer_spec.rb index abc1234..def5678 100644 --- a/spec/ruby_tokenizer_spec.rb +++ b/spec/ruby_tokenizer_spec.rb @@ -1,6 +1,10 @@ require 'spec_helper' +require 'ruby_tokenizer' + describe RubyTokenizer do + let(:token) {RubyTokenizer.new('Searching records is ...
Add helper method to spec
diff --git a/config/environments/test.rb b/config/environments/test.rb index abc1234..def5678 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -35,5 +35,3 @@ config.assets.paths << Rails.root.join("test/javascripts") end - -require "slimmer/test"
Remove redundant changes to slimmer use
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 @@ -4,7 +4,7 @@ html = '' content_tag(:address) do html << - "#{location.address1} \n<br />\n #{location.city}, \ + "...
Fix bug introduced in Rubocop refactoring
diff --git a/lib/stats.rb b/lib/stats.rb index abc1234..def5678 100644 --- a/lib/stats.rb +++ b/lib/stats.rb @@ -5,10 +5,6 @@ class Stats def initialize @statsd = Statsd.new('127.0.0.1', 8125) - end - - def dyno_id - @dyno_id ||= ENV['DYNO'] || 'unknown' end def increment(name)
Remove unused DYNO variable This variable was provided by heroku when the project first started.
diff --git a/app/models/taxon_ancestor.rb b/app/models/taxon_ancestor.rb index abc1234..def5678 100644 --- a/app/models/taxon_ancestor.rb +++ b/app/models/taxon_ancestor.rb @@ -1,5 +1,5 @@ class TaxonAncestor < ActiveRecord::Base - # attr_accessible :title, :body + attr_accessible :parent_id, :child_id belongs_to ...
Make parent_id and child_id assignable
diff --git a/nack.gemspec b/nack.gemspec index abc1234..def5678 100644 --- a/nack.gemspec +++ b/nack.gemspec @@ -8,9 +8,12 @@ EOS s.files = [ - 'lib/nack/client.rb', - 'lib/nack/server.rb', - 'lib/nack.rb' + 'lib/nack.rb', + 'lib/nack/builder', + 'lib/nack/client' + 'lib/nack/error', + 'l...
Add missing ruby files to gemspec
diff --git a/activemodel/lib/active_model/validations/absence.rb b/activemodel/lib/active_model/validations/absence.rb index abc1234..def5678 100644 --- a/activemodel/lib/active_model/validations/absence.rb +++ b/activemodel/lib/active_model/validations/absence.rb @@ -11,7 +11,7 @@ module HelperMethods # V...
Fix a typo in AbsenceValidator
diff --git a/lib/netsuite/records/inter_company_journal_entry_line.rb b/lib/netsuite/records/inter_company_journal_entry_line.rb index abc1234..def5678 100644 --- a/lib/netsuite/records/inter_company_journal_entry_line.rb +++ b/lib/netsuite/records/inter_company_journal_entry_line.rb @@ -8,7 +8,7 @@ fields :cre...
Add line level subsidiary field
diff --git a/25_assembunny_clock.rb b/25_assembunny_clock.rb index abc1234..def5678 100644 --- a/25_assembunny_clock.rb +++ b/25_assembunny_clock.rb @@ -0,0 +1,23 @@+require_relative 'lib/assembunny' +assembler = Assembunny::Interpreter.new(ARGF.readlines) + +# We can't be sure that any number of bits is enough for *ar...
Add day 25: Assembunny Clock
diff --git a/no-style-please.gemspec b/no-style-please.gemspec index abc1234..def5678 100644 --- a/no-style-please.gemspec +++ b/no-style-please.gemspec @@ -12,8 +12,8 @@ spec.files = `git ls-files -z`.split("\x0").select { |f| f.match(%r!^(assets|_layouts|_includes|_sass|LICENSE|README|_config\.yml)!i) } ...
Update Jekyll to version 3.9.0
diff --git a/features/support/widget.rb b/features/support/widget.rb index abc1234..def5678 100644 --- a/features/support/widget.rb +++ b/features/support/widget.rb @@ -38,6 +38,8 @@ eval(code) end + alias_method :eval_in_page, :eval_find + def load_test_page visit "/test" end
[tests] Add more generic evaluation alias.
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,6 +1,7 @@ require Rails.root.join('lib', 'yammer-strategy') require Rails.root.join('lib', 'yammer-staging-strategy') OmniAuth....
Hide authentication error messages during tests
diff --git a/lib/omniauth/strategies/kerberos.rb b/lib/omniauth/strategies/kerberos.rb index abc1234..def5678 100644 --- a/lib/omniauth/strategies/kerberos.rb +++ b/lib/omniauth/strategies/kerberos.rb @@ -15,7 +15,7 @@ info do { username: username, - email: username + "@" + @krb5.get_default_r...
Convert realm to downcase when building email
diff --git a/core/spec/support/schema.rb b/core/spec/support/schema.rb index abc1234..def5678 100644 --- a/core/spec/support/schema.rb +++ b/core/spec/support/schema.rb @@ -17,6 +17,7 @@ ROM::Types.const_get(id).meta(**meta) end + # @todo Use this method consistently in all the test suite def define_attrib...
Add todo note about pending refactor in tests
diff --git a/lib/puppet/functions/inline_yaml.rb b/lib/puppet/functions/inline_yaml.rb index abc1234..def5678 100644 --- a/lib/puppet/functions/inline_yaml.rb +++ b/lib/puppet/functions/inline_yaml.rb @@ -0,0 +1,31 @@+require 'yaml' + +Puppet::Functions.create_function(:inline_yaml) do + dispatch :from_variable do + ...
Add a function to return a value as an inline yaml string
diff --git a/app/helpers/player_helper.rb b/app/helpers/player_helper.rb index abc1234..def5678 100644 --- a/app/helpers/player_helper.rb +++ b/app/helpers/player_helper.rb @@ -14,10 +14,10 @@ module PlayerHelper def is_mejs_2? - !is_mejs_4? + session['mejs_version'] == 2 || params['mejs4'] === 'false' en...
Use MEJS4 unless told to do otherwise
diff --git a/src/oc-id/spec/support/monkeypatch.rb b/src/oc-id/spec/support/monkeypatch.rb index abc1234..def5678 100644 --- a/src/oc-id/spec/support/monkeypatch.rb +++ b/src/oc-id/spec/support/monkeypatch.rb @@ -0,0 +1,18 @@+# This patch is only required when using rails 4.2 with ruby 2.6 +# +# https://github.com/rail...
Fix verify pipeline oc-id tests oc-id is built on rails 4.2.11 which fails tests with: `ThreadError: already initialized` with Ruby 2.6.x This commit adds src/oc-id/spec/support/monkeypatch.rb to prevent rails from reusing `ActionController::TestResponse` object in tests. See: https://github.com/rails/rails/issues/...
diff --git a/app/models/enterprise_fee.rb b/app/models/enterprise_fee.rb index abc1234..def5678 100644 --- a/app/models/enterprise_fee.rb +++ b/app/models/enterprise_fee.rb @@ -2,7 +2,6 @@ belongs_to :enterprise calculated_adjustments - has_one :calculator, :as => :calculable, :dependent => :destroy, :class_n...
Remove association that's already added by Spree's calculated_adjustments
diff --git a/lib/apple_dep_client/device.rb b/lib/apple_dep_client/device.rb index abc1234..def5678 100644 --- a/lib/apple_dep_client/device.rb +++ b/lib/apple_dep_client/device.rb @@ -29,5 +29,17 @@ end JSON.dump body end + + def self.sync + raise NotImplementedError + end + + def self....
Add unimplemented functions to Device
diff --git a/lib/boom/color.rb b/lib/boom/color.rb index abc1234..def5678 100644 --- a/lib/boom/color.rb +++ b/lib/boom/color.rb @@ -17,7 +17,9 @@ # # Returns nothing. def self.included(other) - require 'Win32/Console/ANSI' if RUBY_PLATFORM =~ /win32/ + if RUBY_PLATFORM =~ /win32/ || RUBY_PLATFO...
Check for mingw32 and it's all good on windows
diff --git a/lib/aggregate_builder/metadata/callbacks_collection.rb b/lib/aggregate_builder/metadata/callbacks_collection.rb index abc1234..def5678 100644 --- a/lib/aggregate_builder/metadata/callbacks_collection.rb +++ b/lib/aggregate_builder/metadata/callbacks_collection.rb @@ -9,8 +9,7 @@ clonned = self.clas...
Fix issue with callbacks clonning
diff --git a/lib/gem_search/commands/run.rb b/lib/gem_search/commands/run.rb index abc1234..def5678 100644 --- a/lib/gem_search/commands/run.rb +++ b/lib/gem_search/commands/run.rb @@ -29,9 +29,7 @@ def search_gems print "Searching " - gems = Request.new.search(options.arguments[0]) do - ...
Refactor block using one liner
diff --git a/lib/engineyard.rb b/lib/engineyard.rb index abc1234..def5678 100644 --- a/lib/engineyard.rb +++ b/lib/engineyard.rb @@ -1,5 +1,5 @@ module EY - VERSION = "0.2.2" + VERSION = "0.2.3.pre" autoload :Account, 'engineyard/account' autoload :API, 'engineyard/api'
Bump version for next release Change-Id: Iea68442b3694e7a0daddbffb9d107d2179d20ff9 Reviewed-on: http://review.engineyard.com/145 Reviewed-by: Andy Delcambre <dceae9ae498de7d794de551710d5e4d9b952cadb@engineyard.com> Tested-by: Andy Delcambre <dceae9ae498de7d794de551710d5e4d9b952cadb@engineyard.com>
diff --git a/lib/mail_room/configuration.rb b/lib/mail_room/configuration.rb index abc1234..def5678 100644 --- a/lib/mail_room/configuration.rb +++ b/lib/mail_room/configuration.rb @@ -13,7 +13,9 @@ if options.has_key?(:config_path) begin - config_file = YAML.load(ERB.new(File.read(options[:co...
Set config file path in ERB so __FILE__ can be used
diff --git a/lib/jb/railtie.rb b/lib/jb/railtie.rb index abc1234..def5678 100644 --- a/lib/jb/railtie.rb +++ b/lib/jb/railtie.rb @@ -9,6 +9,21 @@ end end + if Rails::VERSION::MAJOR >= 5 + module ::ActionController + module ApiRendering + include ActionView::Rendering + end + ...
Add support for Rails API-mode
diff --git a/lib/pjax_rails.rb b/lib/pjax_rails.rb index abc1234..def5678 100644 --- a/lib/pjax_rails.rb +++ b/lib/pjax_rails.rb @@ -3,7 +3,9 @@ module PjaxRails class Engine < ::Rails::Engine initializer "pjax_rails.add_controller" do - config.to_prepare { ApplicationController.send :include, Pjax } + ...
Include into AC::Base instead of ApplicationController
diff --git a/Casks/antconc.rb b/Casks/antconc.rb index abc1234..def5678 100644 --- a/Casks/antconc.rb +++ b/Casks/antconc.rb @@ -1,6 +1,12 @@ cask :v1 => 'antconc' do - version '3.4.3' - sha256 'c63b9a9fd60a97c8551c6fa2902663568be9cdabee5601a2fe99715f47921421' + + if MacOS.release <= :snow_leopard + version '3.4....
Add alternative AntConc version for snow leopard or lower
diff --git a/Casks/ax88772.rb b/Casks/ax88772.rb index abc1234..def5678 100644 --- a/Casks/ax88772.rb +++ b/Casks/ax88772.rb @@ -0,0 +1,13 @@+class Ax88772 < Cask + homepage 'http://www.asix.com.tw/products.php?op=pItemdetail&PItemID=86;71;101&PLine=71' + + version '2.1.0_20140428' + basename = "AX88772C_772B_772A_7...
Add ASIX AX88772 Driver v2.1.0_20140428 Running "strings" on the binary uninstaller reveals several strings which appear to be shell calls to "kextunload" and "pkgutil --forget" so, running the uninstaller should be sufficient to remove the driver, unload it and remove the package's receipt.
diff --git a/Casks/codekit.rb b/Casks/codekit.rb index abc1234..def5678 100644 --- a/Casks/codekit.rb +++ b/Casks/codekit.rb @@ -3,4 +3,5 @@ homepage 'http://incident57.com/codekit/' version '1.6.2 (8300)' sha1 '842ba4f5d6ecf596abee1f80e3672b9771e2be22' + link 'CodeKit.app' end
Add link field to CodeKit Class
diff --git a/spec/payload_spec.rb b/spec/payload_spec.rb index abc1234..def5678 100644 --- a/spec/payload_spec.rb +++ b/spec/payload_spec.rb @@ -12,10 +12,10 @@ payload.should be_a Magnum::Payload::Gitslice end - #it 'returns payload instance for gitlab' do - # payload = Magnum::Payload.parse('gitla...
Test shortcut for gitlab integration
diff --git a/sqlserver_adapter.rb b/sqlserver_adapter.rb index abc1234..def5678 100644 --- a/sqlserver_adapter.rb +++ b/sqlserver_adapter.rb @@ -1,6 +1,8 @@ require DataMapper.root / 'lib' / 'dm-core' / 'adapters' / 'data_objects_adapter' require 'do_sqlserver' + +DataObjects::Sqlserver = DataObjects::SqlServer m...
Add a workaround for exceptional DataObjects::SqlServer naming * See also DO commit ee3a6fe. * Most likely completely unnecessary, but the conversion of the snake_cased to CamelCased name, doesn't give us the chance to follow the DB Vendor's naming convention (so yes, actually it really should be SQLServerAdapte...
diff --git a/Formula/climb.rb b/Formula/climb.rb index abc1234..def5678 100644 --- a/Formula/climb.rb +++ b/Formula/climb.rb @@ -4,14 +4,10 @@ init desc "Composer version manager tool" homepage "https://github.com/vinkla/climb" - url "https://github.com/vinkla/climb/releases/download/0.6.1/climb.phar" - sha25...
Update Climb.phar to version 0.7.0 Closes #2553. Signed-off-by: Andy Blyler <e3579b1e47f273529f0f929453e939a68ede9fd1@blyler.cc>
diff --git a/plugins/yolol-plugin.rb b/plugins/yolol-plugin.rb index abc1234..def5678 100644 --- a/plugins/yolol-plugin.rb +++ b/plugins/yolol-plugin.rb @@ -6,6 +6,6 @@ match /^!yolol/i def execute(m) - m.reply("yolol") unless m.user.nick.downcase == "matezoide" + m.reply("yolol") end -end +end
Revert "remove matezoide from using command" This reverts commit 18044d44faaffd16aa7d45b67184387433eba616.
diff --git a/lib/taxonomy/topic_taxonomy.rb b/lib/taxonomy/topic_taxonomy.rb index abc1234..def5678 100644 --- a/lib/taxonomy/topic_taxonomy.rb +++ b/lib/taxonomy/topic_taxonomy.rb @@ -14,7 +14,9 @@ end def visible_taxons - @visible_taxons = all_taxons.select(&:visible_to_departmental_editors) + @v...
Fix visible_taxons to return all taxons Instead of just the level one taxons. This fixes it's use in TaxonomyTagForm, where it's used to remove taxons from the list of invisible taxons. Without this change, you can't untag content from level 2 or below taxons, because they are treated as "invisible", even though they...
diff --git a/poker-dice/hand.rb b/poker-dice/hand.rb index abc1234..def5678 100644 --- a/poker-dice/hand.rb +++ b/poker-dice/hand.rb @@ -8,11 +8,14 @@ end def rank - faces = face_values.join + counts = Hash.new(0) + face_values.each do |face| + counts[face] += 1 + end - case faces - when...
Change from regex to hash with counts
diff --git a/haml-lint.gemspec b/haml-lint.gemspec index abc1234..def5678 100644 --- a/haml-lint.gemspec +++ b/haml-lint.gemspec @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -$:.push File.expand_path('../lib', __FILE__) +$LOAD_PATH << File.expand_path('../lib', __FILE__) require 'haml_lint/version' Gem::Specification....
Fix Rubocop lints in gemspec Prefer $LOAD_PATH over $: as it is more descriptive. Change-Id: I5b6ce760fd5d0d8be5e9039007155fe1e04c9ed1 Reviewed-on: http://gerrit.causes.com/36170 Tested-by: jenkins <d95b56ce41a2e1ac4cecdd398defd7414407cc08@causes.com> Reviewed-by: Shane da Silva <6f6e68d1df92f30cb4b3ce35260ddf94a402f...
diff --git a/spec/support/tmp_dir_setup.rb b/spec/support/tmp_dir_setup.rb index abc1234..def5678 100644 --- a/spec/support/tmp_dir_setup.rb +++ b/spec/support/tmp_dir_setup.rb @@ -15,7 +15,8 @@ config.after do |example| if example.exception - example.exception.message << "\nTest directory: #{Bosh::Dev::S...
Print test directory on failure Signed-off-by: Maria Shaldibina <dc03896a0185453e5852a5e0f0fab6cbd2e026ff@pivotal.io>
diff --git a/recipes/default.rb b/recipes/default.rb index abc1234..def5678 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -23,5 +23,8 @@ 'mysql' => 'DBD::mysql' } +# prevent pg module install failures on debian platforms +package 'libpq-dev' if node['platform_family'] == 'debian' && node['sqitch']['...
Fix install failures on debian platforms Signed-off-by: Tim Smith <764ef62106582a09ed09dfa0b6bff7c05fd7d1e4@chef.io>
diff --git a/templates/api_defaults_concern.rb b/templates/api_defaults_concern.rb index abc1234..def5678 100644 --- a/templates/api_defaults_concern.rb +++ b/templates/api_defaults_concern.rb @@ -7,20 +7,20 @@ API_DEFAULT_FAIL_PATH = "defaults/fail" # Statuses - SUCCESS_STATUS = "success" - FAIL_STATUS = "fail" +...
Make API return valid status codes
diff --git a/colocated-charters-script.rb b/colocated-charters-script.rb index abc1234..def5678 100644 --- a/colocated-charters-script.rb +++ b/colocated-charters-script.rb @@ -5,8 +5,16 @@ charter_school = v.find { |x| x[3] == "Charter"} if charter_school != nil colocated_addresses_w_charter << {k => v} - #...
Create separate method where a csv is created with colocated buildings with charter
diff --git a/config/initializers/email.rb b/config/initializers/email.rb index abc1234..def5678 100644 --- a/config/initializers/email.rb +++ b/config/initializers/email.rb @@ -1,4 +1,4 @@-DO_NOT_REPLY = "do-not-reply@awesomefoundation.com" +DO_NOT_REPLY = "do-not-reply@awesomefoundation.org" ActionMailer::Base.smtp...
Change .com to .org in the do-not-reply address
diff --git a/lib/cocoapods/downloader.rb b/lib/cocoapods/downloader.rb index abc1234..def5678 100644 --- a/lib/cocoapods/downloader.rb +++ b/lib/cocoapods/downloader.rb @@ -3,6 +3,7 @@ module Pod class Downloader autoload :Git, 'cocoapods/downloader/git' + autoload :GitHub, 'cocoapods/downloader/g...
Make sure this can be autoloaded.
diff --git a/lib/elastic_record/model.rb b/lib/elastic_record/model.rb index abc1234..def5678 100644 --- a/lib/elastic_record/model.rb +++ b/lib/elastic_record/model.rb @@ -1,15 +1,16 @@ module ElasticRecord module Model - def self.included(base) - base.class_eval do - extend Searching - extend...
Use a shared variable for all connections
diff --git a/lib/jasmine_rails/engine.rb b/lib/jasmine_rails/engine.rb index abc1234..def5678 100644 --- a/lib/jasmine_rails/engine.rb +++ b/lib/jasmine_rails/engine.rb @@ -5,7 +5,6 @@ isolate_namespace JasmineRails initializer :assets do |config| - Rails.application.config.assets.debug = false R...
Use the application's assets.debug config
diff --git a/lib/maguro/app_generator.rb b/lib/maguro/app_generator.rb index abc1234..def5678 100644 --- a/lib/maguro/app_generator.rb +++ b/lib/maguro/app_generator.rb @@ -3,6 +3,9 @@ module Maguro class AppGenerator < Rails::Generators::AppGenerator + + class_option :organization, :type => :string, :aliases =...
Add options to pass in the organization to the commandline
diff --git a/lib/makeprintable/client.rb b/lib/makeprintable/client.rb index abc1234..def5678 100644 --- a/lib/makeprintable/client.rb +++ b/lib/makeprintable/client.rb @@ -1,4 +1,5 @@ require File.expand_path('../client/endpoints.rb', __FILE__) +require File.expand_path('../client/jobs.rb', __FILE__) module MakePri...
Add jobs as Client extension
diff --git a/lib/tasks/applications.rake b/lib/tasks/applications.rake index abc1234..def5678 100644 --- a/lib/tasks/applications.rake +++ b/lib/tasks/applications.rake @@ -20,4 +20,19 @@ puts "config.oauth_id = '#{a.uid}'" puts "config.oauth_secret = '#{a.secret}'" end + + desc 'Updates domain name fo...
Add rake task to migrate apps to new domain. As part of our migration to Carrenza we are taking the opportunity to sort out some of our domains, namely kill alphagov. We need to have a way to update all signon apps redirect_uri and home_ui.
diff --git a/lib/tasks/generate_erd.rake b/lib/tasks/generate_erd.rake index abc1234..def5678 100644 --- a/lib/tasks/generate_erd.rake +++ b/lib/tasks/generate_erd.rake @@ -1,6 +1,10 @@ desc 'Generate Entity Relationship Diagram' task :generate_erd do system 'bundle exec erd --inheritance --filetype=dot --notation=...
Check file exist in generate erd.
diff --git a/lib/tasks/i18n_hygiene.rake b/lib/tasks/i18n_hygiene.rake index abc1234..def5678 100644 --- a/lib/tasks/i18n_hygiene.rake +++ b/lib/tasks/i18n_hygiene.rake @@ -1,5 +1,20 @@ namespace :i18n do namespace :hygiene do + + desc "check for i18n phrases that contain entities" + task check_entities: :envi...
Copy check_entities rake task from TC
diff --git a/lib/vagrant-ohai/helpers.rb b/lib/vagrant-ohai/helpers.rb index abc1234..def5678 100644 --- a/lib/vagrant-ohai/helpers.rb +++ b/lib/vagrant-ohai/helpers.rb @@ -1,12 +1,12 @@ module VagrantPlugins module Ohai + # module Helpers - def chef_provisioners - @machine.config.vm.provisione...
Add support for new chef provisioners on Vagrant 1.7
diff --git a/config/mdl_style.rb b/config/mdl_style.rb index abc1234..def5678 100644 --- a/config/mdl_style.rb +++ b/config/mdl_style.rb @@ -1,9 +1,9 @@ all -exclude_rule "MD002" +exclude_rule "first-header-h1" -exclude_rule "MD013" +exclude_rule "line-length" -rule "MD026", punctuation: ".,;:!" +rule "no-trailin...
Use rule aliases instead of cryptic names
diff --git a/Casks/cura-beta.rb b/Casks/cura-beta.rb index abc1234..def5678 100644 --- a/Casks/cura-beta.rb +++ b/Casks/cura-beta.rb @@ -0,0 +1,13 @@+cask :v1 => 'cura-beta' do + version '15.06.03' + sha256 '60c2fe1c5d7b5e738b7906e67ee66b6ba80a9d0a91f98cd6704af039afa2f732' + + url "http://software.ultimaker.com/15.0...
Add Cura.app v15.06.03 (latest beta) This Cask has been moved from homebrew-cask and renamed 'cura-beta'. It has been upgraded to the latest version. Please find the stable version in homebrew-cask.
diff --git a/test/prawn/emoji/substitution_test.rb b/test/prawn/emoji/substitution_test.rb index abc1234..def5678 100644 --- a/test/prawn/emoji/substitution_test.rb +++ b/test/prawn/emoji/substitution_test.rb @@ -2,25 +2,34 @@ describe Prawn::Emoji::Substitution do let(:document) { Prawn::Document.new } + let(:fo...
Test against expected width of substitution string Also test against behavior when using built-in AFM font.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index abc1234..def5678 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,6 +2,7 @@ protect_from_forgery with: :exception before_action :configure_permitted_p...
Stop browser caching json on browser back.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index abc1234..def5678 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -26,10 +26,6 @@ end def load_current_site - if Rails.env.development? - User....
Remove development hack for loading site; also, use request.host for lookup, not .domain.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index abc1234..def5678 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -3,7 +3,7 @@ def require_admin # TODO Update when authorization is in place - re...
Remove the :logged_in authentication hack
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index abc1234..def5678 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,4 +2,12 @@ # Prevent CSRF attacks by raising an exception. # For APIs, you may want ...
Add before action for all controllers to get current season.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index abc1234..def5678 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -7,6 +7,8 @@ include DeviseTokenAuth::Concerns::SetUserByToken + before_action :confi...
Add params to registration step.
diff --git a/test/stripe/invoice_line_item_test.rb b/test/stripe/invoice_line_item_test.rb index abc1234..def5678 100644 --- a/test/stripe/invoice_line_item_test.rb +++ b/test/stripe/invoice_line_item_test.rb @@ -0,0 +1,7 @@+require File.expand_path('../../test_helper', __FILE__) + +module Stripe + class InvoiceLineIt...
Add test structure for `InvoiceLineItem` This doesn't come back directly from the API so the suite is empty, but just for completeness add a test file for the newly created `InvoiceLineItem` model.