diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/SourceKittenFramework.podspec b/SourceKittenFramework.podspec index abc1234..def5678 100644 --- a/SourceKittenFramework.podspec +++ b/SourceKittenFramework.podspec @@ -8,7 +8,7 @@ s.author = { 'JP Simard' => 'jp@jpsim.com' } s.platform = :osx, '10.9' s.source_files = ...
Remove Swift 5.1 from podspec swift versions
diff --git a/TVGuide/app/models/channel.rb b/TVGuide/app/models/channel.rb index abc1234..def5678 100644 --- a/TVGuide/app/models/channel.rb +++ b/TVGuide/app/models/channel.rb @@ -1,6 +1,6 @@ class Channel < ApplicationRecord belongs_to :category + has_many :schedules, through: :shows has_many :shows - has_man...
Change order of attributes in Channel model.
diff --git a/spec/acceptance/001_basic_spec.rb b/spec/acceptance/001_basic_spec.rb index abc1234..def5678 100644 --- a/spec/acceptance/001_basic_spec.rb +++ b/spec/acceptance/001_basic_spec.rb @@ -37,7 +37,7 @@ }, prospectors => { 'system-logs' => { - log_type => 'system', + ...
Fix beaker tests (they were using deprecated parameters)
diff --git a/lib/compass-rails/patches/static_compiler.rb b/lib/compass-rails/patches/static_compiler.rb index abc1234..def5678 100644 --- a/lib/compass-rails/patches/static_compiler.rb +++ b/lib/compass-rails/patches/static_compiler.rb @@ -11,6 +11,7 @@ :filename => eval_file, :line => line, ...
Apply 'classic' sass config setting for generating line comments
diff --git a/test/controllers/coronavirus_local_restrictions_controller_test.rb b/test/controllers/coronavirus_local_restrictions_controller_test.rb index abc1234..def5678 100644 --- a/test/controllers/coronavirus_local_restrictions_controller_test.rb +++ b/test/controllers/coronavirus_local_restrictions_controller_tes...
Add a test for when a blank postcode is submitted
diff --git a/test/test_helper.rb b/test/test_helper.rb index abc1234..def5678 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,7 @@ require 'simplecov' require 'minitest/rg' -SimpleCov.minimum_coverage_by_file 80 +SimpleCov.minimum_coverage_by_file 100 SimpleCov.start do add_filter '/test/' ...
Increase test coverage requirement from 80% to 100%
diff --git a/test/test_helper.rb b/test/test_helper.rb index abc1234..def5678 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -15,7 +15,12 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) $LOAD_PATH.unshift(File.dirname(__FILE__)) -RAILS_ROOT = File.dirname(__FILE__) +class Rails +...
Fix for latest version of nulldb
diff --git a/test/test_helper.rb b/test/test_helper.rb index abc1234..def5678 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,6 +1,7 @@ require File.expand_path("../../test/dummy/config/environment.rb", __FILE__) ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../test/dummy/db/migrate"...
Fix raise error on test due to bug of rails generator
diff --git a/test/test_helper.rb b/test/test_helper.rb index abc1234..def5678 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -8,8 +8,8 @@ # make sure we can run redis # -if !system("which redis-server") - puts '', "** can't find `redis-server` in your path" +if !system("which redis-server") || !syste...
Use redis-cli to shutdown redis server It would appear that the process name as reported by ps has changed, so we weren't getting a pid to use for kill. This should be more fool-proof.
diff --git a/test/test_schema.rb b/test/test_schema.rb index abc1234..def5678 100644 --- a/test/test_schema.rb +++ b/test/test_schema.rb @@ -1,14 +1,19 @@ require 'test/unit' require 'batch/database/schema' -require 'java' -require 'C:/oracle/product/11.2.0/dbhome_1/jdbc/lib/ojdbc6.jar' class TestSchema < T...
Add support for testing against Oracle using Ruby OCI8
diff --git a/examples/admin_user.rb b/examples/admin_user.rb index abc1234..def5678 100644 --- a/examples/admin_user.rb +++ b/examples/admin_user.rb @@ -0,0 +1,28 @@+ActiveAdmin.register AdminUser do + permit_params :email, :password, :password_confirmation + + index do + selectable_column + id_column + colu...
Add folder with examples for testing
diff --git a/test/factories/campuses_factory.rb b/test/factories/campuses_factory.rb index abc1234..def5678 100644 --- a/test/factories/campuses_factory.rb +++ b/test/factories/campuses_factory.rb @@ -6,5 +6,6 @@ name campus_name abbreviation campus_abbreviation mode { ['timetable', 'au...
ENHANCE: Add active to campus factory
diff --git a/lib/modules/sections_and_questions_shared.rb b/lib/modules/sections_and_questions_shared.rb index abc1234..def5678 100644 --- a/lib/modules/sections_and_questions_shared.rb +++ b/lib/modules/sections_and_questions_shared.rb @@ -20,6 +20,7 @@ private def destroy_answer_type + return tr...
Return if no answer type
diff --git a/lib/puppet-lint/plugins/no_cron_resources.rb b/lib/puppet-lint/plugins/no_cron_resources.rb index abc1234..def5678 100644 --- a/lib/puppet-lint/plugins/no_cron_resources.rb +++ b/lib/puppet-lint/plugins/no_cron_resources.rb @@ -1,15 +1,14 @@ PuppetLint.new_check(:no_cron_resources) do def check res...
Convert to next and early return on non-cron resources Reindent to suit the change
diff --git a/lib/rspec_api_documentation/configuration.rb b/lib/rspec_api_documentation/configuration.rb index abc1234..def5678 100644 --- a/lib/rspec_api_documentation/configuration.rb +++ b/lib/rspec_api_documentation/configuration.rb @@ -1,6 +1,6 @@ module RspecApiDocumentation class Configuration - def self.a...
Fix issue where unset, undefaulting settings could raise error.
diff --git a/app/controllers/apps_controller.rb b/app/controllers/apps_controller.rb index abc1234..def5678 100644 --- a/app/controllers/apps_controller.rb +++ b/app/controllers/apps_controller.rb @@ -8,7 +8,7 @@ end def new - @app = App.new + @app = current_user.apps.new authorize! :new, @app end ...
Fix registration of apps by non-admin users
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 @@ -1,7 +1,7 @@ class HomeController < ApplicationController caches_action :index, :expires_in => 1.hour, - ...
Check if admin user is signed in for caching.
diff --git a/high_level_browse.gemspec b/high_level_browse.gemspec index abc1234..def5678 100644 --- a/high_level_browse.gemspec +++ b/high_level_browse.gemspec @@ -17,7 +17,6 @@ spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_dependency 'httpclient', "~>...
Update gemspec to no longer require httpclient; use stdlib instead
diff --git a/spec/integration/commands/config_spec.rb b/spec/integration/commands/config_spec.rb index abc1234..def5678 100644 --- a/spec/integration/commands/config_spec.rb +++ b/spec/integration/commands/config_spec.rb @@ -0,0 +1,10 @@+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') + +describ...
Add spec for new command config.
diff --git a/spec/ruby/1.8/core/method/shared/to_s.rb b/spec/ruby/1.8/core/method/shared/to_s.rb index abc1234..def5678 100644 --- a/spec/ruby/1.8/core/method/shared/to_s.rb +++ b/spec/ruby/1.8/core/method/shared/to_s.rb @@ -1,13 +1,7 @@ shared :method_to_s do |cmd| describe "Method##{cmd}" do it "returns a str...
Use a regexp to match the inspect output instead of deviating on rbx
diff --git a/app/services/sweep_data_service.rb b/app/services/sweep_data_service.rb index abc1234..def5678 100644 --- a/app/services/sweep_data_service.rb +++ b/app/services/sweep_data_service.rb @@ -0,0 +1,18 @@+class SweepDataService + def initialize + @response = Faraday.get('https://data.cityofchicago.org/reso...
Add SweepDataService to connect to Faraday and pull in the data
diff --git a/app/workers/avatar_purge_worker.rb b/app/workers/avatar_purge_worker.rb index abc1234..def5678 100644 --- a/app/workers/avatar_purge_worker.rb +++ b/app/workers/avatar_purge_worker.rb @@ -28,6 +28,10 @@ record.avatar_purged = true record.save + + return true + rescue Curl::Err::ConnectionFai...
Fix error message in Sidekiq.
diff --git a/spec/features/admin_creates_plot_spec.rb b/spec/features/admin_creates_plot_spec.rb index abc1234..def5678 100644 --- a/spec/features/admin_creates_plot_spec.rb +++ b/spec/features/admin_creates_plot_spec.rb @@ -12,8 +12,8 @@ scenario 'providing valid plot attributes' do visit new_plot_path ...
Update wording in test to match updates in form UI
diff --git a/spec/views/users/index.html.haml_spec.rb b/spec/views/users/index.html.haml_spec.rb index abc1234..def5678 100644 --- a/spec/views/users/index.html.haml_spec.rb +++ b/spec/views/users/index.html.haml_spec.rb @@ -0,0 +1,33 @@+require 'rails_helper' + +RSpec.describe "users/index", type: :view do + before(:...
Test case for user view
diff --git a/lib/omniauth/strategies/adstage.rb b/lib/omniauth/strategies/adstage.rb index abc1234..def5678 100644 --- a/lib/omniauth/strategies/adstage.rb +++ b/lib/omniauth/strategies/adstage.rb @@ -2,7 +2,7 @@ module OmniAuth module Strategies - class Doorkeeper < OmniAuth::Strategies::OAuth2 + class Adst...
Set admin attribute if we get it from the server.
diff --git a/lib/schnitzelpress/actions/blog.rb b/lib/schnitzelpress/actions/blog.rb index abc1234..def5678 100644 --- a/lib/schnitzelpress/actions/blog.rb +++ b/lib/schnitzelpress/actions/blog.rb @@ -30,7 +30,7 @@ @posts = Schnitzelpress::Model::Post.latest.limit(10).skip(skipped) displayed_coun...
Use posts scope to determine the correct total count of posts
diff --git a/lib/aerosol/connection.rb b/lib/aerosol/connection.rb index abc1234..def5678 100644 --- a/lib/aerosol/connection.rb +++ b/lib/aerosol/connection.rb @@ -6,14 +6,13 @@ include Dockly::Util::Logger::Mixin logger_prefix '[aerosol connection]' - dsl_attribute :user, :host, :jump, :use_private_ip - defa...
Use ip automatically if public hostname is nil.
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 @@ -12,6 +12,7 @@ organization_type_id { 1 } sequence(:name) { |n| "Org #{n}" } short_name { name } + legal_name { nam...
[TTPLAT-1117] Add legal name to organization factories.
diff --git a/spec/requests/customers_spec.rb b/spec/requests/customers_spec.rb index abc1234..def5678 100644 --- a/spec/requests/customers_spec.rb +++ b/spec/requests/customers_spec.rb @@ -16,4 +16,13 @@ expect(JSON.parse(response.body)['first_name']).to eq('J') end end + + describe 'GET /customers/:id/o...
Add spec for showing a customer's orders
diff --git a/spec/services/join_game_spec.rb b/spec/services/join_game_spec.rb index abc1234..def5678 100644 --- a/spec/services/join_game_spec.rb +++ b/spec/services/join_game_spec.rb @@ -0,0 +1,45 @@+require "rails_helper" + +RSpec.describe JoinGame, type: :service do + fixtures :users, :games + + let(:game) { G...
Create specs for join game
diff --git a/spec/support/custom_matchers.rb b/spec/support/custom_matchers.rb index abc1234..def5678 100644 --- a/spec/support/custom_matchers.rb +++ b/spec/support/custom_matchers.rb @@ -21,11 +21,11 @@ failure_message_for_should do |actual| actual = 'nil' unless actual - "expected that #{actual} (#{actua...
Fix error messages for be_at
diff --git a/db/migrate/20170309132554_add_default_config_to_application.rb b/db/migrate/20170309132554_add_default_config_to_application.rb index abc1234..def5678 100644 --- a/db/migrate/20170309132554_add_default_config_to_application.rb +++ b/db/migrate/20170309132554_add_default_config_to_application.rb @@ -1,6 +1,...
Set default config to hash instead of string
diff --git a/Casks/phpstorm-eap.rb b/Casks/phpstorm-eap.rb index abc1234..def5678 100644 --- a/Casks/phpstorm-eap.rb +++ b/Casks/phpstorm-eap.rb @@ -1,6 +1,6 @@ cask :v1 => 'phpstorm-eap' do - version '141.792' - sha256 'a4cbd4f72f2b7edad5a39381850a5ea33991b83331401a383f2807120dff8f4d' + version '141.891' + sha256 ...
Upgrade PhpStorm EAP to 141.891
diff --git a/lib/codeclimate_ci/cli.rb b/lib/codeclimate_ci/cli.rb index abc1234..def5678 100644 --- a/lib/codeclimate_ci/cli.rb +++ b/lib/codeclimate_ci/cli.rb @@ -13,22 +13,18 @@ def check CodeclimateCi.configuration.load_from_options(options) - bad_connection unless api_requester.connection_establi...
Refactor methods in CLI class
diff --git a/spec/sidekiq/limit_fetch/global/monitor_spec.rb b/spec/sidekiq/limit_fetch/global/monitor_spec.rb index abc1234..def5678 100644 --- a/spec/sidekiq/limit_fetch/global/monitor_spec.rb +++ b/spec/sidekiq/limit_fetch/global/monitor_spec.rb @@ -22,7 +22,7 @@ 2.times { queue.acquire } described_clas...
Fix sporadic failures caused by timing
diff --git a/lib/deploy/recipes/app.rb b/lib/deploy/recipes/app.rb index abc1234..def5678 100644 --- a/lib/deploy/recipes/app.rb +++ b/lib/deploy/recipes/app.rb @@ -0,0 +1,16 @@+Capistrano::Configuration.instance(:must_exist).load do + after "deploy:finalize_update", "app:permissions" + + namespace :app do + desc ...
Make tmp group writable after deploy.
diff --git a/spec/defines/rbenv__compile_spec.rb b/spec/defines/rbenv__compile_spec.rb index abc1234..def5678 100644 --- a/spec/defines/rbenv__compile_spec.rb +++ b/spec/defines/rbenv__compile_spec.rb @@ -25,4 +25,9 @@ it "installs ruby-build plugin from official repository" do should contain_rbenv__plugin__ruby...
Add bundler gem test to rbenv compile spec
diff --git a/test/integration/advanced_search_test.rb b/test/integration/advanced_search_test.rb index abc1234..def5678 100644 --- a/test/integration/advanced_search_test.rb +++ b/test/integration/advanced_search_test.rb @@ -10,6 +10,19 @@ visit advanced_search_path end + test "searches for a gem while scopin...
Add integration tests for advanced search
diff --git a/test/integration/default/default_spec.rb b/test/integration/default/default_spec.rb index abc1234..def5678 100644 --- a/test/integration/default/default_spec.rb +++ b/test/integration/default/default_spec.rb @@ -14,3 +14,6 @@ it { should be_listening } end +describe ssh_config do + its('UseRoaming') ...
Add test for UseRoaming no
diff --git a/test/integration/user_suspension_test.rb b/test/integration/user_suspension_test.rb index abc1234..def5678 100644 --- a/test/integration/user_suspension_test.rb +++ b/test/integration/user_suspension_test.rb @@ -10,7 +10,7 @@ visit new_user_session_path signin(@user) - assert_response_contain...
Update test for change to suspension message Update the test for the change made to the suspension message made in https://github.com/alphagov/signonotron2/commit/68514ef43b71f5e645c597d3b2f3202cf207c732
diff --git a/test/integration/progress_test.rb b/test/integration/progress_test.rb index abc1234..def5678 100644 --- a/test/integration/progress_test.rb +++ b/test/integration/progress_test.rb @@ -30,7 +30,7 @@ within "#request_fact_check_form" do fill_in "Comment", with: "Blah" fill_in "E...
Update integration test as button label had changed
diff --git a/lib/tasks/deployment/20190417100245_remove_old_email_data.rake b/lib/tasks/deployment/20190417100245_remove_old_email_data.rake index abc1234..def5678 100644 --- a/lib/tasks/deployment/20190417100245_remove_old_email_data.rake +++ b/lib/tasks/deployment/20190417100245_remove_old_email_data.rake @@ -3,8 +3,...
Switch order of deletions around
diff --git a/core/lib/spree/localized_number.rb b/core/lib/spree/localized_number.rb index abc1234..def5678 100644 --- a/core/lib/spree/localized_number.rb +++ b/core/lib/spree/localized_number.rb @@ -16,9 +16,10 @@ non_number_characters = /[^0-9\-#{separator}]/ # strip everything else first - numbe...
Stop mutating input in LocalizedNumber.parse Previously, LocalizedNumber.parse would perform it's gsub! replacements directly on the string passed in.
diff --git a/lib/knapsack/presenter.rb b/lib/knapsack/presenter.rb index abc1234..def5678 100644 --- a/lib/knapsack/presenter.rb +++ b/lib/knapsack/presenter.rb @@ -12,12 +12,12 @@ JSON.pretty_generate(Knapsack.tracker.spec_files_with_time) end + def report_details + "Knapsack report was ge...
Move report details above the gobal time method
diff --git a/lib/notify_user/engine.rb b/lib/notify_user/engine.rb index abc1234..def5678 100644 --- a/lib/notify_user/engine.rb +++ b/lib/notify_user/engine.rb @@ -9,5 +9,7 @@ g.assets false g.helper false end + + Rails.application.config.assets.precompile += %w{ notify_user/notify_user.css } e...
Add CSS to precompile, now it's not added to application.css by the installer
diff --git a/lib/tasks/panopticon.rake b/lib/tasks/panopticon.rake index abc1234..def5678 100644 --- a/lib/tasks/panopticon.rake +++ b/lib/tasks/panopticon.rake @@ -7,10 +7,7 @@ logger = GdsApi::Base.logger = Logger.new(STDERR).tap { |l| l.level = Logger::INFO } logger.info "Registering with panopticon..." -...
Revert "Add a 'kind' parameter when registering calendars." These artefacts should be registered as custom applications, and should be passed through as such to Rummager. The actual fix for the reported problem of these being displayed as custom applications on the public search page is to add a condition in Rummager ...
diff --git a/spec/entities/locomotive/page_entity_spec.rb b/spec/entities/locomotive/page_entity_spec.rb index abc1234..def5678 100644 --- a/spec/entities/locomotive/page_entity_spec.rb +++ b/spec/entities/locomotive/page_entity_spec.rb @@ -41,14 +41,13 @@ end context 'overrides' do - let(:site) { cre...
Use page with editable element
diff --git a/spec/features/search/question_search_spec.rb b/spec/features/search/question_search_spec.rb index abc1234..def5678 100644 --- a/spec/features/search/question_search_spec.rb +++ b/spec/features/search/question_search_spec.rb @@ -10,7 +10,7 @@ let!(:question2) { create(:question, name: "How many pies?") } ...
9775: Add basic question_search filter specs
diff --git a/lib/assignments_ics.rb b/lib/assignments_ics.rb index abc1234..def5678 100644 --- a/lib/assignments_ics.rb +++ b/lib/assignments_ics.rb @@ -20,6 +20,9 @@ end end + # It looks bad to Rubocop because every line is at least two method calls. + # But, it's really just a builder pattern. + # rubocop...
Disable Abc cop on event builder
diff --git a/lib/dc/search/field.rb b/lib/dc/search/field.rb index abc1234..def5678 100644 --- a/lib/dc/search/field.rb +++ b/lib/dc/search/field.rb @@ -16,7 +16,8 @@ end def entity? - DC::ENTITY_KINDS.include? @kind.downcase.to_sym + #DC::ENTITY_KINDS.include? @kind.downcase.to_sym + ...
Fix searches that used to employ entity matching
diff --git a/lib/eastwood/engine.rb b/lib/eastwood/engine.rb index abc1234..def5678 100644 --- a/lib/eastwood/engine.rb +++ b/lib/eastwood/engine.rb @@ -2,9 +2,12 @@ class Engine < Rails::Engine initializer 'eastwood.setup' do |app| + # include helpers in the sprockets context app.assets.context_cl...
Watch for changes in eastwood initializer
diff --git a/lib/sunspot/mongoid.rb b/lib/sunspot/mongoid.rb index abc1234..def5678 100644 --- a/lib/sunspot/mongoid.rb +++ b/lib/sunspot/mongoid.rb @@ -51,7 +51,7 @@ class DataAccessor < Sunspot::Adapters::DataAccessor def load(id) - @clazz.find(id) rescue nil + @clazz.find(BSON::ObjectID.fr...
Convert id to BSON before loading
diff --git a/lib/tasks/frankiz.rake b/lib/tasks/frankiz.rake index abc1234..def5678 100644 --- a/lib/tasks/frankiz.rake +++ b/lib/tasks/frankiz.rake @@ -1,7 +1,16 @@ namespace :frankiz do task :refresh_promo, [:promo] => :environment do |_, args| - fkz = FrankizLdap.new - fkz.crawl_promo(args[:promo]) + Fra...
Add rake task to refresh oldest promo
diff --git a/lib/tictactoe_rules.rb b/lib/tictactoe_rules.rb index abc1234..def5678 100644 --- a/lib/tictactoe_rules.rb +++ b/lib/tictactoe_rules.rb @@ -1,3 +1,5 @@+$: << File.dirname(__FILE__) + class TictactoeRules attr_reader :desc
Add file to load path
diff --git a/test/end_to_end/tasks_test.rb b/test/end_to_end/tasks_test.rb index abc1234..def5678 100644 --- a/test/end_to_end/tasks_test.rb +++ b/test/end_to_end/tasks_test.rb @@ -5,7 +5,6 @@ do_into_tmp_module('testmod', t) end - let(:fixture_module) { File.join(fixture_dir, 'testmod') } let(:task_list) ...
Fix shadowing bug in the test suite. A small piece has been left out from the last refactoring, so the `fixture_module` function was actually shadowed by a variable; this broken all the tests for the amended file.
diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb index abc1234..def5678 100644 --- a/config/initializers/sentry.rb +++ b/config/initializers/sentry.rb @@ -4,4 +4,6 @@ config.dsn = 'https://1150348b449a444bb3ac47ddd82b37c4:5fd368489fe44c0f83f1f2e5df10a7ef@sentry.io/251669' config.current_e...
Annotate Sentry reports with version and app
diff --git a/app/helpers/tracks_helper.rb b/app/helpers/tracks_helper.rb index abc1234..def5678 100644 --- a/app/helpers/tracks_helper.rb +++ b/app/helpers/tracks_helper.rb @@ -9,6 +9,7 @@ I18n.t("tracking.user_data.gender.#{user.gender}") else I18n.t("tracking.user_data.gender.unknown") + end e...
Add missing end on if else clause
diff --git a/app/models/authentication.rb b/app/models/authentication.rb index abc1234..def5678 100644 --- a/app/models/authentication.rb +++ b/app/models/authentication.rb @@ -10,14 +10,12 @@ def self.find_or_create_by_hash(auth_hash) where(auth_hash.slice(:provider, :uid)).first_or_initialize.tap do |auth|...
Update user info from social network on login
diff --git a/app/models/message_parser.rb b/app/models/message_parser.rb index abc1234..def5678 100644 --- a/app/models/message_parser.rb +++ b/app/models/message_parser.rb @@ -7,7 +7,7 @@ def recipient_name beginning = trigger_word.size remaining = text[beginning..text.size-1] - remaining.strip.split.fi...
Fix on case when null was returned
diff --git a/app/models/person_edition.rb b/app/models/person_edition.rb index abc1234..def5678 100644 --- a/app/models/person_edition.rb +++ b/app/models/person_edition.rb @@ -7,13 +7,12 @@ # type (Staff / Trainer / Member / Start-up / Artist): applied by tag field :honorific_prefix, type: String field ...
Remove contact name/title, and add affiliation string to Person
diff --git a/app/models/responsibility.rb b/app/models/responsibility.rb index abc1234..def5678 100644 --- a/app/models/responsibility.rb +++ b/app/models/responsibility.rb @@ -3,6 +3,7 @@ belongs_to :organization, :polymorphic => true validates_presence_of :organization_id, :message => I18n.translate('problems.ne...
Add paper trail to responsibilities.
diff --git a/app/models/rglossa/corpus.rb b/app/models/rglossa/corpus.rb index abc1234..def5678 100644 --- a/app/models/rglossa/corpus.rb +++ b/app/models/rglossa/corpus.rb @@ -21,7 +21,11 @@ end def langs - languages.map { |l| {lang: l[:lang], tags: Rglossa.taggers[l[:tagger].to_s]['tags']} } + if...
Allow corpora without a language specification Language specs is only needed for tagged and/or multilingual corpora.
diff --git a/app/models/tracked_branch.rb b/app/models/tracked_branch.rb index abc1234..def5678 100644 --- a/app/models/tracked_branch.rb +++ b/app/models/tracked_branch.rb @@ -2,15 +2,9 @@ belongs_to :project has_many :test_jobs, dependent: :destroy + delegate :status_text, :status, to: :last_run, allow_nil: t...
Replace method definition with delegations
diff --git a/mnemosyne-ruby.gemspec b/mnemosyne-ruby.gemspec index abc1234..def5678 100644 --- a/mnemosyne-ruby.gemspec +++ b/mnemosyne-ruby.gemspec @@ -26,4 +26,5 @@ spec.add_development_dependency 'rake', '~> 10.0' spec.add_development_dependency 'rspec', '~> 3.0' spec.add_development_dependency 'timecop', '~...
Add rubocop as dev dependency
diff --git a/test/integration/web-frontend/serverspec/memcached_spec.rb b/test/integration/web-frontend/serverspec/memcached_spec.rb index abc1234..def5678 100644 --- a/test/integration/web-frontend/serverspec/memcached_spec.rb +++ b/test/integration/web-frontend/serverspec/memcached_spec.rb @@ -0,0 +1,17 @@+require "s...
Check that memcached is running on the frontends
diff --git a/test/cookbooks/runit_test/recipes/default.rb b/test/cookbooks/runit_test/recipes/default.rb index abc1234..def5678 100644 --- a/test/cookbooks/runit_test/recipes/default.rb +++ b/test/cookbooks/runit_test/recipes/default.rb @@ -17,6 +17,6 @@ # limitations under the License. # -apt_update 'update' if pla...
Remove guard around apt_update in test There's no need to do this in modern Chef releases Signed-off-by: Tim Smith <764ef62106582a09ed09dfa0b6bff7c05fd7d1e4@chef.io>
diff --git a/lib/date_picker/styles/flatpickr.rb b/lib/date_picker/styles/flatpickr.rb index abc1234..def5678 100644 --- a/lib/date_picker/styles/flatpickr.rb +++ b/lib/date_picker/styles/flatpickr.rb @@ -4,22 +4,27 @@ def types [:date, :datetime, :time] end - def mapping() + def mapping...
Fix data_format submit, handle min and max date
diff --git a/lib/omniauth/strategies/inspire9.rb b/lib/omniauth/strategies/inspire9.rb index abc1234..def5678 100644 --- a/lib/omniauth/strategies/inspire9.rb +++ b/lib/omniauth/strategies/inspire9.rb @@ -13,11 +13,11 @@ uid { raw_info['id'] } info do - {email: raw_info['email']} + raw_info...
Return info/extra hashes directly, no need to recompose them.
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index abc1234..def5678 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -13,3 +13,7 @@ # ActiveSupport::Inflector.inflections do |inflect| # inflect.acronym 'RESTful' # end + +ActiveSuppor...
Add pluralization irregularity for taxon -> taxa
diff --git a/lib/rails_admin/config/labelable.rb b/lib/rails_admin/config/labelable.rb index abc1234..def5678 100644 --- a/lib/rails_admin/config/labelable.rb +++ b/lib/rails_admin/config/labelable.rb @@ -5,8 +5,15 @@ # Try to find a user-friendly label for an object, falling back # to its class and ID. ...
Include a method to query object_label method names in Labelable
diff --git a/lib/super_settings/rule_registry.rb b/lib/super_settings/rule_registry.rb index abc1234..def5678 100644 --- a/lib/super_settings/rule_registry.rb +++ b/lib/super_settings/rule_registry.rb @@ -1,5 +1,9 @@ module SuperSettings # RuleRegistry contains allows super_settings users to register themselves + #...
Add todo tag for creating contexts in the rule registry
diff --git a/test/unit/formatters/test_custom.rb b/test/unit/formatters/test_custom.rb index abc1234..def5678 100644 --- a/test/unit/formatters/test_custom.rb +++ b/test/unit/formatters/test_custom.rb @@ -0,0 +1,65 @@+require 'helper' + +module SSHKit + # Try to maintain backwards compatibility with Custom formatters ...
Add test for custom formatters Try to expose when changes may break a ‘typical’ custom formatter which has been implemented based on the Pretty formatter
diff --git a/app/models/plag.rb b/app/models/plag.rb index abc1234..def5678 100644 --- a/app/models/plag.rb +++ b/app/models/plag.rb @@ -1,10 +1,11 @@-class Plag +class Plag < ApplicationRecord include Anemon @anemon = Anemon::Scrapper.new def self.scrap(url) - @anemon.scrap(url) + result = @anemon.s...
Save the scrapped url and its contents to the db
diff --git a/actionmailbox/app/controllers/action_mailbox/base_controller.rb b/actionmailbox/app/controllers/action_mailbox/base_controller.rb index abc1234..def5678 100644 --- a/actionmailbox/app/controllers/action_mailbox/base_controller.rb +++ b/actionmailbox/app/controllers/action_mailbox/base_controller.rb @@ -3,7...
Fix loading `ActionMailbox::BaseController` when CSRF protection is disabled When `default_protect_from_forgery` is false, `verify_authenticity_token` callback does not define and `skip_forgery_protection` raise exception. Fixes #34837.
diff --git a/hephaestus/lib/resque/base.rb b/hephaestus/lib/resque/base.rb index abc1234..def5678 100644 --- a/hephaestus/lib/resque/base.rb +++ b/hephaestus/lib/resque/base.rb @@ -7,6 +7,7 @@ def self.after_perform(*args) logging('end', args) store_status('end', args.first) + update_history(args.first) ...
[aphrodite] Update status history and percentage
diff --git a/object_tracker.gemspec b/object_tracker.gemspec index abc1234..def5678 100644 --- a/object_tracker.gemspec +++ b/object_tracker.gemspec @@ -13,7 +13,7 @@ spec.homepage = 'https://github.com/ridiculous/object_tracker' spec.license = "MIT" - spec.files = `git ls-files -z`.split("\x...
Reduce files bundled in gem
diff --git a/cookbooks/homebrew/recipes/cask.rb b/cookbooks/homebrew/recipes/cask.rb index abc1234..def5678 100644 --- a/cookbooks/homebrew/recipes/cask.rb +++ b/cookbooks/homebrew/recipes/cask.rb @@ -1,4 +1,5 @@ cask '1password' +cask 'alacritty' cask 'alfred' cask 'appcleaner' cask 'bartender'
Install alacritty with Homebrew Cask
diff --git a/db/migrate/20141120123833_increase_tag_set_name_column_width.rb b/db/migrate/20141120123833_increase_tag_set_name_column_width.rb index abc1234..def5678 100644 --- a/db/migrate/20141120123833_increase_tag_set_name_column_width.rb +++ b/db/migrate/20141120123833_increase_tag_set_name_column_width.rb @@ -1,6...
Fix missing method around migration No idea how this one happened.
diff --git a/db/migrate/20160711003010_add_entity_source_id_to_entity_ids.rb b/db/migrate/20160711003010_add_entity_source_id_to_entity_ids.rb index abc1234..def5678 100644 --- a/db/migrate/20160711003010_add_entity_source_id_to_entity_ids.rb +++ b/db/migrate/20160711003010_add_entity_source_id_to_entity_ids.rb @@ -5,7...
Switch to Ruby 2.2 compatible non-squiggly heredoc
diff --git a/animate-rails.gemspec b/animate-rails.gemspec index abc1234..def5678 100644 --- a/animate-rails.gemspec +++ b/animate-rails.gemspec @@ -14,6 +14,6 @@ s.description = 'animate.css for rails' s.license = 'MIT' - s.files = Dir['{lib,vendor}/**/*'] + ['MIT-LICENSE', 'Rakefile', 'README.md'] + s.fi...
Fix included in gem files in gemspec
diff --git a/app/concerns/couriers/fusionable.rb b/app/concerns/couriers/fusionable.rb index abc1234..def5678 100644 --- a/app/concerns/couriers/fusionable.rb +++ b/app/concerns/couriers/fusionable.rb @@ -36,7 +36,7 @@ notify "Adding to Fusion Tables", photo.key table.select("ROWID", "WHERE nam...
Extend delay in between fusion table queries
diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index abc1234..def5678 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -1,10 +1,13 @@ require_relative '../services/create_game' +require_relative '../services/create_game_state' + class...
Create a GameState when showing a game
diff --git a/app/controllers/sales_controller.rb b/app/controllers/sales_controller.rb index abc1234..def5678 100644 --- a/app/controllers/sales_controller.rb +++ b/app/controllers/sales_controller.rb @@ -9,7 +9,16 @@ end def create - sale = Sale.create(sale_params.except(:products_ids)) + sale = Sale.new(...
Revert "remove logic which should not be in the controller" This reverts commit f7014e403f99a2308d68ea60772176d6093ea2aa.
diff --git a/lib/tasks/deployment/20180913161001_add_path_to_procedures.rake b/lib/tasks/deployment/20180913161001_add_path_to_procedures.rake index abc1234..def5678 100644 --- a/lib/tasks/deployment/20180913161001_add_path_to_procedures.rake +++ b/lib/tasks/deployment/20180913161001_add_path_to_procedures.rake @@ -0,0...
Add task to fill procedures table path column
diff --git a/app/models/course/video_settings.rb b/app/models/course/video_settings.rb index abc1234..def5678 100644 --- a/app/models/course/video_settings.rb +++ b/app/models/course/video_settings.rb @@ -0,0 +1,40 @@+# frozen_string_literal: true +class Course::VideoSettings + include ActiveModel::Model + include Ac...
Add settings for video model
diff --git a/app/services/generate_new_puzzle.rb b/app/services/generate_new_puzzle.rb index abc1234..def5678 100644 --- a/app/services/generate_new_puzzle.rb +++ b/app/services/generate_new_puzzle.rb @@ -7,57 +7,40 @@ grid = Grid.new(size: @game.board_size) grid_array = grid.randomly_populate! - create_c...
Refactor generate new puzzle ruthlessly
diff --git a/app/services/order_cycle_warning.rb b/app/services/order_cycle_warning.rb index abc1234..def5678 100644 --- a/app/services/order_cycle_warning.rb +++ b/app/services/order_cycle_warning.rb @@ -1,3 +1,5 @@+# frozen_string_literal: true + class OrderCycleWarning def initialize(current_user) @current_...
Add frozen_string_literal comment to new class
diff --git a/app/controllers/api/poi_log_controller.rb b/app/controllers/api/poi_log_controller.rb index abc1234..def5678 100644 --- a/app/controllers/api/poi_log_controller.rb +++ b/app/controllers/api/poi_log_controller.rb @@ -2,6 +2,13 @@ defaults :resource_class => ::PoiLog, :collection_name => 'poi_logs' ac...
Add API docs for PoiLogController
diff --git a/app/controllers/json/status_controller.rb b/app/controllers/json/status_controller.rb index abc1234..def5678 100644 --- a/app/controllers/json/status_controller.rb +++ b/app/controllers/json/status_controller.rb @@ -15,8 +15,8 @@ icecast_status_keys.each do |icecast_status_key| icecast_status = ...
Fix array wrap issue of status controller
diff --git a/app/controllers/suggestions_controller.rb b/app/controllers/suggestions_controller.rb index abc1234..def5678 100644 --- a/app/controllers/suggestions_controller.rb +++ b/app/controllers/suggestions_controller.rb @@ -1,6 +1,7 @@ class SuggestionsController < ApplicationController def new @suggestion...
Set up new method to get all sigs.
diff --git a/core/app/models/spree/base.rb b/core/app/models/spree/base.rb index abc1234..def5678 100644 --- a/core/app/models/spree/base.rb +++ b/core/app/models/spree/base.rb @@ -23,6 +23,10 @@ if Kaminari.config.page_method_name != :page def self.page(num) + Spree::Deprecation.warn \ + "Redefini...
Remove hacked support for kaminari page name Historically this looks like it is to support kaminari and will_paginate side-by-side, which doesn't seem like a reasonable thing for us to care about inside of core. Anyone that wanted this functionality can use it inside their own app. Also it wasn't tested.
diff --git a/rocket_job_mission_control.gemspec b/rocket_job_mission_control.gemspec index abc1234..def5678 100644 --- a/rocket_job_mission_control.gemspec +++ b/rocket_job_mission_control.gemspec @@ -17,7 +17,7 @@ s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.markdown"] s.test_files...
Allow Rails versions greater than 4.1
diff --git a/app/models/storage_method_update_event.rb b/app/models/storage_method_update_event.rb index abc1234..def5678 100644 --- a/app/models/storage_method_update_event.rb +++ b/app/models/storage_method_update_event.rb @@ -10,7 +10,7 @@ belongs_to :vehicle_storage_method_type # Validations - valida...
Fix issue with storage method update event initialization
diff --git a/attributes/default.rb b/attributes/default.rb index abc1234..def5678 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -8,12 +8,12 @@ # All rights reserved - Do Not Redistribute # -default[:owner] = 'jkiehl' # will be node attributes -default[:group] = 'staff' +def...
Move attributes to node and env attributes
diff --git a/app/serializers/event_group_serializer.rb b/app/serializers/event_group_serializer.rb index abc1234..def5678 100644 --- a/app/serializers/event_group_serializer.rb +++ b/app/serializers/event_group_serializer.rb @@ -2,17 +2,11 @@ class EventGroupSerializer < BaseSerializer attributes :id, :name, :orga...
Remove combinedSplitAttributes key from EventGroupSerializer.
diff --git a/app/workers/asyncapi/server/job_worker.rb b/app/workers/asyncapi/server/job_worker.rb index abc1234..def5678 100644 --- a/app/workers/asyncapi/server/job_worker.rb +++ b/app/workers/asyncapi/server/job_worker.rb @@ -25,7 +25,7 @@ # the ActiveRecord-Sidekiq race condition. In order to # pre...
Change '<' to '<=' to be accurate about the 'MAX_RETRIES' variable name [#127624879]
diff --git a/app/controllers/api/v1/teachers_controller.rb b/app/controllers/api/v1/teachers_controller.rb index abc1234..def5678 100644 --- a/app/controllers/api/v1/teachers_controller.rb +++ b/app/controllers/api/v1/teachers_controller.rb @@ -2,14 +2,18 @@ respond_to :json def index - respond_with Teacher.a...
Fix teacher api error respose
diff --git a/app/controllers/deploy_it_ident_controller.rb b/app/controllers/deploy_it_ident_controller.rb index abc1234..def5678 100644 --- a/app/controllers/deploy_it_ident_controller.rb +++ b/app/controllers/deploy_it_ident_controller.rb @@ -22,7 +22,7 @@ def index - render text: compute_authorized_keys + ...
Fix test rendering in controllers
diff --git a/app/controllers/settings/export_controller.rb b/app/controllers/settings/export_controller.rb index abc1234..def5678 100644 --- a/app/controllers/settings/export_controller.rb +++ b/app/controllers/settings/export_controller.rb @@ -4,9 +4,7 @@ before_action :authenticate_user! def index - if curr...
Improve export processing condition on index view
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 @@ -1,3 +1,4 @@ class ApplicationController < ActionController::Base # protect_from_forgery ...
Include helper module in the controller