diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/Casks/rubymine-bundled-jdk.rb b/Casks/rubymine-bundled-jdk.rb index abc1234..def5678 100644 --- a/Casks/rubymine-bundled-jdk.rb +++ b/Casks/rubymine-bundled-jdk.rb @@ -0,0 +1,20 @@+cask :v1 => 'rubymine-bundled-jdk' do + version '7.1' + sha256 '2e9fced43c8e14ffbc82a72a8f6cde1cbab50861db079162ca5ff34c668b...
Add cask for RubyMine with bundled JDK
diff --git a/db/migrate/20160415102439_create_local_authorities.rb b/db/migrate/20160415102439_create_local_authorities.rb index abc1234..def5678 100644 --- a/db/migrate/20160415102439_create_local_authorities.rb +++ b/db/migrate/20160415102439_create_local_authorities.rb @@ -11,7 +11,7 @@ t.timestamps null: fals...
Fix syntax in local authority migration Changed the create_local_authorities migration to use the new hash syntax
diff --git a/db/migrate/20190212154035_change_form_id_to_bigint.rb b/db/migrate/20190212154035_change_form_id_to_bigint.rb index abc1234..def5678 100644 --- a/db/migrate/20190212154035_change_form_id_to_bigint.rb +++ b/db/migrate/20190212154035_change_form_id_to_bigint.rb @@ -0,0 +1,13 @@+class ChangeFormIdToBigint < A...
Update form_id primary and foreign keys to bigint
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 @@ -2,3 +2,8 @@ cas_server = Rails.env == 'production' ? 'https://authentification-cerbere.application.i2/cas/' : 'http://localhost:9...
Configure OmniAuth.config.full_host so that the application can work behind a reverse proxy (we're redirected to request.url otherwise, which is an internal domain on a private port)
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,3 +1,6 @@+# Set OmniAuth to use Rails logger instead of STDOUT +OmniAuth.config.logger = Rails.logger + Rails.application.config...
Set OmniAuth to use Rails logger
diff --git a/spec/factories/georgia/pages.rb b/spec/factories/georgia/pages.rb index abc1234..def5678 100644 --- a/spec/factories/georgia/pages.rb +++ b/spec/factories/georgia/pages.rb @@ -2,6 +2,5 @@ factory :georgia_page, class: Georgia::Page do template 'one-column' sequence(:slug) {|n| "page#{n}"} - ...
Remove status on page factory
diff --git a/spec/factories/notifications.rb b/spec/factories/notifications.rb index abc1234..def5678 100644 --- a/spec/factories/notifications.rb +++ b/spec/factories/notifications.rb @@ -9,8 +9,8 @@ end factory :admin_notification do - title { |n| "Admin Notification title #{n}" } - body ...
Fix missing sequences in notification factory If we don't define a sequence, `n` becomes an object instead of a number.
diff --git a/spec/factories/organizations.rb b/spec/factories/organizations.rb index abc1234..def5678 100644 --- a/spec/factories/organizations.rb +++ b/spec/factories/organizations.rb @@ -1,6 +1,6 @@ FactoryGirl.define do factory :organization do - name { Faker::Company.name } + sequence(:name) { |n| "#{Faker...
Make test organization names more unique The addition of a uniqueness validation on Organization#name is causing a lot of random failures; the Organization factory uses a Faker value, but appears to be producing repetitive results, so I've added a FactoryGirl sequence to ensure uniqueness.
diff --git a/spec/yelp/client/search_spec.rb b/spec/yelp/client/search_spec.rb index abc1234..def5678 100644 --- a/spec/yelp/client/search_spec.rb +++ b/spec/yelp/client/search_spec.rb @@ -1,10 +1,10 @@ require 'yelp' describe Yelp::Client::Search do - let(:keys) { Hash[consumer_key: 'abc', - con...
Use ENV for api keys in testing
diff --git a/slugworth.gemspec b/slugworth.gemspec index abc1234..def5678 100644 --- a/slugworth.gemspec +++ b/slugworth.gemspec @@ -1,7 +1,7 @@ # coding: utf-8 -lib = File.expand_path('../lib', __FILE__) +lib = File.expand_path("../lib", __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) -require 'slug...
Use double quotes consistently in gemspec
diff --git a/dummy/spec/helpers/application_helper_spec.rb b/dummy/spec/helpers/application_helper_spec.rb index abc1234..def5678 100644 --- a/dummy/spec/helpers/application_helper_spec.rb +++ b/dummy/spec/helpers/application_helper_spec.rb @@ -9,15 +9,15 @@ describe ApplicationHelper do describe '#general_attribute...
Call helper methods on helper instance.
diff --git a/error_data.gemspec b/error_data.gemspec index abc1234..def5678 100644 --- a/error_data.gemspec +++ b/error_data.gemspec @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- Gem::Specification.new do |s| s.name = 'error_data' - s.version = '0.1.0.1' + s.version = '0.2.0.0' s.summary = 'Representation of an er...
Package version is increased from 0.1.0.1 to 0.2.0.0
diff --git a/spec/models/board_spec.rb b/spec/models/board_spec.rb index abc1234..def5678 100644 --- a/spec/models/board_spec.rb +++ b/spec/models/board_spec.rb @@ -8,28 +8,4 @@ expect(board.ships.size).to eq 5 end - context 'belonging to player' do - let(:player_board) { create :board, opponent?: false }...
Delete unused visible? method tests
diff --git a/spec/system/basic_spec.rb b/spec/system/basic_spec.rb index abc1234..def5678 100644 --- a/spec/system/basic_spec.rb +++ b/spec/system/basic_spec.rb @@ -7,7 +7,7 @@ EOS puppet_apply(pp) do |r| - r.exit_code.should == 2 + r.exit_code.should == 0 end end end
Adjust exit code for basic spec:system test This class shouldn't make any changes when applied to a fresh system because the default manifest behaviour matches the stock install.
diff --git a/examples/logger.rb b/examples/logger.rb index abc1234..def5678 100644 --- a/examples/logger.rb +++ b/examples/logger.rb @@ -4,6 +4,8 @@ require_relative '../lib/tty-command' logger = Logger.new('dev.log') +logger.level = Logger::WARN +logger.warn("Logger captured:") cmd = TTY::Command.new(output: log...
Change example to demonstrate log level has no impact on logging behaviour
diff --git a/spec/factories.rb b/spec/factories.rb index abc1234..def5678 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -1,7 +1,7 @@ FactoryGirl.define do factory :user do sequence(:username) { |n| "user#{n}"} - # sequence(:email) {|n| "email#{n}@gmail.com" } + sequence(:email) {|n| "email#{n}@...
Add info to comment factory
diff --git a/pact_broker/config.ru b/pact_broker/config.ru index abc1234..def5678 100644 --- a/pact_broker/config.ru +++ b/pact_broker/config.ru @@ -27,13 +27,10 @@ } app = PactBroker::App.new do | config | - # change these from their default values if desired - # config.log_dir = "./log" - # config.auto_migrate_...
Set database connection timezone to UTC This is required for consistent timezone behaviour.
diff --git a/lib/altria/git/repository.rb b/lib/altria/git/repository.rb index abc1234..def5678 100644 --- a/lib/altria/git/repository.rb +++ b/lib/altria/git/repository.rb @@ -62,7 +62,7 @@ end def update_revision - job.current_build.update_properties(revision: revision) + job.current_buil...
Fix the nil error case with no current build
diff --git a/lib/instana/frameworks/rails.rb b/lib/instana/frameworks/rails.rb index abc1234..def5678 100644 --- a/lib/instana/frameworks/rails.rb +++ b/lib/instana/frameworks/rails.rb @@ -20,6 +20,7 @@ config.after_initialize do require "instana/frameworks/instrumentation/active_record" r...
Load ActionView instrumentation after Rails initialization
diff --git a/lib/brightbox-cli/logging.rb b/lib/brightbox-cli/logging.rb index abc1234..def5678 100644 --- a/lib/brightbox-cli/logging.rb +++ b/lib/brightbox-cli/logging.rb @@ -13,9 +13,9 @@ end def info(s='') - STDERR.write s - STDERR.write "\n" - STDERR.flush + $stderr.write...
Use globals rather than constants for IO Normally STDOUT == $stdout so they can be used interchangably. Trying to test the captured output and it is inconsistent because we are logging to either STDOUT or $stdout (or the err version). This makes it impossible to capture ALL output and check since the IO is a mixture....
diff --git a/lib/rrj/janus/response_error.rb b/lib/rrj/janus/response_error.rb index abc1234..def5678 100644 --- a/lib/rrj/janus/response_error.rb +++ b/lib/rrj/janus/response_error.rb @@ -0,0 +1,29 @@+# frozen_string_literal: true + +require 'bunny' + +module RubyRabbitmqJanus + # @author VAILLANT Jeremy <jeremy.vail...
Add class for test response janus is an error
diff --git a/test/unit/recipes/default_spec.rb b/test/unit/recipes/default_spec.rb index abc1234..def5678 100644 --- a/test/unit/recipes/default_spec.rb +++ b/test/unit/recipes/default_spec.rb @@ -1,8 +1,14 @@ require 'spec_helper' describe 'g5-postgresql::default' do + before do + # Stub command that cookbook u...
Update unit tests for latest version of chefspec
diff --git a/lib/stacker/stack/parameters.rb b/lib/stacker/stack/parameters.rb index abc1234..def5678 100644 --- a/lib/stacker/stack/parameters.rb +++ b/lib/stacker/stack/parameters.rb @@ -9,35 +9,54 @@ extend Memoist - def available - @available ||= stack.region.defaults.fetch('Parameters', {}).m...
Use template default values, when available AWS will set the defaults if we don't. Might as well. The diff will now also accurately reflect what's being changed. Signed-off-by: Evan Owen <a31932a4150a6c43f7c4879727da9a731c3d5877@gmail.com>
diff --git a/lib/toy_robot_simulator/view.rb b/lib/toy_robot_simulator/view.rb index abc1234..def5678 100644 --- a/lib/toy_robot_simulator/view.rb +++ b/lib/toy_robot_simulator/view.rb @@ -0,0 +1,20 @@+View = Struct.new(:args) do + def report + report = robot.report + output.puts report_string(report) if report ...
Implement View according to ViewTest
diff --git a/spec/lib/coins_spec.rb b/spec/lib/coins_spec.rb index abc1234..def5678 100644 --- a/spec/lib/coins_spec.rb +++ b/spec/lib/coins_spec.rb @@ -11,6 +11,11 @@ coins = { '2_pence' => 2, '1_pence' => 0 } expect(@coins.return_minimum_coins(pennies)).to eql(coins) + + pennies = "9" + coins...
Add additional test for single digit (9 pence)
diff --git a/spec/models/section.rb b/spec/models/section.rb index abc1234..def5678 100644 --- a/spec/models/section.rb +++ b/spec/models/section.rb @@ -1,3 +1,5 @@+require File.expand_path('../content_item', __FILE__) + class Section < ActiveRecord::Base include Ublisherp::PublishableWithInstanceShortcuts
Build on Travis doesn't find ContentItem for some reason
diff --git a/lib/peribot/error_helpers.rb b/lib/peribot/error_helpers.rb index abc1234..def5678 100644 --- a/lib/peribot/error_helpers.rb +++ b/lib/peribot/error_helpers.rb @@ -1,9 +1,10 @@ module Peribot - # A module to provide standard functionality for printing error messages - # within Peribot components. It assu...
Clean up docs for ErrorHelpers Just some minor documentation changes to ensure things are up to date.
diff --git a/rest/rest_server.rb b/rest/rest_server.rb index abc1234..def5678 100644 --- a/rest/rest_server.rb +++ b/rest/rest_server.rb @@ -1,4 +1,5 @@ require 'sinatra/base' +require 'json' require 'rest/helpers' @@ -20,7 +21,7 @@ $session = Session.new $session.users = data['users'].map { |e| Use...
Use to_json to generate the REST responses
diff --git a/lib/simctl/command/create.rb b/lib/simctl/command/create.rb index abc1234..def5678 100644 --- a/lib/simctl/command/create.rb +++ b/lib/simctl/command/create.rb @@ -24,9 +24,10 @@ # @yield [exception] an exception that might happen during shutdown/delete of the old device def reset_device(name,...
Delete all matching devices in reset_device
diff --git a/Aperitif.podspec b/Aperitif.podspec index abc1234..def5678 100644 --- a/Aperitif.podspec +++ b/Aperitif.podspec @@ -5,7 +5,7 @@ s.homepage = 'http://github.com/crushlovely/Aperitif' s.license = 'MIT' s.authors = { 'Crush & Lovely' => 'engineering@crushlovely.com', 'Tim Cle...
Update podspec for going live
diff --git a/lib/tasks/delete_assets.rake b/lib/tasks/delete_assets.rake index abc1234..def5678 100644 --- a/lib/tasks/delete_assets.rake +++ b/lib/tasks/delete_assets.rake @@ -5,7 +5,10 @@ task :delete_assets do Resume::Output.raw_warning("Deleting assets in the tmpdir...") + # Remove all resume prefixed f...
Delete the Japanese font files from the tmp directory when doing a delete assets sweep
diff --git a/Casks/macdown.rb b/Casks/macdown.rb index abc1234..def5678 100644 --- a/Casks/macdown.rb +++ b/Casks/macdown.rb @@ -9,4 +9,7 @@ license :mit app 'MacDown.app' + + zap :delete => ['~/Library/Preferences/com.uranusjr.macdown.plist', + '~/Library/Application Support/MacDown'] end
Add zap procedures for MacDown
diff --git a/Formula/xdebug.rb b/Formula/xdebug.rb index abc1234..def5678 100644 --- a/Formula/xdebug.rb +++ b/Formula/xdebug.rb @@ -7,6 +7,9 @@ def install Dir.chdir 'xdebug-2.0.5' do + # See http://github.com/mxcl/homebrew/issues/#issue/69 + ENV.universal_binary unless Hardware.is_64_bit? + ...
Build a universal binary on Leopard Fixes #69
diff --git a/IDPDesign.podspec b/IDPDesign.podspec index abc1234..def5678 100644 --- a/IDPDesign.podspec +++ b/IDPDesign.podspec @@ -13,9 +13,9 @@ # Platform setup s.requires_arc = true - s.ios.deployment_target = '8.0' + s.ios.deployment_target = '10.0' s.osx.deployment_target = '10.9' - s.tvos.d...
Update min iOS version to 10.0
diff --git a/TodUni/app/models/project.rb b/TodUni/app/models/project.rb index abc1234..def5678 100644 --- a/TodUni/app/models/project.rb +++ b/TodUni/app/models/project.rb @@ -1,6 +1,6 @@ class Project < ActiveRecord::Base acts_as_taggable_on :tags - enum status: [:en_progreso, :terminado, :cancelado] + enum status:...
Add 'preproyecto' status to Proyecto's status enum
diff --git a/roles/hostedinnz.rb b/roles/hostedinnz.rb index abc1234..def5678 100644 --- a/roles/hostedinnz.rb +++ b/roles/hostedinnz.rb @@ -2,6 +2,11 @@ description "Role applied to all servers at HostedIn.NZ" default_attributes( + :accounts => { + :users => { + :asmith => { :status => :administrator } + ...
Add asmith as admin on HostedIn.NZ machines
diff --git a/app/controllers/audits_controller.rb b/app/controllers/audits_controller.rb index abc1234..def5678 100644 --- a/app/controllers/audits_controller.rb +++ b/app/controllers/audits_controller.rb @@ -5,7 +5,7 @@ if params[:start_date] and params[:end_date] @start_date = parse_date params[:start_date...
Simplify the audits controller a bit more.
diff --git a/UIView-I7ShakeAnimation.podspec b/UIView-I7ShakeAnimation.podspec index abc1234..def5678 100644 --- a/UIView-I7ShakeAnimation.podspec +++ b/UIView-I7ShakeAnimation.podspec @@ -1,12 +1,12 @@ Pod::Spec.new do |s| s.name = "UIView-I7ShakeAnimation" - s.version = "0.0.1" + s.version = "0...
Podspec: Change email, homepage and version number
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index abc1234..def5678 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -7,8 +7,8 @@ def index @situation = Situation.find(params[:id] ? params[:id] : 1) @last_situation = @situati...
Fix link to create new from home view.
diff --git a/spec/app/models/log_spec.rb b/spec/app/models/log_spec.rb index abc1234..def5678 100644 --- a/spec/app/models/log_spec.rb +++ b/spec/app/models/log_spec.rb @@ -5,7 +5,7 @@ it 'works when the collection exists' do expect do described_class.create_collection - end.to change { Honeypo...
Add spec with an array
diff --git a/spec/player/options_spec.rb b/spec/player/options_spec.rb index abc1234..def5678 100644 --- a/spec/player/options_spec.rb +++ b/spec/player/options_spec.rb @@ -24,4 +24,31 @@ it { assert_equal ['lorem', 'ipsum'], subject.words } end + + describe "information outputs" do + describe "help messag...
Add more specs for option parser.
diff --git a/app/helpers/blog_posts_helper.rb b/app/helpers/blog_posts_helper.rb index abc1234..def5678 100644 --- a/app/helpers/blog_posts_helper.rb +++ b/app/helpers/blog_posts_helper.rb @@ -1,2 +1,23 @@ module BlogPostsHelper + + require 'redcarpet' + + def parse_markdown(file_path) + @renderer ||= Redcarpet::R...
Add helper method to parse markdown files Adds a helper method `parse_markdown` to BlogPosts that reads markdown files and creates html rederable output (that will not be escaped by rails automatically) Includes stub methods for getting render options, and getting markdown options.
diff --git a/spec/stamp_changelog_action_spec.rb b/spec/stamp_changelog_action_spec.rb index abc1234..def5678 100644 --- a/spec/stamp_changelog_action_spec.rb +++ b/spec/stamp_changelog_action_spec.rb @@ -0,0 +1,52 @@+describe Fastlane::Actions::StampChangelogAction do + describe 'Stamp CHANGELOG.md action' do + + l...
Add unit tests for stamp_changelog action
diff --git a/app/models/concerns/repo_tags.rb b/app/models/concerns/repo_tags.rb index abc1234..def5678 100644 --- a/app/models/concerns/repo_tags.rb +++ b/app/models/concerns/repo_tags.rb @@ -2,7 +2,7 @@ def download_tags(token = nil) existing_tag_names = github_tags.pluck(:name) github_client(token).refs(...
Fix checking for misisng attribute on git tags
diff --git a/app/helpers/cms/users_helper.rb b/app/helpers/cms/users_helper.rb index abc1234..def5678 100644 --- a/app/helpers/cms/users_helper.rb +++ b/app/helpers/cms/users_helper.rb @@ -11,7 +11,7 @@ link_to( 'Mark Complete', complete_sales_stage_cms_user_path(sales_stage_id: stage.id), - meth...
Add confirmation alert when marking stage complete
diff --git a/base/db/migrate/20120621135650_add_comment_count_to_activity_object.rb b/base/db/migrate/20120621135650_add_comment_count_to_activity_object.rb index abc1234..def5678 100644 --- a/base/db/migrate/20120621135650_add_comment_count_to_activity_object.rb +++ b/base/db/migrate/20120621135650_add_comment_count_t...
Make migration resistant to validations
diff --git a/core/app/models/spree/gateway.rb b/core/app/models/spree/gateway.rb index abc1234..def5678 100644 --- a/core/app/models/spree/gateway.rb +++ b/core/app/models/spree/gateway.rb @@ -1,6 +1,6 @@ module Spree class Gateway < PaymentMethod - delegate_belongs_to :provider, :authorize, :purchase, :capture, ...
Use pure delegate in Spree::Gateway, compared with delegate_belongs_to The provider method here is not a belongs_to association, so there's no good reason why we should be using delegate_belongs_to at all. Further more, delegate_belongs_to defines setters for these methods, but that is not necessary at all since these...
diff --git a/spec/mobility/plugins/fallthrough_accessors_spec.rb b/spec/mobility/plugins/fallthrough_accessors_spec.rb index abc1234..def5678 100644 --- a/spec/mobility/plugins/fallthrough_accessors_spec.rb +++ b/spec/mobility/plugins/fallthrough_accessors_spec.rb @@ -10,6 +10,22 @@ it_behaves_like "locale accessor...
Add regression spec for passing options to super
diff --git a/proxyprotocol.gemspec b/proxyprotocol.gemspec index abc1234..def5678 100644 --- a/proxyprotocol.gemspec +++ b/proxyprotocol.gemspec @@ -8,9 +8,8 @@ spec.version = Proxyprotocol::VERSION spec.authors = ["Ómar Kjartan Yasin"] spec.email = ["omarkj@gmail.com"] - spec.summary ...
Add a description and homepage to the gemspec.
diff --git a/lib/buildr_plus/roles/replicant_qa_support.rb b/lib/buildr_plus/roles/replicant_qa_support.rb index abc1234..def5678 100644 --- a/lib/buildr_plus/roles/replicant_qa_support.rb +++ b/lib/buildr_plus/roles/replicant_qa_support.rb @@ -18,7 +18,7 @@ if BuildrPlus::FeatureManager.activated?(:domgen) ge...
Stop duplicate generation of code
diff --git a/actionpack-page_caching.gemspec b/actionpack-page_caching.gemspec index abc1234..def5678 100644 --- a/actionpack-page_caching.gemspec +++ b/actionpack-page_caching.gemspec @@ -8,6 +8,7 @@ gem.description = 'Static page caching for Action Pack (removed from core in Rails 4.0)' gem.summary = 'St...
Add license information to gemspec. Fixes #9.
diff --git a/lib/capistrano/tasks/db.rake b/lib/capistrano/tasks/db.rake index abc1234..def5678 100644 --- a/lib/capistrano/tasks/db.rake +++ b/lib/capistrano/tasks/db.rake @@ -5,9 +5,9 @@ desc 'copy local data files to remote server' task :copy_data_to_remote do on roles(:all) do - upload!('data/data.sq...
Copy data tsv and sql files to the public folder
diff --git a/lib/cucumber-puppet/steps.rb b/lib/cucumber-puppet/steps.rb index abc1234..def5678 100644 --- a/lib/cucumber-puppet/steps.rb +++ b/lib/cucumber-puppet/steps.rb @@ -2,7 +2,7 @@ # file: yaml node file fail("Cannot find node facts #{file}.") unless File.exist?(file) @node = YAML.load_file(file) - fil...
Fix an undefined method error. s/file/fail/
diff --git a/master_slave_adapter.gemspec b/master_slave_adapter.gemspec index abc1234..def5678 100644 --- a/master_slave_adapter.gemspec +++ b/master_slave_adapter.gemspec @@ -4,17 +4,22 @@ Gem::Specification.new do |s| s.name = 'master_slave_adapter_soundcloud' s.version = File.read('VERSION').to_s +...
Tweak gemspec a little, trying to work around 'DefaultKey' issue, but to no avail
diff --git a/lib/inch/cli/trace_helper.rb b/lib/inch/cli/trace_helper.rb index abc1234..def5678 100644 --- a/lib/inch/cli/trace_helper.rb +++ b/lib/inch/cli/trace_helper.rb @@ -26,7 +26,7 @@ end def header(text, color) - " ".method("on_#{color}").call + + "#".color(color).method("on_#{color...
Update TraceHelper to make headers no-color compatible
diff --git a/test/prey_fetcher_test.rb b/test/prey_fetcher_test.rb index abc1234..def5678 100644 --- a/test/prey_fetcher_test.rb +++ b/test/prey_fetcher_test.rb @@ -1,6 +1,6 @@ ENV['RACK_ENV'] = 'test' -require File.join(File.dirname(__FILE__), '../', "prey_fetcher.rb") +require File.join(File.dirname(__FILE__), '../...
Remove cruddy tests; this needs some love
diff --git a/pullable.rb b/pullable.rb index abc1234..def5678 100644 --- a/pullable.rb +++ b/pullable.rb @@ -13,17 +13,17 @@ if File.directory?('.git') puts "Pulling: #{directory}" - `git pull` - `git remote prune origin` + `git fetch -p` + `git merge --ff-only origin/master` end -...
Use fetch, and ff-only merge
diff --git a/lib/siebel_donations/base.rb b/lib/siebel_donations/base.rb index abc1234..def5678 100644 --- a/lib/siebel_donations/base.rb +++ b/lib/siebel_donations/base.rb @@ -20,6 +20,8 @@ case response.code when 200 Oj.load(response) + when 400 + raise RestClient::Exceptio...
Raise a useful exception when a 400 error occurs
diff --git a/lib/thumbor_rails/helpers.rb b/lib/thumbor_rails/helpers.rb index abc1234..def5678 100644 --- a/lib/thumbor_rails/helpers.rb +++ b/lib/thumbor_rails/helpers.rb @@ -21,7 +21,7 @@ if host =~ /%d/ host = host % (Zlib.crc32(path) % 4) end - host + path + ENV.has_key?("DISABLE_TH...
Add ability to disable Thumbor using an ENV variable
diff --git a/que.gemspec b/que.gemspec index abc1234..def5678 100644 --- a/que.gemspec +++ b/que.gemspec @@ -13,7 +13,21 @@ spec.homepage = 'https://github.com/chanks/que' spec.license = 'MIT' - spec.files = `git ls-files`.split($/) + files_to_exclude = [ + /\Adocs/, + /\A\.circleci/, ...
Drop a bunch of unnecessary files from built gems.
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 @@ -22,7 +22,7 @@ end # Only show link if flyer approved - def pubic_link_to_flyer(event) + def public_link_to_flyer(event) if event ...
Rename pubic_link_to_flyer to public_link_to_flyer. Haha.
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 @@ -10,7 +10,7 @@ def timeslots slots = Array.new - @conference.max_timeslots.times do |i| + (@conference.max_timeslots+1).times do ...
Fix off-by-one in max timeslot selection
diff --git a/lib/tty/table/border/null.rb b/lib/tty/table/border/null.rb index abc1234..def5678 100644 --- a/lib/tty/table/border/null.rb +++ b/lib/tty/table/border/null.rb @@ -6,12 +6,6 @@ # A class that represents no border. class Null < Border - - # @api private - def initialize(row) - ...
Remove initialization, no longer needed.
diff --git a/app/lib/markdown_renderer.rb b/app/lib/markdown_renderer.rb index abc1234..def5678 100644 --- a/app/lib/markdown_renderer.rb +++ b/app/lib/markdown_renderer.rb @@ -10,7 +10,7 @@ if title =~ /\A[a-f0-9-]{36}\z/i image = Medium.where(id: title).first if image - image_tag(image.file.u...
Use post size medium by default
diff --git a/app/models/editor_request.rb b/app/models/editor_request.rb index abc1234..def5678 100644 --- a/app/models/editor_request.rb +++ b/app/models/editor_request.rb @@ -11,6 +11,8 @@ validates_presence_of :token before_save :destroy_duplicates + + named_scope :expired, lambda { { :conditions => [ "e...
Add expired scope to EditroRequests
diff --git a/app/models/mention_mailer.rb b/app/models/mention_mailer.rb index abc1234..def5678 100644 --- a/app/models/mention_mailer.rb +++ b/app/models/mention_mailer.rb @@ -9,6 +9,6 @@ def notify_mentioning(issue, journal, user) @issue = issue @journal = journal - mail(to: user.mail, subject: "You we...
Add issue number to email subject.
diff --git a/lib/volt/volt/environment.rb b/lib/volt/volt/environment.rb index abc1234..def5678 100644 --- a/lib/volt/volt/environment.rb +++ b/lib/volt/volt/environment.rb @@ -1,7 +1,8 @@ module Volt class Environment def initialize - @env = ENV['VOLT_ENV'] + # Use VOLT_ENV or RACK_ENV to set the env...
Allow Volt.env to be set by RACK_ENV also. This makes heroku work out of the box for example.
diff --git a/lib/rescue_from_duplicate/active_record.rb b/lib/rescue_from_duplicate/active_record.rb index abc1234..def5678 100644 --- a/lib/rescue_from_duplicate/active_record.rb +++ b/lib/rescue_from_duplicate/active_record.rb @@ -7,8 +7,9 @@ end def self.missing_unique_indexes - klasses = ::ActiveRecord::B...
Use all subclasses of AR::Base, not just direct descendants
diff --git a/lib/solidus_subscriptions/order_creator.rb b/lib/solidus_subscriptions/order_creator.rb index abc1234..def5678 100644 --- a/lib/solidus_subscriptions/order_creator.rb +++ b/lib/solidus_subscriptions/order_creator.rb @@ -18,7 +18,7 @@ ) end - protected + private def extra_attribute...
Change accessiblity of SolidusSubscriptions::OrderCreator from protected to private
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 @@ -22,6 +22,7 @@ end def format_info_refresh_policy(refresh_policy) + return "manually only" if refresh_policy.blank? refresh...
Fix refresh plan display when no plan is defined for chart
diff --git a/app/helpers/relations_helper.rb b/app/helpers/relations_helper.rb index abc1234..def5678 100644 --- a/app/helpers/relations_helper.rb +++ b/app/helpers/relations_helper.rb @@ -1,2 +1,10 @@ module RelationsHelper + + def format_date_for(relation) + if relation.to.nil? + return "#{relation.from}" + ...
Create format_date_for helper to get formatted date in relations
diff --git a/rails-flog.gemspec b/rails-flog.gemspec index abc1234..def5678 100644 --- a/rails-flog.gemspec +++ b/rails-flog.gemspec @@ -19,7 +19,7 @@ spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ['lib'] - spec.add_development_dependency 'bundler', '~> 2.0' + spec.add_d...
Remove gem version specifiers of bundler
diff --git a/rails-i18n.gemspec b/rails-i18n.gemspec index abc1234..def5678 100644 --- a/rails-i18n.gemspec +++ b/rails-i18n.gemspec @@ -2,12 +2,12 @@ Gem::Specification.new do |s| s.name = "rails-i18n" - s.version = '0.6' + s.version = '0.1.0' s.authors = ["Rails I18n Group"] s.emai...
Update the summary and description of gemspec
diff --git a/ruby-anything.gemspec b/ruby-anything.gemspec index abc1234..def5678 100644 --- a/ruby-anything.gemspec +++ b/ruby-anything.gemspec @@ -17,5 +17,9 @@ gem.test_files = gem.files.grep(%r{^(test|spec|features)/}) gem.require_paths = ["lib"] + if RUBY_VERSION >= '2.1' + gem.add_dependency "curses...
Support Ruby2.1. Add curses to dependencies.
diff --git a/recipes/service.rb b/recipes/service.rb index abc1234..def5678 100644 --- a/recipes/service.rb +++ b/recipes/service.rb @@ -3,6 +3,15 @@ start_command = "#{node['marathon']['path']}/bin/start" node['marathon']['options'].each do |opt, value| start_command << " --#{opt} #{value}" +end + +chefstart = "#{...
Use chefstart file for systemd as well
diff --git a/app/models/deleted_dossier.rb b/app/models/deleted_dossier.rb index abc1234..def5678 100644 --- a/app/models/deleted_dossier.rb +++ b/app/models/deleted_dossier.rb @@ -1,5 +1,7 @@ class DeletedDossier < ApplicationRecord belongs_to :procedure + + validates :dossier_id, uniqueness: true enum reason...
Validate deleted dossiers dossier_id uniqueness
diff --git a/app/models/organization_user.rb b/app/models/organization_user.rb index abc1234..def5678 100644 --- a/app/models/organization_user.rb +++ b/app/models/organization_user.rb @@ -1,6 +1,8 @@ class OrganizationUser < ActiveRecord::Base belongs_to :organization belongs_to :user + validates :organization_...
Add validation to Organization User for org and user ID
diff --git a/app/models/day.rb b/app/models/day.rb index abc1234..def5678 100644 --- a/app/models/day.rb +++ b/app/models/day.rb @@ -5,5 +5,7 @@ def create_bookings BookingTemplate.create_booking('day:cash', :amount => cash, :value_date => date) BookingTemplate.create_booking('day:card turnover', :amount =>...
Create bookings for credit turnover and expenses in cash up.
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 @@ -15,7 +15,7 @@ begin Site.current ||= Site.find(1) rescue ActiveRecord::RecordNotFound - Site.connection.execute("DELETE FROM SITES; ALTER TABLE sites AUTO_INC...
Fix table name in spec helper.
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 @@ -5,7 +5,9 @@ require 'sequel' -DB = Sequel.sqlite +DB = Sequel.connect("postgres:///sequel-slugging-test") + +DB.drop_table? :widgets DB.create_table :widgets do primary_...
Use Postgres for testing, because of course.
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 @@ -36,7 +36,6 @@ RSpec.configure do |config| config.treat_symbols_as_metadata_keys_with_true_values = true config.run_all_when_everything_filtered = true - config.filter_run :...
Remove more spec run noise
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 @@ -26,6 +26,7 @@ add_group 'Source', 'lib' add_group 'Unit tests', 'spec/tara' add_group 'Acceptance tests', 'spec/acceptance' + add_group 'Integration tests', 'spec...
Add `integration` group to Simplecov
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 @@ -7,8 +7,8 @@ c.expect_with(:rspec) { |c| c.syntax = [:should, :expect] } c.mock_with(:rspec) { |c| c.syntax = [:should, :expect] } - # Only run tests marked with iso:tr...
Change spec filter :iso to :focus for compatibility with `fit` method.
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,17 @@ require 'minitest' require 'minitest/autorun' -require 'ffi-vix_disk_lib' + +begin + require 'ffi-vix_disk_lib' +rescue LoadError + STDERR.puts <<-EOMSG + +The VMw...
Exit the specs with a clear message when the VDDK is not present at all.
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,6 @@+RSpec.configure do |config| + config.mock_with :rspec +end require 'puppetlabs_spec_helper/module_spec_helper' RSpec.configure do |config|
Remove deprecation warning when running spec tests See https://tickets.puppetlabs.com/browse/PDK-916
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 @@ -24,7 +24,7 @@ add_group 'Relationship', 'lib/data_mapper/relationship' add_group 'Attribute', 'lib/data_mapper/attribute' - minimum_coverage 98.21 + minimum_co...
Update spec coverage threshold to work for JRuby * The threshold is about 0.10% lower under JRuby, so adjust it downward to compensate.
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 @@ -18,22 +18,28 @@ RSpec.configure do |config| config.mock_with :mocha - # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures - # config.fixture_path =...
Set up test helper for Carrierwave Use separate upload directory Clean the directory after each test
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 @@ -24,7 +24,7 @@ add_group 'Relationship', 'lib/data_mapper/relationship' add_group 'Attribute', 'lib/data_mapper/attribute' - minimum_coverage 98.21 + minimum_co...
Update spec coverage threshold to work for JRuby * The threshold is about 0.10% lower under JRuby, so adjust it downward to compensate.
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 @@ -7,9 +7,10 @@ require 'database_cleaner' + def login_as_stub_user @user = User.create!(:name => 'Stub User') - request.env['warden'] = stub(:authenticate! => true, :authen...
Call request as an instance var
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 @@ -8,6 +8,11 @@ namespace :dummy do load 'spec/dummyapp/Rakefile' +end + +if ENV['TRAVIS_JDK_VERSION'] == 'oraclejdk7' + require 'rollbar/configuration' + Rollbar::Configurati...
Use api-alt.rollbar.com for oraclejdk7 tests.
diff --git a/spec/vector_spec.rb b/spec/vector_spec.rb index abc1234..def5678 100644 --- a/spec/vector_spec.rb +++ b/spec/vector_spec.rb @@ -7,23 +7,27 @@ @v = Vector[-0.1, -0.9, -10] end - it "has an x-coordinate" do - expect(@v.x).to eq(-0.1) - end + context "accessing vector components" do + + it "has an x...
Update tests to new rspec standards
diff --git a/lib/tasks/easy_reference_data.rake b/lib/tasks/easy_reference_data.rake index abc1234..def5678 100644 --- a/lib/tasks/easy_reference_data.rake +++ b/lib/tasks/easy_reference_data.rake @@ -1,14 +1,30 @@+def load_files + files = Dir[File.join(Rails.root, 'db', 'reference', '*.rb')].sort + files += Dir[File...
Add rake task to run refresh in a transaction.
diff --git a/lib/email_address/active_record_validator.rb b/lib/email_address/active_record_validator.rb index abc1234..def5678 100644 --- a/lib/email_address/active_record_validator.rb +++ b/lib/email_address/active_record_validator.rb @@ -38,7 +38,7 @@ e = Address.new(r[f]) unless e.valid? error...
Use I18n strings if available Like #67 but I18n is used on Rails' side
diff --git a/attributes/tez.rb b/attributes/tez.rb index abc1234..def5678 100644 --- a/attributes/tez.rb +++ b/attributes/tez.rb @@ -2,4 +2,8 @@ default['tez']['tez_env']['tez_conf_dir'] = "/etc/tez/#{node['tez']['conf_dir']}" default['tez']['tez_env']['tez_jars'] = '/usr/lib/tez/*:/usr/lib/tez/lib/*' -default['hado...
Prepend new classpath entries if already defined
diff --git a/abstract_type.gemspec b/abstract_type.gemspec index abc1234..def5678 100644 --- a/abstract_type.gemspec +++ b/abstract_type.gemspec @@ -10,6 +10,7 @@ gem.description = 'Module to declare abstract classes and methods' gem.summary = gem.description gem.homepage = 'https://github.com/dkubb/abst...
Add MIT license to gemspec
diff --git a/app/services/authenticator.rb b/app/services/authenticator.rb index abc1234..def5678 100644 --- a/app/services/authenticator.rb +++ b/app/services/authenticator.rb @@ -11,7 +11,7 @@ def find_or_create_from_oauth ActiveRecord::Base.transaction do - @connection = Connection.where(connection_att...
Make sure developer exists before creating connection
diff --git a/src/modules/module_newstitle.rb b/src/modules/module_newstitle.rb index abc1234..def5678 100644 --- a/src/modules/module_newstitle.rb +++ b/src/modules/module_newstitle.rb @@ -1,29 +1,33 @@ Kernel.load("fetch_uri.rb") -def parseNewsTitle(url) - hosts = { - /.*iltalehti\.fi/ => /(.*) \| Iltalehti\.fi$...
Update Newstitle to new module format Signed-off-by: Aki Saarinen <278bc57fbbff6b7b38435aea0f9d37e3d879167e@akisaarinen.fi>
diff --git a/lib/padrino-pipeline/pipelines/asset_pack.rb b/lib/padrino-pipeline/pipelines/asset_pack.rb index abc1234..def5678 100644 --- a/lib/padrino-pipeline/pipelines/asset_pack.rb +++ b/lib/padrino-pipeline/pipelines/asset_pack.rb @@ -44,7 +44,7 @@ packages.each { |package| send(package.shift, *package)...
Make compression the same for both pipelines
diff --git a/spec/factories/ci/job_artifacts.rb b/spec/factories/ci/job_artifacts.rb index abc1234..def5678 100644 --- a/spec/factories/ci/job_artifacts.rb +++ b/spec/factories/ci/job_artifacts.rb @@ -32,7 +32,7 @@ after(:build) do |artifact, evaluator| artifact.file = fixture_file_upload( - e...
Revert using expand_fixture_path in factory
diff --git a/rspec-wait.gemspec b/rspec-wait.gemspec index abc1234..def5678 100644 --- a/rspec-wait.gemspec +++ b/rspec-wait.gemspec @@ -17,5 +17,5 @@ spec.add_dependency "rspec", ">= 2.11", "< 3.2" spec.add_development_dependency "bundler", "~> 1.7" - spec.add_development_dependency "rake", "~> 10.3" + spec.a...
Update the development rake gem dependency version requirement