diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/lib/chaindrive/database.rb b/lib/chaindrive/database.rb index abc1234..def5678 100644 --- a/lib/chaindrive/database.rb +++ b/lib/chaindrive/database.rb @@ -13,7 +13,7 @@ column :name, String, :index => true, :null => false column :version, String, :index => true, :null => false column :reposi...
Modify the name of migration type to TrueClass for Boolean.
diff --git a/lib/dest/evaluator.rb b/lib/dest/evaluator.rb index abc1234..def5678 100644 --- a/lib/dest/evaluator.rb +++ b/lib/dest/evaluator.rb @@ -7,12 +7,12 @@ end def evaluate - expr_result = eval(parsed_attributes[1]) + expr_result = eval(@parsed_attributes[1]) - if expr_result == eval(...
Fix a typo in Evaluator. ( used regular variable names rather then instance variables )
diff --git a/lib/dnsimple/error.rb b/lib/dnsimple/error.rb index abc1234..def5678 100644 --- a/lib/dnsimple/error.rb +++ b/lib/dnsimple/error.rb @@ -15,7 +15,7 @@ private def message_from(http_response) - if http_response.headers["Content-Type"] == "application/json" + if http_response.headers["Con...
Use regexp to detect the Content-Type
diff --git a/db/migrate/20111227235256_create_join_tables.rb b/db/migrate/20111227235256_create_join_tables.rb index abc1234..def5678 100644 --- a/db/migrate/20111227235256_create_join_tables.rb +++ b/db/migrate/20111227235256_create_join_tables.rb @@ -13,21 +13,21 @@ end create_table :lists_owners, :id => f...
Fix up join tables again, add HABTM relationships
diff --git a/lib/active_mocker/mock/collection.rb b/lib/active_mocker/mock/collection.rb index abc1234..def5678 100644 --- a/lib/active_mocker/mock/collection.rb +++ b/lib/active_mocker/mock/collection.rb @@ -16,8 +16,8 @@ end extend ::Forwardable - def_delegators :@collection, :take, :push, :clear, :firs...
Fix Ruby warning where distinct was being redefined.
diff --git a/lib/acts_as_paranoid/associations.rb b/lib/acts_as_paranoid/associations.rb index abc1234..def5678 100644 --- a/lib/acts_as_paranoid/associations.rb +++ b/lib/acts_as_paranoid/associations.rb @@ -9,7 +9,7 @@ module ClassMethods def belongs_to_with_deleted(target, options = {}) - with_de...
Revert "Do not delete :with_deleted from options" This reverts commit 5b2d844e352df9d62ca6b4f117749463dc73d060.
diff --git a/lib/dotenv-heroku/tasks.rb b/lib/dotenv-heroku/tasks.rb index abc1234..def5678 100644 --- a/lib/dotenv-heroku/tasks.rb +++ b/lib/dotenv-heroku/tasks.rb @@ -10,19 +10,20 @@ end desc "push the .env file to heroku config" - task :push, [:env_file] => :executable do |t, args| + task :push, [:env_file,...
Allow the use of a app name this is for managing multiple apps in one folder. You can now pass the application name to the task. This in turn will be picked up by the heroku commands.
diff --git a/nokogiri_truncate_html.gemspec b/nokogiri_truncate_html.gemspec index abc1234..def5678 100644 --- a/nokogiri_truncate_html.gemspec +++ b/nokogiri_truncate_html.gemspec @@ -16,7 +16,7 @@ gem.test_files = gem.files.grep(%r{^(test|spec|features)/}) gem.require_paths = ["lib"] - gem.add_dependency "...
Downgrade version of nokogiri that we need.
diff --git a/features/step_definitions/file_steps.rb b/features/step_definitions/file_steps.rb index abc1234..def5678 100644 --- a/features/step_definitions/file_steps.rb +++ b/features/step_definitions/file_steps.rb @@ -2,8 +2,12 @@ create_file expand(virtual_path), expand(content) end -Given /^an executable call...
Rewrite a step to create an executable file
diff --git a/test/integration/default/minitest/test_default.rb b/test/integration/default/minitest/test_default.rb index abc1234..def5678 100644 --- a/test/integration/default/minitest/test_default.rb +++ b/test/integration/default/minitest/test_default.rb @@ -7,6 +7,6 @@ it "check R version" do system('echo "q(...
Update test case R version
diff --git a/lib/intouch/patches/project_patch.rb b/lib/intouch/patches/project_patch.rb index abc1234..def5678 100644 --- a/lib/intouch/patches/project_patch.rb +++ b/lib/intouch/patches/project_patch.rb @@ -41,11 +41,7 @@ if self.root? self.name else - titles = [] - ...
Fix project title for messages
diff --git a/app/commands/v2/put_link_set.rb b/app/commands/v2/put_link_set.rb index abc1234..def5678 100644 --- a/app/commands/v2/put_link_set.rb +++ b/app/commands/v2/put_link_set.rb @@ -7,6 +7,8 @@ content_id = link_params.fetch(:content_id) link_set = LinkSet.find_or_initialize_by(content_id: con...
Increment the LinkSet version on update. New LinkSets start at version 0 and are incremented to version 1 as they're saved. This matches the behaviour of live and draft content items.
diff --git a/lib/arel/visitors/nuodb.rb b/lib/arel/visitors/nuodb.rb index abc1234..def5678 100644 --- a/lib/arel/visitors/nuodb.rb +++ b/lib/arel/visitors/nuodb.rb @@ -1,7 +1,7 @@ module Arel module Visitors class NuoDB < Arel::Visitors::ToSql - def visit_Arel_Nodes_SelectStatement o + def visit_Arel...
Clean up a couple code-green issues.
diff --git a/lib/mortgage_calculator.rb b/lib/mortgage_calculator.rb index abc1234..def5678 100644 --- a/lib/mortgage_calculator.rb +++ b/lib/mortgage_calculator.rb @@ -9,10 +9,6 @@ mattr_accessor :stamp_duty_welsh_fix mattr_accessor :affordability_enabled - def self.stamp_duty_welsh_fix - @@stamp_duty_welsh...
Revert "Default stamp duty welsh fix to a blank lambda" This reverts commit bb87792bd001d41e814081d0172cae2c4ca5e153.
diff --git a/spec/stack_overflow_spec.rb b/spec/stack_overflow_spec.rb index abc1234..def5678 100644 --- a/spec/stack_overflow_spec.rb +++ b/spec/stack_overflow_spec.rb @@ -1,4 +1,4 @@-require_relative 'spec_helper' +require 'spec_helper' require 'service/stack_overflow' include Service
Replace unnecessary require_relative with require
diff --git a/lib/sprockets/uglifier_compressor.rb b/lib/sprockets/uglifier_compressor.rb index abc1234..def5678 100644 --- a/lib/sprockets/uglifier_compressor.rb +++ b/lib/sprockets/uglifier_compressor.rb @@ -48,12 +48,15 @@ @uglifier.compile_with_map(data) end - minified = SourceMap::Map.from_jso...
Return bare js if no source map is created.
diff --git a/lib/bitmap.rb b/lib/bitmap.rb index abc1234..def5678 100644 --- a/lib/bitmap.rb +++ b/lib/bitmap.rb @@ -5,36 +5,38 @@ class Bitmap attr_reader :data - def initialize(width, height, color=nil) + def initialize(width, height) @data = Array.new(width) do Array.new(height) do - color ...
Remove color from constructor and refactor stretch methods to use width from data.
diff --git a/lib/ruby_wedding/engine.rb b/lib/ruby_wedding/engine.rb index abc1234..def5678 100644 --- a/lib/ruby_wedding/engine.rb +++ b/lib/ruby_wedding/engine.rb @@ -9,5 +9,10 @@ g.helper false end + config.to_prepare do + Dir.glob(Rails.root + "app/decorators/**/**/*_decorator*.rb").each do |c|...
Allow decorators in the parent app.
diff --git a/lib/dox/formatters/json.rb b/lib/dox/formatters/json.rb index abc1234..def5678 100644 --- a/lib/dox/formatters/json.rb +++ b/lib/dox/formatters/json.rb @@ -2,9 +2,12 @@ module Formatters class Json < Dox::Formatters::Base def format - JSON.pretty_generate(JSON.parse(body || '')) - ...
Remove rescuing JSON parsing error in JSON formatter
diff --git a/lib/garufa/api/channels.rb b/lib/garufa/api/channels.rb index abc1234..def5678 100644 --- a/lib/garufa/api/channels.rb +++ b/lib/garufa/api/channels.rb @@ -15,8 +15,7 @@ plugin ChannelFilter plugin SettingsSetter - set :render, template_engine: 'yajl' - set :render, views: File.exp...
Set render settings with the same command.
diff --git a/lib/lager.rb b/lib/lager.rb index abc1234..def5678 100644 --- a/lib/lager.rb +++ b/lib/lager.rb @@ -4,6 +4,12 @@ end get '/servers' do + @servers = Server.all; + content_type :json + @servers.to_json + end + + get '/logs/server/all' do @servers = Server.all; content_type :json ...
Add back get all servers into routes
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,4 +1,4 @@-require 'simplecov' +require 'simplecov' unless RUBY_ENGINE == 'jruby' require 'corefines' RSpec.configure do |config|
Disable SimpleCov when run on JRuby (it doesn't work there)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,9 +2,14 @@ ENV["EDITOR"] = nil -require 'coveralls' -Coveralls.wear! do - add_filter 'spec/' +# Ruby 2.4.0 and 2.4.1 has a bug with its Coverage module that causes segfault...
Disable coverage reporting with ruby 2.4.0/2.4.1
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -9,7 +9,9 @@ # for each example. This significantly DRYs up our linter specs to contain # only tests, since all the setup code is now centralized here. if described_c...
Normalize CSS indentation in specs Due to the use of Heredocs in specs, all CSS has leading indentation. In order to correctly write tests for an upcoming lint that detects invalid indentation, automatically normalize all CSS before it is passed to the engine to be parsed. Change-Id: I49891e2b4111ee7af066ddd2bf1db89...
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,7 +2,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'support')) -# $stdout = StringIO.new +$stdo...
Undo commented out stdout override.
diff --git a/lib/puppet/provider/rabbitmq_erlang_cookie/ruby.rb b/lib/puppet/provider/rabbitmq_erlang_cookie/ruby.rb index abc1234..def5678 100644 --- a/lib/puppet/provider/rabbitmq_erlang_cookie/ruby.rb +++ b/lib/puppet/provider/rabbitmq_erlang_cookie/ruby.rb @@ -3,9 +3,14 @@ Puppet::Type.type(:rabbitmq_erlang_cookie)...
Fix incompatability with latest puppet
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,16 +1,26 @@ require 'octoshark' +require 'fileutils' +ROOT = File.expand_path('../', File.dirname(__FILE__)) +TMP = 'tmp' # Load support files -ROOT = File.expand_path('.....
Create 'tmp' folder before suite
diff --git a/spec/support/hax.rb b/spec/support/hax.rb index abc1234..def5678 100644 --- a/spec/support/hax.rb +++ b/spec/support/hax.rb @@ -21,10 +21,21 @@ class Object if ENV["BUNDLER_SPEC_RUBY_ENGINE"] + if defined?(RUBY_ENGINE) && RUBY_ENGINE != "jruby" && ENV["BUNDLER_SPEC_RUBY_ENGINE"] == "jruby" + b...
[Hax] Support simulating jruby on MRI 2.3
diff --git a/lib/lita/external/robot.rb b/lib/lita/external/robot.rb index abc1234..def5678 100644 --- a/lib/lita/external/robot.rb +++ b/lib/lita/external/robot.rb @@ -27,7 +27,9 @@ end rescue => error Lita.logger.error("Outbound message failed: #{error.class}: #{error.message...
Fix error reporting in outbound queue processing
diff --git a/lib/solve.rb b/lib/solve.rb index abc1234..def5678 100644 --- a/lib/solve.rb +++ b/lib/solve.rb @@ -25,7 +25,10 @@ # @param [Array<Solve::Demand>, Array<String, String>] demands # # @option options [#say] :ui (nil) - # a ui object for output + # a ui object for output, this will be ...
Allow a user to pass in their own Tracer object so they are not forced into using the HumanReadable one.
diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb index abc1234..def5678 100644 --- a/app/helpers/dashboard_helper.rb +++ b/app/helpers/dashboard_helper.rb @@ -11,6 +11,7 @@ if defined?(Graphite) require 'graphite/enrollment/status_info' include Graphite::Enrollment::StatusInfo ...
Add graphite dependency in usi dashboard Change-Id: I65b2e8a1422544a191784d9b46ba074a062e1d62
diff --git a/lib/curtis.rb b/lib/curtis.rb index abc1234..def5678 100644 --- a/lib/curtis.rb +++ b/lib/curtis.rb @@ -1,4 +1,3 @@- require 'curtis/version' require 'ncurses' require 'curtis/base_view' @@ -15,8 +14,8 @@ def show(**options) screen = Ncurses.initscr - Ncurses.cbreak - Ncurses.noec...
Fix a typo. Add minor config options.
diff --git a/lib/redmine_revision_branches/git_adapter_patch.rb b/lib/redmine_revision_branches/git_adapter_patch.rb index abc1234..def5678 100644 --- a/lib/redmine_revision_branches/git_adapter_patch.rb +++ b/lib/redmine_revision_branches/git_adapter_patch.rb @@ -14,7 +14,7 @@ rescue ScmCommandAborted ...
Fix for including branches with '/' in the name
diff --git a/spec/hello_sign/api/oauth_spec.rb b/spec/hello_sign/api/oauth_spec.rb index abc1234..def5678 100644 --- a/spec/hello_sign/api/oauth_spec.rb +++ b/spec/hello_sign/api/oauth_spec.rb @@ -17,7 +17,7 @@ describe '#refresh_oauth_token' do before do stub_post_oauth('/oauth/token', 'token') - @o...
Fix broken test after changing method parameters
diff --git a/lib/duffel.rb b/lib/duffel.rb index abc1234..def5678 100644 --- a/lib/duffel.rb +++ b/lib/duffel.rb @@ -1,18 +1,33 @@ class Duffel VERSION = "0.0.1" - def self.method_missing(method, *args, &block) - fetch_default = lambda do |key| - raise KeyError.new("key not found: #{key}") + class << sel...
Refactor some code. - format_return_value becomes it's own method instead of a one line ternary operator. - fetch_default is a method instead of a variable defined inside the method_missing block.
diff --git a/app/models/assets/background.rb b/app/models/assets/background.rb index abc1234..def5678 100644 --- a/app/models/assets/background.rb +++ b/app/models/assets/background.rb @@ -19,22 +19,18 @@ # class Background < ActiveRecord::Base include Imageable + include Attachable + belongs_to :attachable, po...
Include Attachable concern to Background
diff --git a/spec/requests/healthcheck_spec.rb b/spec/requests/healthcheck_spec.rb index abc1234..def5678 100644 --- a/spec/requests/healthcheck_spec.rb +++ b/spec/requests/healthcheck_spec.rb @@ -18,6 +18,7 @@ expect(data.fetch(:checks)).to include( database_connectivity: { status: "ok" }, redis_conn...
Include queue_latency in the list of healthchecks to test
diff --git a/spec/requests/v1/api_csrf_spec.rb b/spec/requests/v1/api_csrf_spec.rb index abc1234..def5678 100644 --- a/spec/requests/v1/api_csrf_spec.rb +++ b/spec/requests/v1/api_csrf_spec.rb @@ -0,0 +1,27 @@+require 'spec_helper' + +describe 'api should not require csrf protection', type: :request do + before(:each)...
Add CSRF protection request spec
diff --git a/lib/progressive/subject.rb b/lib/progressive/subject.rb index abc1234..def5678 100644 --- a/lib/progressive/subject.rb +++ b/lib/progressive/subject.rb @@ -29,7 +29,7 @@ def method_missing(method_sym, *args, &block) if method_sym.to_s[-1] == '?' && specification.state?(method_sym.to_s[0..-2]) ...
Send delegated event to specification
diff --git a/lib/travis/logs/sidekiq.rb b/lib/travis/logs/sidekiq.rb index abc1234..def5678 100644 --- a/lib/travis/logs/sidekiq.rb +++ b/lib/travis/logs/sidekiq.rb @@ -6,12 +6,12 @@ module Sidekiq class << self def setup - Travis.logger.info('Setting up Sidekiq and the Redis connection') -...
Trim down the initial Sidekiq setup log output.
diff --git a/corsair.gemspec b/corsair.gemspec index abc1234..def5678 100644 --- a/corsair.gemspec +++ b/corsair.gemspec @@ -10,8 +10,8 @@ gem.authors = ["Varvet"] gem.email = ["info@varvet.se"] gem.homepage = "https://github.com/varvet/corsair" - gem.summary = "" - gem.description ...
Add description and summary to gemspec
diff --git a/lib/radar/integration/rails3/templates/radar.rb b/lib/radar/integration/rails3/templates/radar.rb index abc1234..def5678 100644 --- a/lib/radar/integration/rails3/templates/radar.rb +++ b/lib/radar/integration/rails3/templates/radar.rb @@ -5,7 +5,10 @@ # ==> Reporter Configuration # Configure any repo...
Change template for Rails3 to use LoggerReporter by default
diff --git a/lib/yajl/ffi.rb b/lib/yajl/ffi.rb index abc1234..def5678 100644 --- a/lib/yajl/ffi.rb +++ b/lib/yajl/ffi.rb @@ -0,0 +1,50 @@+require 'ffi' + +module Yajl + module FFI + extend ::FFI::Library + + ffi_lib 'yajl' + + enum :status, [ + :ok, + :client_canceled, + :error + ] + + en...
Add FFI yajl function bindings.
diff --git a/spec/controllers/user/sessions_controller_spec.rb b/spec/controllers/user/sessions_controller_spec.rb index abc1234..def5678 100644 --- a/spec/controllers/user/sessions_controller_spec.rb +++ b/spec/controllers/user/sessions_controller_spec.rb @@ -5,8 +5,26 @@ @request.env["devise.mapping"] = Devise.ma...
Add basic login form tests
diff --git a/spec/features/admin/language_tree_feature_spec.rb b/spec/features/admin/language_tree_feature_spec.rb index abc1234..def5678 100644 --- a/spec/features/admin/language_tree_feature_spec.rb +++ b/spec/features/admin/language_tree_feature_spec.rb @@ -15,7 +15,7 @@ it "one should be able to switch the la...
Use select2 capybara helper to test language tree Former we were using the hidden select.
diff --git a/ostatus/lib/social_stream/ostatus/models/object.rb b/ostatus/lib/social_stream/ostatus/models/object.rb index abc1234..def5678 100644 --- a/ostatus/lib/social_stream/ostatus/models/object.rb +++ b/ostatus/lib/social_stream/ostatus/models/object.rb @@ -10,7 +10,7 @@ obj.author = ...
Fix assignation in ruby 1.9.2
diff --git a/app/controllers/admin/proxy_orders_controller.rb b/app/controllers/admin/proxy_orders_controller.rb index abc1234..def5678 100644 --- a/app/controllers/admin/proxy_orders_controller.rb +++ b/app/controllers/admin/proxy_orders_controller.rb @@ -9,9 +9,7 @@ def cancel if @proxy_order.cancel - ...
Remove usage of the responder as this is a json only controller
diff --git a/app/controllers/storytime/subscriptions_controller.rb b/app/controllers/storytime/subscriptions_controller.rb index abc1234..def5678 100644 --- a/app/controllers/storytime/subscriptions_controller.rb +++ b/app/controllers/storytime/subscriptions_controller.rb @@ -7,7 +7,7 @@ def create @subscrip...
Use unless instead of equality test
diff --git a/lib/sfn/command.rb b/lib/sfn/command.rb index abc1234..def5678 100644 --- a/lib/sfn/command.rb +++ b/lib/sfn/command.rb @@ -1,19 +1,20 @@ require 'sfn' +require 'bogo-cli' -class Sfn +module Sfn class Command < Bogo::Cli::Command - autoload :CloudformationCreate, 'sfn/command/cloudformation_creat...
Fix toplevel namespace type. Remove cloudformation prefixing.
diff --git a/application/utility/clear_catalog_credentials.rb b/application/utility/clear_catalog_credentials.rb index abc1234..def5678 100644 --- a/application/utility/clear_catalog_credentials.rb +++ b/application/utility/clear_catalog_credentials.rb @@ -0,0 +1,41 @@+#!/usr/bin/env ruby +# +# Copyright (C) 2010-2016 ...
Add script to clear catalog credentials
diff --git a/lib/capones_recipes/tasks/rails/logs.rb b/lib/capones_recipes/tasks/rails/logs.rb index abc1234..def5678 100644 --- a/lib/capones_recipes/tasks/rails/logs.rb +++ b/lib/capones_recipes/tasks/rails/logs.rb @@ -1,6 +1,6 @@ Capistrano::Configuration.instance.load do desc "Watch the log on the application se...
Fix :role to :roles in task condition.
diff --git a/lib/myspec.rb b/lib/myspec.rb index abc1234..def5678 100644 --- a/lib/myspec.rb +++ b/lib/myspec.rb @@ -1,12 +1,15 @@ module DSL def describe(&block) - ContextDSL.new.instance_eval &block + context = ContextDSL.new + context.instance_eval &block + context.run end end class ContextDSL ...
Make all Givens run before Thens
diff --git a/mssql/recipes/configure.rb b/mssql/recipes/configure.rb index abc1234..def5678 100644 --- a/mssql/recipes/configure.rb +++ b/mssql/recipes/configure.rb @@ -9,7 +9,7 @@ end end -registry_key "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\#{node[:mssql][:service_name]}\\MSSQLServer" do +registry_key "HKEY_LO...
Change mssql registry keys path
diff --git a/lib/crispy/crispy_internal/class_spy.rb b/lib/crispy/crispy_internal/class_spy.rb index abc1234..def5678 100644 --- a/lib/crispy/crispy_internal/class_spy.rb +++ b/lib/crispy/crispy_internal/class_spy.rb @@ -17,12 +17,8 @@ end def define_wrapper method_name - #return method_name if me...
Revert "add more codes to reproduce segfault more." This reverts commit a56586e48bf3a88dd9d19068d53fdb67f3e2faac.
diff --git a/app/grids/grid_state_grid.rb b/app/grids/grid_state_grid.rb index abc1234..def5678 100644 --- a/app/grids/grid_state_grid.rb +++ b/app/grids/grid_state_grid.rb @@ -9,9 +9,9 @@ column :email, label: 'User' column :grid_name - column :name column :state_value, editable: true, only: [:GridStatesScr...
Rename columns in grid state
diff --git a/lib/rabatt.rb b/lib/rabatt.rb index abc1234..def5678 100644 --- a/lib/rabatt.rb +++ b/lib/rabatt.rb @@ -6,4 +6,7 @@ module Rabatt # Your code goes here... +def Rabatt(provider_name, options = {}) + class_name = provider_name.to_s.capitalize + Object.const_get("Rabatt::Providers::#{class_name}").new ...
Add shortcut method to get new instance of provider class
diff --git a/lib/jquery-colorpicker-rails/version.rb b/lib/jquery-colorpicker-rails/version.rb index abc1234..def5678 100644 --- a/lib/jquery-colorpicker-rails/version.rb +++ b/lib/jquery-colorpicker-rails/version.rb @@ -1,7 +1,7 @@ module Jquery module Colorpicker module Rails - VERSION = "1.0.4.1" + ...
Update to rails-4: - Fix css assets urls
diff --git a/lib/generators/rspec/swagger/templates/spec.rb b/lib/generators/rspec/swagger/templates/spec.rb index abc1234..def5678 100644 --- a/lib/generators/rspec/swagger/templates/spec.rb +++ b/lib/generators/rspec/swagger/templates/spec.rb @@ -1,6 +1,6 @@ require 'swagger_helper' -RSpec.describe '<%= file_name %...
Use the namespaced controller name for the top describe
diff --git a/lib/puppet/provider/vagrant_box/vagrant_box.rb b/lib/puppet/provider/vagrant_box/vagrant_box.rb index abc1234..def5678 100644 --- a/lib/puppet/provider/vagrant_box/vagrant_box.rb +++ b/lib/puppet/provider/vagrant_box/vagrant_box.rb @@ -33,7 +33,7 @@ name, vprovider = @resource[:name].split('/') ...
Fix the box list regex for vagrant 1.6+ In vagrant 1.5, `vagrant box list` looked like: ``` lenny64 (vmware_fusion) precise64 (vmware_fusion) ``` Vagrant 1.6 added the version to the list: ``` lenny64 (vmware_fusion, 0) precise64 (vmware_fusion, 0) ``` This new regex supports either version
diff --git a/lib/rails_presenter/presenter_helper.rb b/lib/rails_presenter/presenter_helper.rb index abc1234..def5678 100644 --- a/lib/rails_presenter/presenter_helper.rb +++ b/lib/rails_presenter/presenter_helper.rb @@ -2,7 +2,7 @@ module PresenterHelper def present(template = self, object, with: nil, &block) ...
Fix with option for collections
diff --git a/lib/social_login/acts_as_social_user.rb b/lib/social_login/acts_as_social_user.rb index abc1234..def5678 100644 --- a/lib/social_login/acts_as_social_user.rb +++ b/lib/social_login/acts_as_social_user.rb @@ -5,8 +5,11 @@ included do def friends_that_use_the_app + self.class.joins(:servi...
Move remote_ids into its own method so apps can create their own queries if they like
diff --git a/lib/tasks/delete-old-embedded-runs.rake b/lib/tasks/delete-old-embedded-runs.rake index abc1234..def5678 100644 --- a/lib/tasks/delete-old-embedded-runs.rake +++ b/lib/tasks/delete-old-embedded-runs.rake @@ -0,0 +1,14 @@+namespace :taverna_player do + desc "Delete all completed embedded workflow runs." + ...
[TAV-346] Add a rake task to delete embedded runs. Cleans up all completed embedded runs.
diff --git a/lib/travis/build/addons/apt_packages.rb b/lib/travis/build/addons/apt_packages.rb index abc1234..def5678 100644 --- a/lib/travis/build/addons/apt_packages.rb +++ b/lib/travis/build/addons/apt_packages.rb @@ -11,12 +11,23 @@ sh.echo "Installing APT Packages (BETA)", ansi: :yellow ...
Add message about how to submit request for apt whitelist
diff --git a/vagrant_cloud.gemspec b/vagrant_cloud.gemspec index abc1234..def5678 100644 --- a/vagrant_cloud.gemspec +++ b/vagrant_cloud.gemspec @@ -1,14 +1,14 @@ Gem::Specification.new do |s| s.name = 'vagrant_cloud' s.version = '1.1.0' - s.summary = 'HashiCorp Atlas API client' - s.description ...
Update Rubygems specification after transfer
diff --git a/lib/ember_devise_simple_auth.rb b/lib/ember_devise_simple_auth.rb index abc1234..def5678 100644 --- a/lib/ember_devise_simple_auth.rb +++ b/lib/ember_devise_simple_auth.rb @@ -1,7 +1,6 @@ $: << File.expand_path(File.join(__FILE__, '../../support/rails/lib')) - -require "ember_devise_simple_auth/engine" ...
Fix placement of gem require
diff --git a/telemetry-logger.gemspec b/telemetry-logger.gemspec index abc1234..def5678 100644 --- a/telemetry-logger.gemspec +++ b/telemetry-logger.gemspec @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- Gem::Specification.new do |s| s.name = 'telemetry-logger' - s.version = '0.1.4' + s.version = '0.1.5' s.summary ...
Package version is incremented from patch number 0.1.4 to 0.1.5
diff --git a/upstream-tracker.gemspec b/upstream-tracker.gemspec index abc1234..def5678 100644 --- a/upstream-tracker.gemspec +++ b/upstream-tracker.gemspec @@ -18,6 +18,8 @@ spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] + spec.add_runtime_dependency "thor", "~> 0...
Add runtime dependency to thor
diff --git a/spec/controllers/activity_sessions_controller_spec.rb b/spec/controllers/activity_sessions_controller_spec.rb index abc1234..def5678 100644 --- a/spec/controllers/activity_sessions_controller_spec.rb +++ b/spec/controllers/activity_sessions_controller_spec.rb @@ -55,6 +55,12 @@ it 'responds with 302 ...
Add test to check that the callback is called correctly.
diff --git a/lib/after_commit_queue.rb b/lib/after_commit_queue.rb index abc1234..def5678 100644 --- a/lib/after_commit_queue.rb +++ b/lib/after_commit_queue.rb @@ -4,6 +4,13 @@ included do after_commit :_run_after_commit_queue after_rollback :_clear_after_commit_queue + end + + # Public: Add method to af...
Make method public so it can be used in an observer
diff --git a/lib/akabei/chroot_tree.rb b/lib/akabei/chroot_tree.rb index abc1234..def5678 100644 --- a/lib/akabei/chroot_tree.rb +++ b/lib/akabei/chroot_tree.rb @@ -10,6 +10,7 @@ BASE_PACKAGES = %w[base base-devel sudo] def create + @root.mkpath mkarchroot(*BASE_PACKAGES) end
Prepare directory before creating chroot tree
diff --git a/test/test_integration.rb b/test/test_integration.rb index abc1234..def5678 100644 --- a/test/test_integration.rb +++ b/test/test_integration.rb @@ -27,14 +27,17 @@ def test_encoding_issues params = { 'SearchIndex' => 'All', 'Keywords' => 'google' } - - %w(BR CA CN DE ES FR GB IN IT JP US).each ...
Handle divergent JRuby logic in test
diff --git a/spec/unit/generator/acknowledgements/plist_spec.rb b/spec/unit/generator/acknowledgements/plist_spec.rb index abc1234..def5678 100644 --- a/spec/unit/generator/acknowledgements/plist_spec.rb +++ b/spec/unit/generator/acknowledgements/plist_spec.rb @@ -35,8 +35,9 @@ } end - it "writes a plist to d...
Improve Plist Acknowledgements unit testing a little
diff --git a/lib/ember/es6_template.rb b/lib/ember/es6_template.rb index abc1234..def5678 100644 --- a/lib/ember/es6_template.rb +++ b/lib/ember/es6_template.rb @@ -19,13 +19,8 @@ autoload :ES6Module, 'ember/es6_template/es6module' def self.setup(env) - env.register_mime_type 'text/ecmascript-6', ...
Fix for `.module.es6` with sprockets 3 It is too strict to content type.
diff --git a/spec/controllers/spree/products_controller_spec.rb b/spec/controllers/spree/products_controller_spec.rb index abc1234..def5678 100644 --- a/spec/controllers/spree/products_controller_spec.rb +++ b/spec/controllers/spree/products_controller_spec.rb @@ -11,13 +11,13 @@ end describe '#show' do - it ...
Fix spec to expect all variants instead of only ones with option_values
diff --git a/Casks/serf.rb b/Casks/serf.rb index abc1234..def5678 100644 --- a/Casks/serf.rb +++ b/Casks/serf.rb @@ -5,7 +5,7 @@ # bintray.com is the official download host per the vendor homepage url "https://dl.bintray.com/mitchellh/serf/#{version}_darwin_amd64.zip" name 'Serf' - homepage 'http://www.serfdom...
Fix homepage to use SSL in Serf Cask The HTTP URL is already getting redirected to HTTPS. Using the HTTPS URL directly makes it more secure and saves a HTTP round-trip.
diff --git a/cookbooks/wt_monitoring/recipes/email_heartbeat.rb b/cookbooks/wt_monitoring/recipes/email_heartbeat.rb index abc1234..def5678 100644 --- a/cookbooks/wt_monitoring/recipes/email_heartbeat.rb +++ b/cookbooks/wt_monitoring/recipes/email_heartbeat.rb @@ -11,5 +11,5 @@ cron "email_heartbeat" do hour "*/6"...
Tweak the cron job for the nagios heartbeat Former-commit-id: f1df6c478f62b9bf6f2526c176ef225d07b2c863 [formerly 2f27ef241098d754005e40498259303876d2497c] [formerly 972bf819f651da59f633e2e82084dc136fd48692 [formerly a1d0fa0644b4cd0ffb88e7361a1adbbbb8b24612 [formerly 96715a01d89bf33118d1bb395a5329cf24d13c45]]] Former-...
diff --git a/app/models/givey_rails/user.rb b/app/models/givey_rails/user.rb index abc1234..def5678 100644 --- a/app/models/givey_rails/user.rb +++ b/app/models/givey_rails/user.rb @@ -1,9 +1,6 @@ module GiveyRails class User include GiveyModel - - attr_accessor :email, :password, :givey_tag, :password_confi...
Remove accessors in favour of nil object for forms
diff --git a/app/models/web_content_item.rb b/app/models/web_content_item.rb index abc1234..def5678 100644 --- a/app/models/web_content_item.rb +++ b/app/models/web_content_item.rb @@ -1,12 +1,14 @@ fields = %i{ id analytics_identifier + base_path content_id description details document_type first...
Correct alphabetical ordering of fields on WebContentItem
diff --git a/ruby/spec/bson/min_key_spec.rb b/ruby/spec/bson/min_key_spec.rb index abc1234..def5678 100644 --- a/ruby/spec/bson/min_key_spec.rb +++ b/ruby/spec/bson/min_key_spec.rb @@ -16,16 +16,10 @@ it_behaves_like "a JSON serializable object" end - let(:type) { 255.chr } - let(:obj) { described_class.new...
Reformat min key spec for consistency
diff --git a/files/private-chef-cookbooks/private-chef/metadata.rb b/files/private-chef-cookbooks/private-chef/metadata.rb index abc1234..def5678 100644 --- a/files/private-chef-cookbooks/private-chef/metadata.rb +++ b/files/private-chef-cookbooks/private-chef/metadata.rb @@ -11,4 +11,4 @@ supports os end -depends...
Add = to runit version constraint
diff --git a/lib/patches/active_record/xml_attribute_serializer.rb b/lib/patches/active_record/xml_attribute_serializer.rb index abc1234..def5678 100644 --- a/lib/patches/active_record/xml_attribute_serializer.rb +++ b/lib/patches/active_record/xml_attribute_serializer.rb @@ -3,8 +3,7 @@ ActiveRecord::XmlSerializer::At...
Use klass.translates? per clemens suggestion.
diff --git a/spec/features/projects/tree/upload_file_spec.rb b/spec/features/projects/tree/upload_file_spec.rb index abc1234..def5678 100644 --- a/spec/features/projects/tree/upload_file_spec.rb +++ b/spec/features/projects/tree/upload_file_spec.rb @@ -35,17 +35,4 @@ expect(page).to have_selector('.multi-file-tab',...
Remove IDE image upload spec Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/45045
diff --git a/spec/overcommit/hook_context/commit_msg_spec.rb b/spec/overcommit/hook_context/commit_msg_spec.rb index abc1234..def5678 100644 --- a/spec/overcommit/hook_context/commit_msg_spec.rb +++ b/spec/overcommit/hook_context/commit_msg_spec.rb @@ -8,13 +8,13 @@ let(:context) { described_class.new(config, args, i...
Fix array element indentation in spec Change-Id: I1fa1332fa682e0ce0521ffdf10cfbe03bf53dbb8 Reviewed-on: http://gerrit.causes.com/37394 Tested-by: jenkins <d95b56ce41a2e1ac4cecdd398defd7414407cc08@causes.com> Reviewed-by: Shane da Silva <6f6e68d1df92f30cb4b3ce35260ddf94a402f33d@causes.com>
diff --git a/test/spec/store/get_entity_using_immediate_refresh.rb b/test/spec/store/get_entity_using_immediate_refresh.rb index abc1234..def5678 100644 --- a/test/spec/store/get_entity_using_immediate_refresh.rb +++ b/test/spec/store/get_entity_using_immediate_refresh.rb @@ -3,18 +3,18 @@ describe "Get Entity Using th...
Test uses the store's cache, rather than creating an independant cache object
diff --git a/ImageFormatInspector.podspec b/ImageFormatInspector.podspec index abc1234..def5678 100644 --- a/ImageFormatInspector.podspec +++ b/ImageFormatInspector.podspec @@ -7,8 +7,8 @@ s.author = { "David Sweetman" => "david@davidsweetman.com" } s.source = { :git => "https://github.com/swee...
Modify podspec to allow non-arc and ios 6
diff --git a/lib/osc-ruby/em_server.rb b/lib/osc-ruby/em_server.rb index abc1234..def5678 100644 --- a/lib/osc-ruby/em_server.rb +++ b/lib/osc-ruby/em_server.rb @@ -20,8 +20,7 @@ def run EM.error_handler{ |e| - puts "Error raised in EMServer: #{e.message}" - puts e.backtrace + Thread.m...
Use actual exceptions for handler errors
diff --git a/lib/gitlab.rb b/lib/gitlab.rb index abc1234..def5678 100644 --- a/lib/gitlab.rb +++ b/lib/gitlab.rb @@ -36,7 +36,7 @@ # # @return [Array<Symbol>] def self.actions - hidden = /endpoint|private_token|user_agent|sudo|get|post|put|\Adelete\z|validate|set_request_defaults/ + hidden = /endpoint|pri...
Hide httparty & httparty= methods from Gitlab.actions - just like endpoint, private_token, etc.
diff --git a/lib/global.rb b/lib/global.rb index abc1234..def5678 100644 --- a/lib/global.rb +++ b/lib/global.rb @@ -6,7 +6,6 @@ class Country < ISO3166::Country def to_s - warn "[DEPRECATION] `Country` is deprecated. Please use `ISO3166::Country` instead." name end end
Remove deprecation from Country call
diff --git a/lib/rspec/core/sandbox.rb b/lib/rspec/core/sandbox.rb index abc1234..def5678 100644 --- a/lib/rspec/core/sandbox.rb +++ b/lib/rspec/core/sandbox.rb @@ -3,6 +3,9 @@ # A sandbox isolates the enclosed code into an environment that looks 'new' # meaning globally accessed objects are reset for the dura...
Clarify that this file must be required.
diff --git a/lib/klarna.rb b/lib/klarna.rb index abc1234..def5678 100644 --- a/lib/klarna.rb +++ b/lib/klarna.rb @@ -4,6 +4,10 @@ require 'klarna/connection' module Klarna + COUNTRIES = { + '209' => 'Sweden' + } + def self.configure yield configuration if block_given? end
Define COUNTRIES constant with Sweden mapping.
diff --git a/stdlib/nodejs/kernel.rb b/stdlib/nodejs/kernel.rb index abc1234..def5678 100644 --- a/stdlib/nodejs/kernel.rb +++ b/stdlib/nodejs/kernel.rb @@ -18,6 +18,7 @@ # @deprecated Please use `require('module')` instead def node_require(path) + warn '[DEPRECATION] `node_require` is deprecated. Please use...
Add a message to warn users about the deprecation
diff --git a/lib/tasks/whitespace.rake b/lib/tasks/whitespace.rake index abc1234..def5678 100644 --- a/lib/tasks/whitespace.rake +++ b/lib/tasks/whitespace.rake @@ -13,6 +13,8 @@ end desc 'Remove consecutive blank lines' task :scrub_gratuitous_newlines do - sh %{find . -name '*.rb' -exec sed -i '' '/./,/^$/!...
Improve task which remove consecutive blank lines
diff --git a/lib/twitter_pagination.rb b/lib/twitter_pagination.rb index abc1234..def5678 100644 --- a/lib/twitter_pagination.rb +++ b/lib/twitter_pagination.rb @@ -1,42 +1,23 @@-# Modified from flow_pagination gem module TwitterPagination + class LinkRenderer < WillPaginate::ViewHelpers::LinkRenderer + protected ...
Update TwitterPagination class for new will_paginate And just as a side note, "Wow" at the new will_paginate. Made this stupid-easy.
diff --git a/0_code_wars/split_the_bill.rb b/0_code_wars/split_the_bill.rb index abc1234..def5678 100644 --- a/0_code_wars/split_the_bill.rb +++ b/0_code_wars/split_the_bill.rb @@ -0,0 +1,6 @@+# http://www.codewars.com/kata/split-the-bill/ +# --- iteration 1 --- +def split_the_bill(x) + avg = (x.values.reduce(:+)).fdi...
Add code wars (7) - split the bill
diff --git a/lib/generators/enumerate_it/enum/enum_generator.rb b/lib/generators/enumerate_it/enum/enum_generator.rb index abc1234..def5678 100644 --- a/lib/generators/enumerate_it/enum/enum_generator.rb +++ b/lib/generators/enumerate_it/enum/enum_generator.rb @@ -7,7 +7,7 @@ class_option :singular, type: 'stri...
Update description used in generator
diff --git a/Casks/font-kacstone.rb b/Casks/font-kacstone.rb index abc1234..def5678 100644 --- a/Casks/font-kacstone.rb +++ b/Casks/font-kacstone.rb @@ -0,0 +1,8 @@+class FontKacstone < Cask + url 'http://downloads.sourceforge.net/project/arabeyes/kacst_fonts/kacst_one_5.0.tar.bz2' + homepage 'http://projects.arabeye...
Add Arabic font Kacst One from Arabeyes project
diff --git a/Casks/intellij-idea.rb b/Casks/intellij-idea.rb index abc1234..def5678 100644 --- a/Casks/intellij-idea.rb +++ b/Casks/intellij-idea.rb @@ -1,6 +1,6 @@ cask :v1 => 'intellij-idea' do - version '14.1.3' - sha256 'a7045dd58a6d632724a0444b46b71de55ee237a8f8fa31aa9a82b685d8d8bef2' + version '14.1.4' + sha2...
Upgrade Intellij IDEA to 14.1.4 Signed-off-by: Koichi Shiraishi <41a18128582fec5418c0a92661f7d4b13d21d912@gmail.com>
diff --git a/app/services/alerts/collate_benchmark_data.rb b/app/services/alerts/collate_benchmark_data.rb index abc1234..def5678 100644 --- a/app/services/alerts/collate_benchmark_data.rb +++ b/app/services/alerts/collate_benchmark_data.rb @@ -14,16 +14,16 @@ def get_benchmarks_for_latest_run(latest_school_runs,...
Use school id rather than school object
diff --git a/spec/ladder/resource/dynamic_spec.rb b/spec/ladder/resource/dynamic_spec.rb index abc1234..def5678 100644 --- a/spec/ladder/resource/dynamic_spec.rb +++ b/spec/ladder/resource/dynamic_spec.rb @@ -16,13 +16,7 @@ context 'with data' do let(:subject) { Thing.new } - before do - # non-localize...
Use new context in dynamic spec
diff --git a/recipes/sevenscale_deploy/capistrano.rb b/recipes/sevenscale_deploy/capistrano.rb index abc1234..def5678 100644 --- a/recipes/sevenscale_deploy/capistrano.rb +++ b/recipes/sevenscale_deploy/capistrano.rb @@ -24,7 +24,8 @@ config_hash['roles'][role_name] = servers.collect { |s| s.host } serve...
Make sure each host has all options.