diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/lib/commands/settings.rb b/lib/commands/settings.rb index abc1234..def5678 100644 --- a/lib/commands/settings.rb +++ b/lib/commands/settings.rb @@ -0,0 +1,28 @@+# encoding: utf-8 + +# Commands that deal with the settings file + +class PoddingCLI < Thor + desc "use NAME", "use project NAME to execute comma...
Add commands to deal with different podding installations
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 @@ -0,0 +1,60 @@+$:.unshift File.expand_path('..', __FILE__) +$:.unshift File.expand_path('../../lib', __FILE__) +require 'coveralls' +Coveralls.wear_merged! +require 'rspec' +require...
Add RSpec helper with initial configuration for filtering VCR sensitive data, expectation syntax, load paths, etc.
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,6 +1,7 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__) ENV["RELIABLE_TIMEOUT"] = "1" ENV["RELIABLE_TIME_TRAVEL_DELAY"] = "1" +ENV["REDIS_URI"] = "redis://127.0.0...
Use localhost redis for specs
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,12 +5,14 @@ # # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration -require 'simplecov' -require 'simplecov-rcov' -SimpleCov.formatter = SimpleCov::Formatter::R...
Load simplecov only if environment variable is present
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,8 @@ is :list, :scope => :user_id end +DataMapper.finalize + module TodoListHelper ## # Keep things DRY shortcut
Call DataMapper.finalize after model definition
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 @@ -10,6 +10,8 @@ require "lita/rspec" RSpec.configure do |config| + config.include Lita::RSpec + config.before do allow(Lita).to receive(:logger).and_return(double("Logge...
Include Lita::RSpec to for the Redis test isolation.
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 @@ -14,7 +14,7 @@ RSpec.configure do |config| config.use_transactional_fixtures = true - config.after(:each) do - sign_out! + config.before(:each) do + sign_out! # stub...
Call sign_out! *before* each spec, so that current_user is always set no matter what
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,3 +2,14 @@ $:.unshift File.dirname(__FILE__) require "rails_app/config/environment" +require 'rspec/rails' +require 'rspec/autorun' + +require "capybara/rspec" +require "capy...
Add a proper spec helper for using Capybara+Rails
diff --git a/plugins/other/graceful-shutdown-check.rb b/plugins/other/graceful-shutdown-check.rb index abc1234..def5678 100644 --- a/plugins/other/graceful-shutdown-check.rb +++ b/plugins/other/graceful-shutdown-check.rb @@ -0,0 +1,82 @@+#! /usr/bin/env ruby +# +# Graceful Shutdown Monitor +# === +# +# DESCRIPTION: +# ...
Add graceful shutdown check that assists in client cleanup
diff --git a/app/models/clock.rb b/app/models/clock.rb index abc1234..def5678 100644 --- a/app/models/clock.rb +++ b/app/models/clock.rb @@ -24,4 +24,17 @@ from_user.hand = 1 from_user.save! end + + module SortedStatuses + # Returns the same data as before, but sorts the list of statuses by their LCD + ...
Sort the list of statuses by LCD Goal is to fix the weird order the statuses are showing up in production. This is probably because the order of the list returned by PostgreSQL is different than SQLite.
diff --git a/features/step_definitions/lockfile_steps.rb b/features/step_definitions/lockfile_steps.rb index abc1234..def5678 100644 --- a/features/step_definitions/lockfile_steps.rb +++ b/features/step_definitions/lockfile_steps.rb @@ -22,6 +22,15 @@ } end +When 'I edit the lockfile as:' do |content| + steps %Q{...
Add a step to edit a lockfile
diff --git a/business.gemspec b/business.gemspec index abc1234..def5678 100644 --- a/business.gemspec +++ b/business.gemspec @@ -23,5 +23,5 @@ spec.add_development_dependency "gc_ruboconfig", "~> 2.24.0" spec.add_development_dependency "rspec", "~> 3.1" spec.add_development_dependency "rspec_junit_formatter", "...
Update rubocop requirement from ~> 1.10.0 to ~> 1.13.0 Updates the requirements on [rubocop](https://github.com/rubocop/rubocop) to permit the latest version. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://gi...
diff --git a/vendor/buildr/buildr-osgi-runtime/lib/buildr/osgi/container.rb b/vendor/buildr/buildr-osgi-runtime/lib/buildr/osgi/container.rb index abc1234..def5678 100644 --- a/vendor/buildr/buildr-osgi-runtime/lib/buildr/osgi/container.rb +++ b/vendor/buildr/buildr-osgi-runtime/lib/buildr/osgi/container.rb @@ -5,7 +5,...
Use an ordered has for parameters
diff --git a/test/countries/us_test.rb b/test/countries/us_test.rb index abc1234..def5678 100644 --- a/test/countries/us_test.rb +++ b/test/countries/us_test.rb @@ -0,0 +1,14 @@+require File.expand_path(File.dirname(__FILE__) + '/../test_helper') + +## United States +class USTest < Test::Unit::TestCase + + def test_...
Add US tests for completeness
diff --git a/business.gemspec b/business.gemspec index abc1234..def5678 100644 --- a/business.gemspec +++ b/business.gemspec @@ -20,7 +20,7 @@ spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_development_dependency "gc_ruboconfig", "~> 3.1.0" + spec.add_d...
Update gc_ruboconfig requirement from ~> 3.1.0 to ~> 3.2.0 Updates the requirements on [gc_ruboconfig](https://github.com/gocardless/ruboconfig) to permit the latest version. - [Release notes](https://github.com/gocardless/ruboconfig/releases) - [Changelog](https://github.com/gocardless/gc_ruboconfig/blob/master/CHANG...
diff --git a/generators/configured_components.rb b/generators/configured_components.rb index abc1234..def5678 100644 --- a/generators/configured_components.rb +++ b/generators/configured_components.rb @@ -27,12 +27,14 @@ } def component_types - %w[test mock script renderer orm] + @component...
Remove the need to define component_types twice (autocreate list)
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index abc1234..def5678 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -31,6 +31,7 @@ #Don't redirect on JS send Created with info instead! respond_to do |format| format.h...
Set location and status on json response
diff --git a/app/serializers/event_serializer.rb b/app/serializers/event_serializer.rb index abc1234..def5678 100644 --- a/app/serializers/event_serializer.rb +++ b/app/serializers/event_serializer.rb @@ -1,5 +1,5 @@ class EventSerializer < ActiveModel::Serializer - attributes :id, :title, :event_type, :start_time, :e...
Remove event_type attribute causing AMS to fail
diff --git a/app/serializers/place_serializer.rb b/app/serializers/place_serializer.rb index abc1234..def5678 100644 --- a/app/serializers/place_serializer.rb +++ b/app/serializers/place_serializer.rb @@ -1,9 +1,16 @@ class PlaceSerializer < ActiveModel::Serializer - attributes :id, :name, :created_at + include Rails...
Add a `links` object to place representation
diff --git a/lib/active_admin/inputs/filters/select_input.rb b/lib/active_admin/inputs/filters/select_input.rb index abc1234..def5678 100644 --- a/lib/active_admin/inputs/filters/select_input.rb +++ b/lib/active_admin/inputs/filters/select_input.rb @@ -7,7 +7,7 @@ def input_name return method if seem...
Fix select input name concatenation Do not modify the source string when appending '_in' or '_eq' to searchable_method_name otherwise it gets appended at each call. Example: `payment_type_code_eq_eq_eq_eq_eq_eq_eq_eq_eq_eq` Fixes #4121.
diff --git a/lib/remockable/active_model/allow_values_for.rb b/lib/remockable/active_model/allow_values_for.rb index abc1234..def5678 100644 --- a/lib/remockable/active_model/allow_values_for.rb +++ b/lib/remockable/active_model/allow_values_for.rb @@ -3,22 +3,18 @@ @values = attributes_and_values match_for_shou...
Use the subject instead of making a new instance. This allows the subject to be configured ahead of time for validations that rely on other attribute values within the instance.
diff --git a/app/controllers/payments_controller.rb b/app/controllers/payments_controller.rb index abc1234..def5678 100644 --- a/app/controllers/payments_controller.rb +++ b/app/controllers/payments_controller.rb @@ -8,6 +8,7 @@ intent = Stripe::PaymentIntent.create({ amount: (@amount * 100).to_i, cur...
Add receipt_email so users can get automatic receipts for payments from Stripe
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index abc1234..def5678 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -4,7 +4,14 @@ auth = request.env['omniauth.auth'] user = User.create_auth(auth) session[:u...
:boom: Switch redirect path between twitter and github when login
diff --git a/app/controllers/tracking_controller.rb b/app/controllers/tracking_controller.rb index abc1234..def5678 100644 --- a/app/controllers/tracking_controller.rb +++ b/app/controllers/tracking_controller.rb @@ -6,6 +6,7 @@ def track coordinate = @track.coordinates.build params + coordinate.time = Time...
Introduce param for time in milliseconds
diff --git a/haxby.rb b/haxby.rb index abc1234..def5678 100644 --- a/haxby.rb +++ b/haxby.rb @@ -4,10 +4,10 @@ homepage 'https://github.com/tabletcorry/haxby' head "git://github.com/tabletcorry/haxby.git" - depends_on 'coreutils' + depends_on 'coreutils' # Specifically greadlink def install - ...
Clean up formula a bit, add comments
diff --git a/app/models/edition/related_policies.rb b/app/models/edition/related_policies.rb index abc1234..def5678 100644 --- a/app/models/edition/related_policies.rb +++ b/app/models/edition/related_policies.rb @@ -5,10 +5,7 @@ included do has_many :related_policies, through: :related_documents, source: :lat...
Fix bug with published related policies. Mapping to #latest_edition then filtering by published will get you false negatives if the policy has a newer unpublished edition.
diff --git a/spec/customer_builder_spec.rb b/spec/customer_builder_spec.rb index abc1234..def5678 100644 --- a/spec/customer_builder_spec.rb +++ b/spec/customer_builder_spec.rb @@ -0,0 +1,66 @@+require 'spec_helper' + +describe Vend::CustomerBuilder do + let(:customer_with_id) { { + 'id' => 'a123771197', +...
Add specs to customer builder
diff --git a/spec/features/profile_spec.rb b/spec/features/profile_spec.rb index abc1234..def5678 100644 --- a/spec/features/profile_spec.rb +++ b/spec/features/profile_spec.rb @@ -0,0 +1,26 @@+require File.expand_path('../../spec_helper', __FILE__) + +feature 'profile settings' do + given(:expected_flash) { + I18n...
Add feature test for profile edit
diff --git a/Casks/dbeaver-community.rb b/Casks/dbeaver-community.rb index abc1234..def5678 100644 --- a/Casks/dbeaver-community.rb +++ b/Casks/dbeaver-community.rb @@ -1,11 +1,11 @@ cask :v1 => 'dbeaver-community' do - version '3.1.4' + version '3.1.5' if Hardware::CPU.is_32_bit? - sha256 '017ef0d2aa6236685c...
Update DBeaver community to v3.1.5
diff --git a/spec/requests/archive_spec.rb b/spec/requests/archive_spec.rb index abc1234..def5678 100644 --- a/spec/requests/archive_spec.rb +++ b/spec/requests/archive_spec.rb @@ -6,7 +6,7 @@ it "lists archived posts" do visit "/monologue" - within(".sidebar") do + within(".archive") do page.shou...
Check archive more specifically in request spec
diff --git a/Casks/plex-media-player.rb b/Casks/plex-media-player.rb index abc1234..def5678 100644 --- a/Casks/plex-media-player.rb +++ b/Casks/plex-media-player.rb @@ -1,6 +1,6 @@ cask 'plex-media-player' do - version '2.19.0.902-42a9f589' - sha256 'b3f9e114586c84a665a5e2a87dab5495b4a6af5a4c7fd6230d66115f0b641268' +...
Update Plex Media Player to 2.19.1.904-f679df4f
diff --git a/business.gemspec b/business.gemspec index abc1234..def5678 100644 --- a/business.gemspec +++ b/business.gemspec @@ -23,5 +23,5 @@ spec.add_development_dependency "gc_ruboconfig", "~> 2.25.0" spec.add_development_dependency "rspec", "~> 3.1" spec.add_development_dependency "rspec_junit_formatter", "...
Update rubocop requirement from ~> 1.13.0 to ~> 1.14.0 Updates the requirements on [rubocop](https://github.com/rubocop/rubocop) to permit the latest version. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://gi...
diff --git a/tools/export_functions.rb b/tools/export_functions.rb index abc1234..def5678 100644 --- a/tools/export_functions.rb +++ b/tools/export_functions.rb @@ -29,10 +29,9 @@ begin options = parseOptions - p options - #code = IO.read('testfile') - #p code + code = IO.read(options[:filename]) + p code rescue...
Add file reading in export functions script.
diff --git a/scripts/s3/traverse_assets.rb b/scripts/s3/traverse_assets.rb index abc1234..def5678 100644 --- a/scripts/s3/traverse_assets.rb +++ b/scripts/s3/traverse_assets.rb @@ -0,0 +1,67 @@+require "rubygems" +require "aws-sdk" +require "RMagick" + +def s3 + @s3 = @s3 || AWS::S3.new( + :access_key_id => ENV["S...
Add script which will easily traverse s3 tree.
diff --git a/lib/kitcat/terminal_width_calculator.rb b/lib/kitcat/terminal_width_calculator.rb index abc1234..def5678 100644 --- a/lib/kitcat/terminal_width_calculator.rb +++ b/lib/kitcat/terminal_width_calculator.rb @@ -1,35 +1,37 @@ module TerminalWidthCalculator - def self.calculate - default_width = 80 + class...
Fix private methods on terminal width calculator
diff --git a/lib/rubygems/commands/yardoc_command.rb b/lib/rubygems/commands/yardoc_command.rb index abc1234..def5678 100644 --- a/lib/rubygems/commands/yardoc_command.rb +++ b/lib/rubygems/commands/yardoc_command.rb @@ -10,7 +10,7 @@ end def arguments # :nodoc: - 'GEMNAME [GEMNAME ...] gem to generate YARD...
Align argument description following gem rdoc
diff --git a/app.rb b/app.rb index abc1234..def5678 100644 --- a/app.rb +++ b/app.rb @@ -9,7 +9,11 @@ view(:index) end - r.get('/about') do + r.on('/home') do + r.redirect('/') + end + + r.on('/about') do view(:about) end end
Adjust routing logic for about and home
diff --git a/spec/views/projects/new.html.erb_spec.rb b/spec/views/projects/new.html.erb_spec.rb index abc1234..def5678 100644 --- a/spec/views/projects/new.html.erb_spec.rb +++ b/spec/views/projects/new.html.erb_spec.rb @@ -17,4 +17,13 @@ click_on I18n.t('projects.form.create_project') expect(page).to have_co...
Add view test for init invitation
diff --git a/lib/taem_c_kadai.rb b/lib/taem_c_kadai.rb index abc1234..def5678 100644 --- a/lib/taem_c_kadai.rb +++ b/lib/taem_c_kadai.rb @@ -1,23 +1,27 @@+# -*- coding: utf-8 -*- require "pebbles-soreyuke" -#require "taem_c_kadai" +require "taem_c_kadai/version" require "taem_c_kadai/fumin" require "taem_c_kadai/nee...
Fix to work rake test
diff --git a/app/views/forms/_form.json.jbuilder b/app/views/forms/_form.json.jbuilder index abc1234..def5678 100644 --- a/app/views/forms/_form.json.jbuilder +++ b/app/views/forms/_form.json.jbuilder @@ -1,5 +1,11 @@-json.extract! form, :id, :name, :description, :created_at, :updated_at, :questions, \ +json.extract! f...
Fix N+1 queries on individual form request
diff --git a/config/deploy.rb b/config/deploy.rb index abc1234..def5678 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,6 +1,8 @@ lock '3.1.0' set :application, 'whatsmydistrict' set :repo_url, 'https://github.com/openlexington/WhatsMyDistrict.git' +set :branch, :master +set :deploy_to, '/opt/whatsmydistri...
Set branch and application folder
diff --git a/activestorage/lib/active_storage/previewer/mupdf_previewer.rb b/activestorage/lib/active_storage/previewer/mupdf_previewer.rb index abc1234..def5678 100644 --- a/activestorage/lib/active_storage/previewer/mupdf_previewer.rb +++ b/activestorage/lib/active_storage/previewer/mupdf_previewer.rb @@ -12,7 +12,7 ...
Remove warning of undefined instance variable
diff --git a/config/routes.rb b/config/routes.rb index abc1234..def5678 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do + get '/items', to: 'items#index' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end
Add new route to access all items
diff --git a/config/routes.rb b/config/routes.rb index abc1234..def5678 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,6 +10,12 @@ end resources :clubs, :only => [ :edit, :update ] do + member do + # handle image updates + match '/change_logo' => 'clubs#change_logo', :as => :change_logo...
Update Routes for Club change_logo/upload_logo Update the routes file to include change_logo and upload_logo routes for the Club model.
diff --git a/config/routes.rb b/config/routes.rb index abc1234..def5678 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -11,9 +11,9 @@ put "/content/:content_id", to: "content_items#put_content" get "/content/:content_id", to: "content_items#show" end + + post '/v2/content/:content_id/publi...
Use a scope declaration to disallow the format variant
diff --git a/config/initializers/spree.rb b/config/initializers/spree.rb index abc1234..def5678 100644 --- a/config/initializers/spree.rb +++ b/config/initializers/spree.rb @@ -13,6 +13,9 @@ # Example: # Uncomment to stop tracking inventory levels in the application # config.track_inventory_levels = false + co...
Fix Spree initializer for backward compability
diff --git a/lib/facter/oracle_webgate_exists.rb b/lib/facter/oracle_webgate_exists.rb index abc1234..def5678 100644 --- a/lib/facter/oracle_webgate_exists.rb +++ b/lib/facter/oracle_webgate_exists.rb @@ -13,7 +13,7 @@ if !Dir.glob('/opt/netpoint/webgate/access/oblix/config/np*.txt').empty? np = Dir['/opt/ne...
Fix regexp in facter to work with non numeric versioning
diff --git a/app/controllers/spree/api/v1/products_controller_decorator.rb b/app/controllers/spree/api/v1/products_controller_decorator.rb index abc1234..def5678 100644 --- a/app/controllers/spree/api/v1/products_controller_decorator.rb +++ b/app/controllers/spree/api/v1/products_controller_decorator.rb @@ -3,25 +3,25 ...
Fix indentation in product controller override
diff --git a/lib/arjdbc/relativity/connection_methods.rb b/lib/arjdbc/relativity/connection_methods.rb index abc1234..def5678 100644 --- a/lib/arjdbc/relativity/connection_methods.rb +++ b/lib/arjdbc/relativity/connection_methods.rb @@ -5,14 +5,13 @@ config[:url] ||= "jdbc:relativity://#{config[:host]}:#{config[:...
Clean up adapter class code ID:866
diff --git a/lib/capistrano/tasks/components/docker.rake b/lib/capistrano/tasks/components/docker.rake index abc1234..def5678 100644 --- a/lib/capistrano/tasks/components/docker.rake +++ b/lib/capistrano/tasks/components/docker.rake @@ -23,7 +23,7 @@ task :docker_install do on roles(:all) do sudo :yum, '-...
Update Docker Compose to v1.23.2
diff --git a/lib/heroku-request-id/middleware.rb b/lib/heroku-request-id/middleware.rb index abc1234..def5678 100644 --- a/lib/heroku-request-id/middleware.rb +++ b/lib/heroku-request-id/middleware.rb @@ -38,7 +38,6 @@ end def each(&block) - puts "html_comment = #{self.class.html_comment}" if sel...
Remove a puts left from debugging
diff --git a/lib/ios/react-native-amap3d.podspec b/lib/ios/react-native-amap3d.podspec index abc1234..def5678 100644 --- a/lib/ios/react-native-amap3d.podspec +++ b/lib/ios/react-native-amap3d.podspec @@ -16,5 +16,5 @@ s.source_files = '**/*.{h,m}' s.dependency 'React' - s.dependency 'AMap3DMap', "~> 6.3.0" + ...
Upgrade ios sdk to v6.6.0
diff --git a/lib/zendesk_apps_support/app_requirement.rb b/lib/zendesk_apps_support/app_requirement.rb index abc1234..def5678 100644 --- a/lib/zendesk_apps_support/app_requirement.rb +++ b/lib/zendesk_apps_support/app_requirement.rb @@ -1,5 +1,5 @@ module ZendeskAppsSupport class AppRequirement - TYPES = %w(autom...
Add support for views as requirements
diff --git a/lib/shallow_attributes/type/date.rb b/lib/shallow_attributes/type/date.rb index abc1234..def5678 100644 --- a/lib/shallow_attributes/type/date.rb +++ b/lib/shallow_attributes/type/date.rb @@ -27,6 +27,7 @@ when ::DateTime, ::Time then value.to_date when ::Date then value else + ...
Create a note about strange ruby behaviour
diff --git a/lib/tasks/auto_annotate_models.rake b/lib/tasks/auto_annotate_models.rake index abc1234..def5678 100644 --- a/lib/tasks/auto_annotate_models.rake +++ b/lib/tasks/auto_annotate_models.rake @@ -0,0 +1,34 @@+# NOTE: only doing this in development as some production environments (Heroku) +# NOTE: are sensitive...
ADD : annotate config file
diff --git a/lib/tasks/humanitarian_sectors.rake b/lib/tasks/humanitarian_sectors.rake index abc1234..def5678 100644 --- a/lib/tasks/humanitarian_sectors.rake +++ b/lib/tasks/humanitarian_sectors.rake @@ -0,0 +1,20 @@+namespace :iom do + desc "Mark projects with 'Humanitarian Aid' sector as humanitarian" + task migra...
Add rake tasks for importing and data migration
diff --git a/lib/watnow/annotation/annotation.rb b/lib/watnow/annotation/annotation.rb index abc1234..def5678 100644 --- a/lib/watnow/annotation/annotation.rb +++ b/lib/watnow/annotation/annotation.rb @@ -1,9 +1,10 @@ module Watnow class Annotation + @@id = 0 @@instances = [] - attr_accessor :file, :l...
Add id & priority to `Annotation`
diff --git a/config/features.rb b/config/features.rb index abc1234..def5678 100644 --- a/config/features.rb +++ b/config/features.rb @@ -2,12 +2,15 @@ FeatureFlipper.features do in_state :development do - feature :alert, :description => "Journal and search alerts" + feature :alert, :description => "Journ...
Disable ToC UI in staging
diff --git a/config/initializers/exception_notification.rb b/config/initializers/exception_notification.rb index abc1234..def5678 100644 --- a/config/initializers/exception_notification.rb +++ b/config/initializers/exception_notification.rb @@ -0,0 +1,44 @@+require 'exception_notification/rails' + +require 'exception_n...
Add exception notifier for background jobs (sidekiq) https://github.com/smartinez87/exception_notification#background-notifications
diff --git a/config/schedule.rb b/config/schedule.rb index abc1234..def5678 100644 --- a/config/schedule.rb +++ b/config/schedule.rb @@ -29,6 +29,6 @@ end # For RANDOM2015 deployment, can be removed once that's done. -every 60.minutes do +every 10.minutes do envcommand "rake 'import_from_easychair'" end
Revert "10 minutes => 60minutes" This reverts commit 666cfafb15be7b6f8571212517ed0ea8cf190ec7 [formerly 1c9e18bccd293e02bd8bc866073c625c8596271a] [formerly 9cfd17456dc4b208b676ae91c64ed20f38df337d] [formerly 626665c2bc7faa60b82a76cbbb4b6579ce8d3076 [formerly 26845000ae94debd87de2ead02eacf10009d916d]] [formerly 5749e75...
diff --git a/recipes/_package_rhel.rb b/recipes/_package_rhel.rb index abc1234..def5678 100644 --- a/recipes/_package_rhel.rb +++ b/recipes/_package_rhel.rb @@ -1,7 +1,7 @@ include_recipe 'yum' case node['platform_version'].to_f - when 6.4, 6.5 + when 6.4, 6.5, 6.6, 6.7 remote_file '/tmp/epel.rpm' do ...
Add support for Centos 6.6 and 6.7 This will indeed work with Centos 6.6 and 6.7 it turns out.
diff --git a/bosh-dev/lib/bosh/dev/bat_helper.rb b/bosh-dev/lib/bosh/dev/bat_helper.rb index abc1234..def5678 100644 --- a/bosh-dev/lib/bosh/dev/bat_helper.rb +++ b/bosh-dev/lib/bosh/dev/bat_helper.rb @@ -31,7 +31,7 @@ end def run_rake - ENV['BAT_INFRASTRUCTURE'] = infrastructure.name + infrastruct...
Move logic to named method for clarity
diff --git a/warden-doorkeeper.gemspec b/warden-doorkeeper.gemspec index abc1234..def5678 100644 --- a/warden-doorkeeper.gemspec +++ b/warden-doorkeeper.gemspec @@ -9,7 +9,7 @@ s.email = "kolorahl@gmail.com" s.homepage = "https://github.com/kolorahl/warden-doorkeeper" s.summary = "Integration with ...
Update description to remove gem build warning
diff --git a/config/routes.rb b/config/routes.rb index abc1234..def5678 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,6 +8,6 @@ else Arturo::Engine.routes.draw do resources :features, :controller => 'arturo/features' - put 'features', :to => 'arturo/features#update_all', :as => 'features_all' + ...
Rename route features_all to features_update_all
diff --git a/config/routes.rb b/config/routes.rb index abc1234..def5678 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -11,6 +11,9 @@ get 'gh' => redirect(Links::Github) get 'fo' => redirect(Links::Foursquare) + get 'zshrc' => redirect('https://raw.githubusercontent.com/pfhayes/dotfiles/master/.z...
Add back some old redirects
diff --git a/config/routes.rb b/config/routes.rb index abc1234..def5678 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,5 @@ Dippam::Application.routes.draw do - resources :summary_documents, :vmr_tracks, :vmr_interviews, - :eppi_lc_subjects, :ied_institutions + resources :summary_documents...
Remove route for VMR tracks.
diff --git a/config/routes.rb b/config/routes.rb index abc1234..def5678 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,4 +4,5 @@ root 'skills#index' get 'refresh' => 'skills#refresh', as: 'refresh' + get 'welcome' => 'skills#splash', as: 'welcome' end
Add route for welcome page
diff --git a/config/routes.rb b/config/routes.rb index abc1234..def5678 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,7 @@ Rails.application.routes.draw do + root to: "posts#index" + resources :posts - - root to: "users#index" - resources :users mount Pancakes::Engine, at: "/pg"
Add article index as root
diff --git a/db/migrate/20160328115649_migrate_new_notification_setting.rb b/db/migrate/20160328115649_migrate_new_notification_setting.rb index abc1234..def5678 100644 --- a/db/migrate/20160328115649_migrate_new_notification_setting.rb +++ b/db/migrate/20160328115649_migrate_new_notification_setting.rb @@ -7,7 +7,7 @@...
Fix datetime format when migrating new notification settings on MySQL
diff --git a/templates/factory_bot_rspec.rb b/templates/factory_bot_rspec.rb index abc1234..def5678 100644 --- a/templates/factory_bot_rspec.rb +++ b/templates/factory_bot_rspec.rb @@ -1,3 +1,5 @@+FactoryBot.use_parent_strategy = true + RSpec.configure do |config| config.include FactoryBot::Syntax::Methods end
Use parent strategy for factories Setting FactoryBot.use_parent_strategy = true allows objects made with the build strategy to use build instead of create for any associations. Using this setting will generally reduce the number of calls to `create`, and makes `build` generally [a little faster](https://gist.github.co...
diff --git a/app/controllers/matrices_controller.rb b/app/controllers/matrices_controller.rb index abc1234..def5678 100644 --- a/app/controllers/matrices_controller.rb +++ b/app/controllers/matrices_controller.rb @@ -42,7 +42,7 @@ def new # Get a list of kinds currently in the collection - @kinds = kind_lis...
Fix scoping of helper function - add helpers.*
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index abc1234..def5678 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -9,6 +9,6 @@ private def session_params - params.require(:session).permit(:user_id, :user_name...
Allow user email on sessions.
diff --git a/spec/dummy_app/db/migrate/00000000000006_devise_create_users.rb b/spec/dummy_app/db/migrate/00000000000006_devise_create_users.rb index abc1234..def5678 100644 --- a/spec/dummy_app/db/migrate/00000000000006_devise_create_users.rb +++ b/spec/dummy_app/db/migrate/00000000000006_devise_create_users.rb @@ -5,1...
Add encryptable to old migration
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb index abc1234..def5678 100644 --- a/app/controllers/documents_controller.rb +++ b/app/controllers/documents_controller.rb @@ -21,6 +21,9 @@ expire_on_next_scheduled_publication([@document]) render :coming_soo...
Add note regarding the lack of 410 status
diff --git a/app/models/alchemy/essence_richtext.rb b/app/models/alchemy/essence_richtext.rb index abc1234..def5678 100644 --- a/app/models/alchemy/essence_richtext.rb +++ b/app/models/alchemy/essence_richtext.rb @@ -25,26 +25,7 @@ private def strip_content - self.stripped_body = strip_tags(body) - e...
Use Rails HTML sanitizer to strip tags We used to have a custom HTML sanitizer that does not work any more with Rails 4.2 Now we use the default html sanitizer shipped with rails. Fixes #1017
diff --git a/lib/docker_registry/registry.rb b/lib/docker_registry/registry.rb index abc1234..def5678 100644 --- a/lib/docker_registry/registry.rb +++ b/lib/docker_registry/registry.rb @@ -35,6 +35,10 @@ end end + def [](name) + DockerRegistry::Repository.new({ name: name }, self) + end + def repositry...
Add direct repository getting method
diff --git a/lib/fact_check_email_handler.rb b/lib/fact_check_email_handler.rb index abc1234..def5678 100644 --- a/lib/fact_check_email_handler.rb +++ b/lib/fact_check_email_handler.rb @@ -7,11 +7,9 @@ # initializer and is typically called from the mail_fetcher script class FactCheckEmailHandler attr_accessor :erro...
Fix undefined method message_processor error by removing unnecessary dependency injection
diff --git a/lib/git_cleanser/smart_thing.rb b/lib/git_cleanser/smart_thing.rb index abc1234..def5678 100644 --- a/lib/git_cleanser/smart_thing.rb +++ b/lib/git_cleanser/smart_thing.rb @@ -1,11 +1,13 @@+require 'set' + module GitCleanser class SmartThing def initialize(config) @config = config - @c...
Use Sets, because we can.
diff --git a/lib/generators/generic_api_rails/install/install_generator.rb b/lib/generators/generic_api_rails/install/install_generator.rb index abc1234..def5678 100644 --- a/lib/generators/generic_api_rails/install/install_generator.rb +++ b/lib/generators/generic_api_rails/install/install_generator.rb @@ -14,7 +14,7 ...
Add the GAPI routes regardless of rails version
diff --git a/processors/generators/postfix-filter.rb b/processors/generators/postfix-filter.rb index abc1234..def5678 100644 --- a/processors/generators/postfix-filter.rb +++ b/processors/generators/postfix-filter.rb @@ -35,7 +35,7 @@ address = r.to_s invmask = (~r.mask_addr & 0xffffffff) + 1 ...
Make Postfix filter generator include "REJECT". Signed-off-by: brian m. carlson <738bdd359be778fee9f0fc4e2934ad72f436ceda@crustytoothpaste.net>
diff --git a/lib/protobuf/tasks/compile.rake b/lib/protobuf/tasks/compile.rake index abc1234..def5678 100644 --- a/lib/protobuf/tasks/compile.rake +++ b/lib/protobuf/tasks/compile.rake @@ -1,3 +1,5 @@+require 'fileutils' + namespace :protobuf do desc 'Clean & Compile the protobuf source to ruby classes. Pass PB_N...
Add protobuf:clean task for external use To get this task simply `require ‘protobuf/tasks’` in your Rakefile. Clean will ask for confirmation of removing previously compiled pb.rb source files. You can skip the confirmation step by providing PB_FORCE_CLEAN=1. A force clean is automatically invoked from the `compile` ...
diff --git a/snippets/app/models/cheatsheet.rb b/snippets/app/models/cheatsheet.rb index abc1234..def5678 100644 --- a/snippets/app/models/cheatsheet.rb +++ b/snippets/app/models/cheatsheet.rb @@ -1,3 +1,5 @@ class Cheatsheet < ActiveRecord::Base belongs_to :user + has_many :cheatsheet_snippet + has_many :snippets...
Add new associations to Cheatsheet model
diff --git a/lib/telegram_bot/out_message.rb b/lib/telegram_bot/out_message.rb index abc1234..def5678 100644 --- a/lib/telegram_bot/out_message.rb +++ b/lib/telegram_bot/out_message.rb @@ -4,6 +4,7 @@ attribute :chat, Channel attribute :text, String attribute :reply_to, Message + attribute :parse_mode,...
Add parse_mode to OutMessage for markdown
diff --git a/app/serializers/category_serializer.rb b/app/serializers/category_serializer.rb index abc1234..def5678 100644 --- a/app/serializers/category_serializer.rb +++ b/app/serializers/category_serializer.rb @@ -15,15 +15,21 @@ def transaction_ids join_sql = if object.unassigned? - "LEFT JOIN categ...
Fix transactions query for the category
diff --git a/app/workers/reactive_caching_worker.rb b/app/workers/reactive_caching_worker.rb index abc1234..def5678 100644 --- a/app/workers/reactive_caching_worker.rb +++ b/app/workers/reactive_caching_worker.rb @@ -12,7 +12,7 @@ end return unless klass - klass.find_by(id: id).try(:exclusively_update_rea...
Use record's primary key instead of hardcoded `id` Enable caching for records which primary key is not `id`.
diff --git a/spec/libraries/prometheus_spec.rb b/spec/libraries/prometheus_spec.rb index abc1234..def5678 100644 --- a/spec/libraries/prometheus_spec.rb +++ b/spec/libraries/prometheus_spec.rb @@ -1,6 +1,8 @@ require 'chef_helper' describe Prometheus do + before { Services.add_services('gitlab', Gitlab::Services.li...
Load services for the prometheus library test
diff --git a/spec/ruby/language/module_spec.rb b/spec/ruby/language/module_spec.rb index abc1234..def5678 100644 --- a/spec/ruby/language/module_spec.rb +++ b/spec/ruby/language/module_spec.rb @@ -16,6 +16,24 @@ LangModuleSpec::Anon = Module.new LangModuleSpec::Anon.name.should == "LangModuleSpec::Anon" end...
Add spec for module trying to reopen a class
diff --git a/spec/support/chargeback_helper.rb b/spec/support/chargeback_helper.rb index abc1234..def5678 100644 --- a/spec/support/chargeback_helper.rb +++ b/spec/support/chargeback_helper.rb @@ -10,6 +10,18 @@ def used_average_for(metric, hours_in_interval, resource) resource.metric_rollups.sum(&metric...
Add helper method for generating MetricRollups
diff --git a/config/routes.rb b/config/routes.rb index abc1234..def5678 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -11,6 +11,8 @@ get 'summarize' end end + + root 'proposals#index' end namespace 'monitoring' do
Add home route for voting namespace Fix missing route for voting home (#4): * add home for voting namespace
diff --git a/source/_plugins/playlister.rb b/source/_plugins/playlister.rb index abc1234..def5678 100644 --- a/source/_plugins/playlister.rb +++ b/source/_plugins/playlister.rb @@ -1,5 +1,6 @@ require 'soundcloud' require 'json' +require 'open-uri' module Jekyll class Playlister < Liquid::Tag @@ -14,14 +15,32 ...
Copy all images to artwork folder
diff --git a/config/routes.rb b/config/routes.rb index abc1234..def5678 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -20,4 +20,6 @@ resources :users, except: :index get '/signup' => 'users#new', as: 'signup' + post '/response/up_vote' => "responses#up_vote" + end
Resolve merge conflict by keeping the newest upvote POST route.
diff --git a/config/routes.rb b/config/routes.rb index abc1234..def5678 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Ecm::Pictures::Backend::Engine.routes.draw do - resources :galleries - resources :pictures + backend_resources :galleries + backend_resources :pictures root to: 'home#ind...
Use itsf backend backend_resource method.
diff --git a/core/config/initializers/konacha.rb b/core/config/initializers/konacha.rb index abc1234..def5678 100644 --- a/core/config/initializers/konacha.rb +++ b/core/config/initializers/konacha.rb @@ -8,6 +8,7 @@ config.driver = :poltergeist config.stylesheets = [] if ENV['JENKINS_URL'] + ...
Add notification when file is opened.
diff --git a/test/specs/providers/azure/template_spec.rb b/test/specs/providers/azure/template_spec.rb index abc1234..def5678 100644 --- a/test/specs/providers/azure/template_spec.rb +++ b/test/specs/providers/azure/template_spec.rb @@ -0,0 +1,34 @@+require_relative '../../../spec' + +describe 'Azure templates' do + + ...
Add spec coverage on azure provider specific resource insertion
diff --git a/test/unit/code/builder/code_builder_test.rb b/test/unit/code/builder/code_builder_test.rb index abc1234..def5678 100644 --- a/test/unit/code/builder/code_builder_test.rb +++ b/test/unit/code/builder/code_builder_test.rb @@ -8,7 +8,7 @@ include RamlPoliglota::Support include RamlPoliglota::Code::Bu...
Add method to build model class.
diff --git a/spec/ironmq_publisher_spec.rb b/spec/ironmq_publisher_spec.rb index abc1234..def5678 100644 --- a/spec/ironmq_publisher_spec.rb +++ b/spec/ironmq_publisher_spec.rb @@ -8,11 +8,13 @@ it "should call post for IronMQ" do expect_any_instance_of(IronMQ::Queue).to receive(:post) { |instance, serialized_...
Test updated to reflect the new use of Base64
diff --git a/cerializable.gemspec b/cerializable.gemspec index abc1234..def5678 100644 --- a/cerializable.gemspec +++ b/cerializable.gemspec @@ -9,9 +9,9 @@ s.version = Cerializable::VERSION s.authors = ["Eric Arnold"] s.email = ["eric.ed.arnold@gmail.com"] - s.homepage = "TODO" - s.summary ...
Update homepage, summary, & description in .gemspec
diff --git a/10_balance_bots.rb b/10_balance_bots.rb index abc1234..def5678 100644 --- a/10_balance_bots.rb +++ b/10_balance_bots.rb @@ -0,0 +1,47 @@+Bot = Struct.new(:id, :nums, :low_to, :high_to) { + def <<(n) + nums << n + nums.sort! + puts id if nums == [17, 61] + end + + def ready? + nums.size == 2 ...
Add day 10: Balance Bots
diff --git a/spec/pr_log/formatter_spec.rb b/spec/pr_log/formatter_spec.rb index abc1234..def5678 100644 --- a/spec/pr_log/formatter_spec.rb +++ b/spec/pr_log/formatter_spec.rb @@ -33,20 +33,6 @@ TEXT end - it 'turns title into lower case sentence' do - data = [{ title: 'Some Capitalized Ti...
Delete test for capitalized title
diff --git a/recipes/apt_pgdg_postgresql.rb b/recipes/apt_pgdg_postgresql.rb index abc1234..def5678 100644 --- a/recipes/apt_pgdg_postgresql.rb +++ b/recipes/apt_pgdg_postgresql.rb @@ -1,4 +1,4 @@-if not %w(squeeze wheezy sid lucid precise saucy trusty utopic).include? node['postgresql']['pgdg']['release_apt_codename']...
Add Debian Jessie to whitelist for apt.postgresql.org repo