diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/app/decorators/tenant_decorator.rb b/app/decorators/tenant_decorator.rb index abc1234..def5678 100644 --- a/app/decorators/tenant_decorator.rb +++ b/app/decorators/tenant_decorator.rb @@ -1,5 +1,9 @@ class TenantDecorator < Draper::Decorator delegate_all + + def link + h.link_to object.name, object ...
Add method that was accidently removed
diff --git a/TodUni/db/migrate/20160531212401_rename_stages_to_phases.rb b/TodUni/db/migrate/20160531212401_rename_stages_to_phases.rb index abc1234..def5678 100644 --- a/TodUni/db/migrate/20160531212401_rename_stages_to_phases.rb +++ b/TodUni/db/migrate/20160531212401_rename_stages_to_phases.rb @@ -0,0 +1,10 @@+class ...
Rename table stages to phases, rename column stage_num to phase_number and due_date to date_end, add column date_beginning
diff --git a/app/models/chargify_transaction.rb b/app/models/chargify_transaction.rb index abc1234..def5678 100644 --- a/app/models/chargify_transaction.rb +++ b/app/models/chargify_transaction.rb @@ -6,7 +6,45 @@ validates_presence_of :chargify_subscription_id + after_create :create_shop_order + def memo ...
Create shop orders for payments.
diff --git a/app/models/sms/adapters/factory.rb b/app/models/sms/adapters/factory.rb index abc1234..def5678 100644 --- a/app/models/sms/adapters/factory.rb +++ b/app/models/sms/adapters/factory.rb @@ -19,7 +19,6 @@ # creates an instance of the specified adapter def create(name_or_class, config:) return nil if...
10398: Remove leftover confgatron in sms adapters
diff --git a/app/resources/api/user_resource.rb b/app/resources/api/user_resource.rb index abc1234..def5678 100644 --- a/app/resources/api/user_resource.rb +++ b/app/resources/api/user_resource.rb @@ -3,7 +3,7 @@ class UserResource < JSONAPI::Resource include Pundit::Resource - attributes :name, :email + ...
Add password attributes to User resource
diff --git a/app.rb b/app.rb index abc1234..def5678 100644 --- a/app.rb +++ b/app.rb @@ -20,7 +20,8 @@ set :username, config['username'] set :password, config['password'] - set :redis, Redis.new(:host => config['redis_host'], :port => config['redis_port'], :db => config['redis_db']) + uri = URI.parse(ENV["REDI...
Use env var to get redis cloud config
diff --git a/spec/controllers/application_controller/advanced_search_spec.rb b/spec/controllers/application_controller/advanced_search_spec.rb index abc1234..def5678 100644 --- a/spec/controllers/application_controller/advanced_search_spec.rb +++ b/spec/controllers/application_controller/advanced_search_spec.rb @@ -0,0...
Add spec test for build_configuration_manager_cs_filter_tree Add a spec test for build_configuration_manager_cs_filter_tree method which should be called when saving a filter in Configuration -> Management -> Configured Systems accordion.
diff --git a/spec/factories/course_assessment_answer_multiple_responses.rb b/spec/factories/course_assessment_answer_multiple_responses.rb index abc1234..def5678 100644 --- a/spec/factories/course_assessment_answer_multiple_responses.rb +++ b/spec/factories/course_assessment_answer_multiple_responses.rb @@ -5,5 +5,17 @...
Add correct and wrong traits to MRQ answers.
diff --git a/app/controllers/questions.rb b/app/controllers/questions.rb index abc1234..def5678 100644 --- a/app/controllers/questions.rb +++ b/app/controllers/questions.rb @@ -1,6 +1,7 @@ get '/questions' do #list all - @posts = Post.all + @questions = Question.all erb :questions_show + erb :index end get '/...
Edit question controller variable names
diff --git a/test/slim_spec.rb b/test/slim_spec.rb index abc1234..def5678 100644 --- a/test/slim_spec.rb +++ b/test/slim_spec.rb @@ -6,22 +6,23 @@ describe 'Slim hack' do it 'adds @dataRole alias' do - Slim::Template.new { '.name@nameField' }.render.should == - '<div class="name" data-role="nameField"></di...
Use expect syntax in RSpec
diff --git a/lib/rom/yesql/relation/class_interface.rb b/lib/rom/yesql/relation/class_interface.rb index abc1234..def5678 100644 --- a/lib/rom/yesql/relation/class_interface.rb +++ b/lib/rom/yesql/relation/class_interface.rb @@ -14,10 +14,9 @@ # # @api public def dataset(name = Undefined) - ...
Revise dataset to define query and return self Dataset needs to return the relation under Rom 5
diff --git a/HSGoogleDrivePicker.podspec b/HSGoogleDrivePicker.podspec index abc1234..def5678 100644 --- a/HSGoogleDrivePicker.podspec +++ b/HSGoogleDrivePicker.podspec @@ -19,7 +19,7 @@ s.requires_arc = true s.dependency 'AsyncImageView' - s.dependency 'GoogleAPIClient/Drive' + s.dependency 'Google-API-Clien...
Revert "Set new GoogleApiClient podname"
diff --git a/examples/fiber-sieve.rb b/examples/fiber-sieve.rb index abc1234..def5678 100644 --- a/examples/fiber-sieve.rb +++ b/examples/fiber-sieve.rb @@ -0,0 +1,31 @@+ +require 'fiber' + +PRINTER = Fiber.new do |i| + while true + puts i + i = Fiber.yield + end +end + +def worker + Fiber.new do |prime| + ...
Add a Sieve example using plain fibers
diff --git a/lib/after_do/logging/aspect.rb b/lib/after_do/logging/aspect.rb index abc1234..def5678 100644 --- a/lib/after_do/logging/aspect.rb +++ b/lib/after_do/logging/aspect.rb @@ -7,18 +7,18 @@ end def log_start(target_method) - target_class.before target_method do |*args, _| + target_...
Include id on log message
diff --git a/lib/generators/rails_settings/templates/create_settings.rb b/lib/generators/rails_settings/templates/create_settings.rb index abc1234..def5678 100644 --- a/lib/generators/rails_settings/templates/create_settings.rb +++ b/lib/generators/rails_settings/templates/create_settings.rb @@ -1,4 +1,4 @@-class Creat...
Fix naming of create settings migration.
diff --git a/lib/generators/spree_shipwire/install/install_generator.rb b/lib/generators/spree_shipwire/install/install_generator.rb index abc1234..def5678 100644 --- a/lib/generators/spree_shipwire/install/install_generator.rb +++ b/lib/generators/spree_shipwire/install/install_generator.rb @@ -1,6 +1,7 @@ module Spre...
Add source_route for install generator
diff --git a/lib/gitlab/importers/common_metrics/prometheus_metric_enums.rb b/lib/gitlab/importers/common_metrics/prometheus_metric_enums.rb index abc1234..def5678 100644 --- a/lib/gitlab/importers/common_metrics/prometheus_metric_enums.rb +++ b/lib/gitlab/importers/common_metrics/prometheus_metric_enums.rb @@ -38,5 +3...
Remove prepending of EE module
diff --git a/features/support/vcr.rb b/features/support/vcr.rb index abc1234..def5678 100644 --- a/features/support/vcr.rb +++ b/features/support/vcr.rb @@ -1,4 +1,5 @@ require 'vcr' +require 'dotenv/load' VCR.configure do |c| c.cassette_library_dir = 'features/cassettes' @@ -30,3 +31,6 @@ c.filter_sensitive_da...
Add Algolia init ENV vars for specs - In case a cassette needs to be re-recorded the keys are needed. It is not immediately clear in dev why the spec is returning 403 while the keys are correct in .env
diff --git a/config/environments/development.rb b/config/environments/development.rb index abc1234..def5678 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -15,7 +15,7 @@ # ActionMailer::Base.default_url_options[:protocol] = 'https' ActionMailer::Base.default_url_options[:...
Include the RAILS_ENV when setting the :host url for actionmailer
diff --git a/test/integration/helpers/serverspec/shared_serverspec/server_ports.rb b/test/integration/helpers/serverspec/shared_serverspec/server_ports.rb index abc1234..def5678 100644 --- a/test/integration/helpers/serverspec/shared_serverspec/server_ports.rb +++ b/test/integration/helpers/serverspec/shared_serverspec...
Add more port checks, and fix a typo in lock daemon check
diff --git a/spec/build_process_spec.rb b/spec/build_process_spec.rb index abc1234..def5678 100644 --- a/spec/build_process_spec.rb +++ b/spec/build_process_spec.rb @@ -28,4 +28,21 @@ build[:output].chomp.should == "test build succeeded" end + it "Should catch failed builds" do + watcher = Juici::Watcher.i...
Add spec for failed builds
diff --git a/spec/factories/patterns.rb b/spec/factories/patterns.rb index abc1234..def5678 100644 --- a/spec/factories/patterns.rb +++ b/spec/factories/patterns.rb @@ -20,13 +20,13 @@ revision 'master' trait :platform do - name 'sample_platform_pattern' + sequence(:name) { |n| "platform_pattern-#{...
Add sequence number on name of Pattern to avoid duplicated name
diff --git a/api/lib/spree/api/engine.rb b/api/lib/spree/api/engine.rb index abc1234..def5678 100644 --- a/api/lib/spree/api/engine.rb +++ b/api/lib/spree/api/engine.rb @@ -12,7 +12,7 @@ end config.view_versions = [1] - config.view_version_extraction_strategy = :http_parameter + config.view_ver...
[api] Fix view_version_extraction_strategy for versioncake config
diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb index abc1234..def5678 100644 --- a/app/helpers/icons_helper.rb +++ b/app/helpers/icons_helper.rb @@ -1,7 +1,7 @@ module IconsHelper def boolean_to_icon(value) if value.to_s == "true" - content_tag :i, nil, class: 'icon-ok cgreen' + ...
Replace ok with circle for boolean icon Signed-off-by: Dmitriy Zaporozhets <be23d75b156792e5acab51b196a2deb155d35d6a@gmail.com>
diff --git a/app/mailers/error_mailer.rb b/app/mailers/error_mailer.rb index abc1234..def5678 100644 --- a/app/mailers/error_mailer.rb +++ b/app/mailers/error_mailer.rb @@ -4,7 +4,7 @@ @target_emails = ENV['ERROR_MAILER_LIST'].split(',') @subject = "ERROR: Student Insights ErrorMailer" @error_message = er...
Update ErrorMailer to except unraised exceptions
diff --git a/app/mailers/event_mailer.rb b/app/mailers/event_mailer.rb index abc1234..def5678 100644 --- a/app/mailers/event_mailer.rb +++ b/app/mailers/event_mailer.rb @@ -1,7 +1,8 @@ class EventMailer < ApplicationMailer def event_info(to, email) @email = email - mail(to: to, + mail(from: @email.user.em...
Set the From in the event mailer to the user sending the mail
diff --git a/lib/heaven/provider/ansible.rb b/lib/heaven/provider/ansible.rb index abc1234..def5678 100644 --- a/lib/heaven/provider/ansible.rb +++ b/lib/heaven/provider/ansible.rb @@ -34,7 +34,7 @@ ].join(" ") deploy_string = ["ansible-playbook", "-i", ansible_hosts_file, ansible_site_file, - ...
Remove single quote in extra vars.
diff --git a/app/overrides/ean_fields.rb b/app/overrides/ean_fields.rb index abc1234..def5678 100644 --- a/app/overrides/ean_fields.rb +++ b/app/overrides/ean_fields.rb @@ -1,18 +1,14 @@-if Spree::Variant.first and Spree::Variant.first.respond_to? :ean - Spree::Product.class_eval do - attr_accessible :ean - end - ...
Delete option to activate ean fields because it was causing problems
diff --git a/lib/jimsy/git/clone_service.rb b/lib/jimsy/git/clone_service.rb index abc1234..def5678 100644 --- a/lib/jimsy/git/clone_service.rb +++ b/lib/jimsy/git/clone_service.rb @@ -3,7 +3,7 @@ module Jimsy class Git class CloneService - SAFE_HOSTS = %w[github.com bitbucket.org].freeze + SAFE_HOSTS...
Handle arbitrarily nested project dirs.
diff --git a/core/env/element_reference_spec.rb b/core/env/element_reference_spec.rb index abc1234..def5678 100644 --- a/core/env/element_reference_spec.rb +++ b/core/env/element_reference_spec.rb @@ -15,10 +15,18 @@ it "returns nil if the variable isn't found" do ENV["this_var_is_never_set"].should == nil en...
Add specs for ENV always producing frozen strings in locale encoding, regardless of incoming.
diff --git a/lib/json_test_data/data_structures/number.rb b/lib/json_test_data/data_structures/number.rb index abc1234..def5678 100644 --- a/lib/json_test_data/data_structures/number.rb +++ b/lib/json_test_data/data_structures/number.rb @@ -6,12 +6,13 @@ class << self def create(schema) - factor, mi...
Fix issue with adjustments for maximum and minimum
diff --git a/cookbooks/install-editors/recipes/install-monodevelop.rb b/cookbooks/install-editors/recipes/install-monodevelop.rb index abc1234..def5678 100644 --- a/cookbooks/install-editors/recipes/install-monodevelop.rb +++ b/cookbooks/install-editors/recipes/install-monodevelop.rb @@ -1,4 +1,11 @@+bash "add mono dev...
Install monodevelop using the ppa
diff --git a/lib/mongoid/relations/eager.rb b/lib/mongoid/relations/eager.rb index abc1234..def5678 100644 --- a/lib/mongoid/relations/eager.rb +++ b/lib/mongoid/relations/eager.rb @@ -23,11 +23,9 @@ def preload(relations, docs) grouped_relations = relations.group_by(&:inverse_class_name) - grou...
Remove double iteration on grouped relations
diff --git a/lib/omniauth/strategies/gds.rb b/lib/omniauth/strategies/gds.rb index abc1234..def5678 100644 --- a/lib/omniauth/strategies/gds.rb +++ b/lib/omniauth/strategies/gds.rb @@ -20,7 +20,7 @@ end def user - @user ||= MultiJson.decode(access_token.get('/user.json').body)['user'] + @user ||= MultiJson...
Include client_id when requesting user details. To fix a token transfer issue. See https://github.com/alphagov/signonotron2/pull/245 for more details.
diff --git a/lib/rooftop/algolia_search/post_searching.rb b/lib/rooftop/algolia_search/post_searching.rb index abc1234..def5678 100644 --- a/lib/rooftop/algolia_search/post_searching.rb +++ b/lib/rooftop/algolia_search/post_searching.rb @@ -9,9 +9,15 @@ module ClassMethods - def search(query, opts = {}...
Add ability to search by a specific index name, by passing into search() as the third arg.
diff --git a/lib/quality/tools/punchlist.rb b/lib/quality/tools/punchlist.rb index abc1234..def5678 100644 --- a/lib/quality/tools/punchlist.rb +++ b/lib/quality/tools/punchlist.rb @@ -6,7 +6,7 @@ def punchlist_args glob = "--glob '#{source_files_glob}'" - regexp = "--regexp '#{punchlist_regexp}...
Fix issue with argument separation
diff --git a/lib/tasks/fetch_and_email.rake b/lib/tasks/fetch_and_email.rake index abc1234..def5678 100644 --- a/lib/tasks/fetch_and_email.rake +++ b/lib/tasks/fetch_and_email.rake @@ -18,6 +18,12 @@ end end - task fetch_and_email: [:fetch, :email] do + desc "Reset records" + task reset: :environment do + ...
Add rake task for resetting records
diff --git a/app/models/issue_tracker.rb b/app/models/issue_tracker.rb index abc1234..def5678 100644 --- a/app/models/issue_tracker.rb +++ b/app/models/issue_tracker.rb @@ -13,6 +13,7 @@ @tracker ||= begin klass = ErrbitPlugin::Registry.issue_trackers[self.type_tracker] || ErrbitPlugin::NoneIssueTra...
Add TODO to issue tracker
diff --git a/app/models/listing_image.rb b/app/models/listing_image.rb index abc1234..def5678 100644 --- a/app/models/listing_image.rb +++ b/app/models/listing_image.rb @@ -4,7 +4,8 @@ has_attached_file :image, :storage => :s3, :s3_credentials => "#{Rails.root}/config/s3.yml", - :path => ":id/:style/:...
Make S3 images readable by default
diff --git a/app/models/order_updater.rb b/app/models/order_updater.rb index abc1234..def5678 100644 --- a/app/models/order_updater.rb +++ b/app/models/order_updater.rb @@ -7,10 +7,12 @@ end def update + return unless params[:order].present? update_notes update_details update_tracking_details ...
Fix ship_to_name not being saved
diff --git a/app/models/multimodel_devise/concerns/token_authenticatable.rb b/app/models/multimodel_devise/concerns/token_authenticatable.rb index abc1234..def5678 100644 --- a/app/models/multimodel_devise/concerns/token_authenticatable.rb +++ b/app/models/multimodel_devise/concerns/token_authenticatable.rb @@ -12,7 +1...
Fix typo: Should be DateTime.now instead of DateTime.new
diff --git a/db/migrate/20170322171523_add_owner_to_common_tasks.rb b/db/migrate/20170322171523_add_owner_to_common_tasks.rb index abc1234..def5678 100644 --- a/db/migrate/20170322171523_add_owner_to_common_tasks.rb +++ b/db/migrate/20170322171523_add_owner_to_common_tasks.rb @@ -1,5 +1,5 @@ class AddOwnerToCommonTasks...
Fix foreign key problem in postgresql Since the CommonTask#owner reference is actually referencing the users table then a :to_table option needs to be added to the foreign key attributed to keep it from trying to use a non-existant owners table rather than the appropriate users table.
diff --git a/app/controllers/refinery/products/admin/products_controller.rb b/app/controllers/refinery/products/admin/products_controller.rb index abc1234..def5678 100644 --- a/app/controllers/refinery/products/admin/products_controller.rb +++ b/app/controllers/refinery/products/admin/products_controller.rb @@ -43,7 +4...
Fix the ability to remove all categories from a product
diff --git a/config/initializers/resque.rb b/config/initializers/resque.rb index abc1234..def5678 100644 --- a/config/initializers/resque.rb +++ b/config/initializers/resque.rb @@ -0,0 +1,8 @@+rails_root = ENV['RAILS_ROOT'] || File.dirname(__FILE__) + '/../..' +rails_env = ENV['RAILS_ENV'] || 'development' +config_f...
Add an initializer to allow custom Resque configs
diff --git a/Sage.podspec b/Sage.podspec index abc1234..def5678 100644 --- a/Sage.podspec +++ b/Sage.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Sage" - s.version = "2.0.0" + s.version = "2.0.1" s.summary = "A cross-pl...
Update podspec for version 2.0.1
diff --git a/app/controllers/neighborly/balanced/bankaccount/payments_controller.rb b/app/controllers/neighborly/balanced/bankaccount/payments_controller.rb index abc1234..def5678 100644 --- a/app/controllers/neighborly/balanced/bankaccount/payments_controller.rb +++ b/app/controllers/neighborly/balanced/bankaccount/pa...
Extend payments controller from accounts controller
diff --git a/em-jack.gemspec b/em-jack.gemspec index abc1234..def5678 100644 --- a/em-jack.gemspec +++ b/em-jack.gemspec @@ -18,7 +18,7 @@ s.add_dependency 'eventmachine', ['>= 0.12.10'] s.add_development_dependency 'bundler', ['~> 1.0.13'] - s.add_development_dependency 'rake', ['~> 0.8.7'] + s.add_develop...
Make our Rake requirement more liberal
diff --git a/AMPopTip.podspec b/AMPopTip.podspec index abc1234..def5678 100644 --- a/AMPopTip.podspec +++ b/AMPopTip.podspec @@ -17,5 +17,6 @@ s.swift_version = '5.0' s.source_files = 'Source/*.swift' s.requires_arc = true + s.weak_framework = 'SwiftUI' s.social_media_url = 'https://twitter.com/theandream...
Add SwiftUI as weak_framework to podspec
diff --git a/Casks/prepros.rb b/Casks/prepros.rb index abc1234..def5678 100644 --- a/Casks/prepros.rb +++ b/Casks/prepros.rb @@ -4,17 +4,4 @@ version '4.0.1' sha256 '84510d1252274898b0fc4f95828b60e29a2c946a158bbf7d3188611c62dcd3b1' link 'Prepros.app' - after_install do - # re: https://github.com/phinze/home...
Remove Prepos after_install permissions hack `/usr/bin/unzip` is no longer used. `ditto` correctly preserves these permissions.
diff --git a/Folklore.podspec b/Folklore.podspec index abc1234..def5678 100644 --- a/Folklore.podspec +++ b/Folklore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Folklore' - s.version = '0.2.1' + s.version = '0.2.2' s.license = 'MIT' s.summary = 'League of Legends chat service library for i...
Set the version number to 0.2.2.
diff --git a/db/migrate/20180822021048_create_active_encode_encode_records.rb b/db/migrate/20180822021048_create_active_encode_encode_records.rb index abc1234..def5678 100644 --- a/db/migrate/20180822021048_create_active_encode_encode_records.rb +++ b/db/migrate/20180822021048_create_active_encode_encode_records.rb @@ ...
Reduce migration version to accommodate rails 5.0+
diff --git a/VoucherifySwiftSdk.podspec b/VoucherifySwiftSdk.podspec index abc1234..def5678 100644 --- a/VoucherifySwiftSdk.podspec +++ b/VoucherifySwiftSdk.podspec @@ -22,7 +22,7 @@ s.source = { :git => 'https://github.com/voucherifyio/voucherify-ios-sdk.git', :tag => s.version.to_s } s.social_media_url...
Update deployment target from 8.0 to 9.0
diff --git a/plugins/commands/plugin/command/uninstall.rb b/plugins/commands/plugin/command/uninstall.rb index abc1234..def5678 100644 --- a/plugins/commands/plugin/command/uninstall.rb +++ b/plugins/commands/plugin/command/uninstall.rb @@ -16,8 +16,8 @@ return if !argv raise Vagrant::Errors::CLIIn...
Allow `vagrant (un)install plugin1 plugin2 plugin3`
diff --git a/db/migrate/20121030103500_add_skip_missing_email_alert_flag.rb b/db/migrate/20121030103500_add_skip_missing_email_alert_flag.rb index abc1234..def5678 100644 --- a/db/migrate/20121030103500_add_skip_missing_email_alert_flag.rb +++ b/db/migrate/20121030103500_add_skip_missing_email_alert_flag.rb @@ -0,0 +1,...
Add boolean flag for skipping alerts about not having an email address for an operator - to be used when there genuinely isn't an email address to be found.
diff --git a/populus.gemspec b/populus.gemspec index abc1234..def5678 100644 --- a/populus.gemspec +++ b/populus.gemspec @@ -18,7 +18,7 @@ spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_dependency "specinfra" + spec.add_dependency "sshkit" spec.add_d...
Use sshkit rather than specinfra...
diff --git a/postpwn.gemspec b/postpwn.gemspec index abc1234..def5678 100644 --- a/postpwn.gemspec +++ b/postpwn.gemspec @@ -8,8 +8,8 @@ spec.version = Postpwn::VERSION spec.authors = ["TJ Stankus"] spec.email = ["tjstankus@gmail.com"] - spec.summary = %q{A writing tool.} - spec.desc...
Edit gemspec summary and description
diff --git a/app/controllers/neighborly/balanced/bankaccount/accounts_controller.rb b/app/controllers/neighborly/balanced/bankaccount/accounts_controller.rb index abc1234..def5678 100644 --- a/app/controllers/neighborly/balanced/bankaccount/accounts_controller.rb +++ b/app/controllers/neighborly/balanced/bankaccount/ac...
Use bank_account variable on attach new bank account
diff --git a/react-native-google-analytics-bridge.podspec b/react-native-google-analytics-bridge.podspec index abc1234..def5678 100644 --- a/react-native-google-analytics-bridge.podspec +++ b/react-native-google-analytics-bridge.podspec @@ -0,0 +1,33 @@+require "json" + +package = JSON.parse(File.read(File.join(__dir__...
Add podspec so that the library can be installed as a pod
diff --git a/recipes/sysv.rb b/recipes/sysv.rb index abc1234..def5678 100644 --- a/recipes/sysv.rb +++ b/recipes/sysv.rb @@ -6,7 +6,7 @@ template '/etc/init.d/docker' do source "docker.sysv.erb" - mode '0644' + mode '0755' owner 'root' group 'root' not_if 'test -f /etc/init.d/docker'
Fix mode on docker SysV init script
diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb index abc1234..def5678 100644 --- a/app/controllers/admin/pages_controller.rb +++ b/app/controllers/admin/pages_controller.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 class Admin::PagesController < AdminController before_fil...
Expire footer cache when a static page is added
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 @@ -21,9 +21,7 @@ helper_method :current_user def require_staff - if current_user - ...
Fix in the right location
diff --git a/app/roles.rb b/app/roles.rb index abc1234..def5678 100644 --- a/app/roles.rb +++ b/app/roles.rb @@ -6,7 +6,7 @@ # Assuming case-sensitive, case-matched to Discord roles public_roles = [ 'Roleplayers', - 'Safarians' + 'Luchadors' ] command :role, description: "Add or remove a public ...
Replace safarians with luchadors for HWCC
diff --git a/app/decorators/registry_item_decorator.rb b/app/decorators/registry_item_decorator.rb index abc1234..def5678 100644 --- a/app/decorators/registry_item_decorator.rb +++ b/app/decorators/registry_item_decorator.rb @@ -1,9 +1,5 @@ class RegistryItemDecorator < MiqDecorator - def self.fonticon - nil - end...
Use fonticons instead of fileicons in the RegistryItemDecorator
diff --git a/app/mailers/maintenance.rb b/app/mailers/maintenance.rb index abc1234..def5678 100644 --- a/app/mailers/maintenance.rb +++ b/app/mailers/maintenance.rb @@ -3,7 +3,7 @@ def account_removal_warning(user) @user = user - @login_url = new_user_session_path + @login_url = new_user_session_url ...
Use _url, not _path, in mailers
diff --git a/clock.rb b/clock.rb index abc1234..def5678 100644 --- a/clock.rb +++ b/clock.rb @@ -26,6 +26,17 @@ :"sample#active_xfer_count" => active_xfer_count) end + every(15.minutes, "run-scheduled-transfers") do + # This only really needs to run once an hour, but no harm comes + # from ru...
Add scheduled transfer creation to Clockwork
diff --git a/app/models/music_search.rb b/app/models/music_search.rb index abc1234..def5678 100644 --- a/app/models/music_search.rb +++ b/app/models/music_search.rb @@ -6,6 +6,12 @@ belongs_to :result, polymorphic: true def self.search(query) - super.preload(:result).map(&:result) + Rails.cache.fetch([cach...
Add basic caching to results
diff --git a/app/models/user_session.rb b/app/models/user_session.rb index abc1234..def5678 100644 --- a/app/models/user_session.rb +++ b/app/models/user_session.rb @@ -1,13 +1,13 @@ class UserSession < Authlogic::Session::Base - pds_url Settings.login.pds_url - calling_system Settings.login.calling_system + pds_url...
Use the Figs environment variables for the default admins and the AuthPds settings
diff --git a/spec/bipbip/plugin/command_status_spec.rb b/spec/bipbip/plugin/command_status_spec.rb index abc1234..def5678 100644 --- a/spec/bipbip/plugin/command_status_spec.rb +++ b/spec/bipbip/plugin/command_status_spec.rb @@ -5,10 +5,10 @@ describe Bipbip::Plugin::CommandStatus do command = 'echo "foo" > /dev/std...
Use rspec "let" to set test instances
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 @@ -1,6 +1,5 @@ # Spree Configuration SESSION_KEY = '_spree_session_id' -FLAT_SHIPPING_RATE = 10 # applies only to the flat rate shipping option ...
Remove legacy FLAT_SHIPPING_RATE variable (replaced by FlatRateShipping extension)
diff --git a/lib/api_key.rb b/lib/api_key.rb index abc1234..def5678 100644 --- a/lib/api_key.rb +++ b/lib/api_key.rb @@ -1,6 +1,6 @@ module APIKey module ClassMethods - attr_accessor :default_api_key + attr_accessor :api_key end def self.included( klass ) @@ -10,6 +10,6 @@ attr_writer :api_key d...
Refactor default key call to match instance call. The class and instance method names were out of sync. It feels like it should make more sense to make them the same.
diff --git a/config/puma.rb b/config/puma.rb index abc1234..def5678 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -8,8 +8,8 @@ port ENV['PORT'] || 3000 environment ENV['RACK_ENV'] || 'development' -on_worker_boot do +#on_worker_boot do # Worker specific setup for Rails 4.1+ # See: https://devc...
Remove ActiveRecord booter from Puma.rb
diff --git a/config/routes.rb b/config/routes.rb index abc1234..def5678 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,7 @@ namespace :api do namespace :v1 do resources :farms + resources :depots end end resources :farms
Add API route for depot resource.
diff --git a/config/routes.rb b/config/routes.rb index abc1234..def5678 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,12 @@ ) get "/rebuild-healthcheck", to: proc { [200, {}, %w[OK]] } + + get "/healthcheck/live", to: proc { [200, {}, %w[OK]] } + get "/healthcheck/ready", to: GovukHealthc...
Add RFC 141 healthcheck endpoints Once govuk-puppet has been updated, the old endpoint can be removed. See the RFC for more details.
diff --git a/config/routes.rb b/config/routes.rb index abc1234..def5678 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -17,6 +17,7 @@ get :toggle_used get :toggle_interesting get :toggle_visible + resources :comments, only: [:new, :edit, :create, :update, :destroy] end resour...
Add comments resource under idea
diff --git a/corgi.rb b/corgi.rb index abc1234..def5678 100644 --- a/corgi.rb +++ b/corgi.rb @@ -0,0 +1,8 @@+ +# Handle command-line arguments immediately. +if ARGV.size != 1 + puts "Usage: #{__FILE__} path/to/file.cg" + exit +else + path = ARGV.first +end
Read the path as the first command-line argument.
diff --git a/app/controllers/basechurch/v1/announcements_controller.rb b/app/controllers/basechurch/v1/announcements_controller.rb index abc1234..def5678 100644 --- a/app/controllers/basechurch/v1/announcements_controller.rb +++ b/app/controllers/basechurch/v1/announcements_controller.rb @@ -1,3 +1,3 @@ class Basechurc...
Allow unauthenticated users to view bulletin list
diff --git a/app/controllers/corporate_information_pages_controller.rb b/app/controllers/corporate_information_pages_controller.rb index abc1234..def5678 100644 --- a/app/controllers/corporate_information_pages_controller.rb +++ b/app/controllers/corporate_information_pages_controller.rb @@ -3,7 +3,6 @@ def show ...
Remove redundant workaround in CIP controller.
diff --git a/spec/application/commands/dispatcher_spec.rb b/spec/application/commands/dispatcher_spec.rb index abc1234..def5678 100644 --- a/spec/application/commands/dispatcher_spec.rb +++ b/spec/application/commands/dispatcher_spec.rb @@ -0,0 +1,21 @@+require 'spec_helper' +require 'travis/worker/application/commands...
Add basic specs for dispatcher command
diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb index abc1234..def5678 100644 --- a/spec/controllers/comments_controller_spec.rb +++ b/spec/controllers/comments_controller_spec.rb @@ -9,8 +9,9 @@ end it 'does not save a comment without a body' do + ...
Update attributes in post create spec test.
diff --git a/spec/features/visitor_create_contact_spec.rb b/spec/features/visitor_create_contact_spec.rb index abc1234..def5678 100644 --- a/spec/features/visitor_create_contact_spec.rb +++ b/spec/features/visitor_create_contact_spec.rb @@ -5,4 +5,14 @@ visit '/contacts' expect(page).to have_content I18n.t 'co...
Update contact tests (allows a guest to create contact)
diff --git a/stanza-linux.rb b/stanza-linux.rb index abc1234..def5678 100644 --- a/stanza-linux.rb +++ b/stanza-linux.rb @@ -1,4 +1,4 @@-class LbstanzaLinux < Formula +class StanzaLinux < Formula desc "An optionally-typed, general-purpose programming language from the University of California, Berkeley." homepage...
Rename formula to proper class
diff --git a/lib/dc_metro/api_base.rb b/lib/dc_metro/api_base.rb index abc1234..def5678 100644 --- a/lib/dc_metro/api_base.rb +++ b/lib/dc_metro/api_base.rb @@ -20,7 +20,7 @@ req.params = camel_params(params) end end - # TODO Mkae a Response model instead + ...
Fix spelling error in comment
diff --git a/lib/bundler/cli/binstubs.rb b/lib/bundler/cli/binstubs.rb index abc1234..def5678 100644 --- a/lib/bundler/cli/binstubs.rb +++ b/lib/bundler/cli/binstubs.rb @@ -21,7 +21,7 @@ end gems.each do |gem_name| - spec = installer.specs.find {|s| s.name == gem_name } + spec = Bundler.def...
[Binstubs] Update for Installer not inheriting from Environment
diff --git a/activejob/activejob.gemspec b/activejob/activejob.gemspec index abc1234..def5678 100644 --- a/activejob/activejob.gemspec +++ b/activejob/activejob.gemspec @@ -18,5 +18,6 @@ s.files = Dir['CHANGELOG.md', 'MIT-LICENSE', 'README.md', 'lib/**/*'] s.require_path = 'lib' + s.add_dependency 'activ...
[ActiveJob] Add activesupport as dependency [ci skip]
diff --git a/app/helpers/filter_helper.rb b/app/helpers/filter_helper.rb index abc1234..def5678 100644 --- a/app/helpers/filter_helper.rb +++ b/app/helpers/filter_helper.rb @@ -3,26 +3,26 @@ tags = Tag.where(tag_type: tag_type, parent_id: nil) tags_with_labels = tags.map {|tag| [tag.title, tag.tag_id] } - ...
Fix the selected value of filter box when blank When there's no filter applied, the select box should explicitly mark the "All" option as "selected".
diff --git a/app/helpers/emoji_helper.rb b/app/helpers/emoji_helper.rb index abc1234..def5678 100644 --- a/app/helpers/emoji_helper.rb +++ b/app/helpers/emoji_helper.rb @@ -1,13 +1,13 @@ module EmojiHelper - def emojify(content) - h(content).to_str.gsub(/:([\w+-]+):/) do |match| - if emoji = Emoj...
Change emoji size to 64x64
diff --git a/app/helpers/steps_helper.rb b/app/helpers/steps_helper.rb index abc1234..def5678 100644 --- a/app/helpers/steps_helper.rb +++ b/app/helpers/steps_helper.rb @@ -7,7 +7,6 @@ def active_step_for_feature(object, feature_name) object.participatory_process - .includes(:steps) .steps.where(ac...
Remove wrong usage of eager loading
diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb index abc1234..def5678 100644 --- a/app/mailers/admin_mailer.rb +++ b/app/mailers/admin_mailer.rb @@ -6,7 +6,7 @@ def new_profile_confirmed(profile) @profile = profile @url = 'https://github.com/rubymonsters/speakerinnen_liste/wiki/Appro...
Remove one email address and change another
diff --git a/db/migrate/20170822111025_update_buffer_slider_step_size.rb b/db/migrate/20170822111025_update_buffer_slider_step_size.rb index abc1234..def5678 100644 --- a/db/migrate/20170822111025_update_buffer_slider_step_size.rb +++ b/db/migrate/20170822111025_update_buffer_slider_step_size.rb @@ -0,0 +1,18 @@+class ...
Update step size of buffer size sliders
diff --git a/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/style_sheet/fills/fill/pattern_fill.rb b/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/style_sheet/fills/fill/pattern_fill.rb index abc1234..def5678 100644 --- a/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/style_sheet/fi...
Support of OoxmlColor in parse xlsx fg and bg color
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb index abc1234..def5678 100644 --- a/config/initializers/cookies_serializer.rb +++ b/config/initializers/cookies_serializer.rb @@ -1,3 +1,3 @@ # Be sure to restart your server when you modify this file. -Rails.applicatio...
Replace cookie serializer format according to new rails version
diff --git a/samples/shadow_client_samples/samples_shadow_client_getting_started.rb b/samples/shadow_client_samples/samples_shadow_client_getting_started.rb index abc1234..def5678 100644 --- a/samples/shadow_client_samples/samples_shadow_client_getting_started.rb +++ b/samples/shadow_client_samples/samples_shadow_clien...
Add getting started samples file
diff --git a/RNViewShot.podspec b/RNViewShot.podspec index abc1234..def5678 100644 --- a/RNViewShot.podspec +++ b/RNViewShot.podspec @@ -0,0 +1,18 @@+require 'json' +version = JSON.parse(File.read('package.json'))["version"] + +Pod::Spec.new do |s| + + s.name = "RNViewShot" + s.version = version + s...
Add podspec for CocoaPods support
diff --git a/config/environments/development.rb b/config/environments/development.rb index abc1234..def5678 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -29,5 +29,5 @@ config.time_zone = "Eastern Time (US & Canada)" - ENV['SSL_CERT_FILE'] = "/Users/jimmylo/cacert.pe...
Change location of SSL cert file
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb index abc1234..def5678 100644 --- a/config/initializers/carrierwave.rb +++ b/config/initializers/carrierwave.rb @@ -4,6 +4,10 @@ provider: "AWS", aws_access_key_id: ENV["AWS_ACCESS_KEY_ID"], aws_secret_access_key: E...
S3: Support non-AWS object storage for CarrierWave Same changes as for Fog
diff --git a/lib/handlebars_assets.rb b/lib/handlebars_assets.rb index abc1234..def5678 100644 --- a/lib/handlebars_assets.rb +++ b/lib/handlebars_assets.rb @@ -10,7 +10,7 @@ autoload(:Handlebars, 'handlebars_assets/handlebars') autoload(:TiltHandlebars, 'handlebars_assets/tilt_handlebars') - if defined?(Rails)...
Check for Rails 3 features Check for ::Rails::Engine when deciding whether to use the Rails 3 code. This allows projects running Rails 2 + Sprockets to still use handlebars_assets.
diff --git a/share/osxsub.rb b/share/osxsub.rb index abc1234..def5678 100644 --- a/share/osxsub.rb +++ b/share/osxsub.rb @@ -2,8 +2,8 @@ class Osxsub < Formula homepage 'https://github.com/mwunsch/osxsub' - url 'https://github.com/mwunsch/osxsub/tarball/v0.1.2' - sha1 '93c766bfde5aa27c186018d4450c0c41ddae6ffa' +...
Update Homebrew formula for v0.2.0
diff --git a/lib/frecon/request_error.rb b/lib/frecon/request_error.rb index abc1234..def5678 100644 --- a/lib/frecon/request_error.rb +++ b/lib/frecon/request_error.rb @@ -10,34 +10,32 @@ require "json" class RequestError < StandardError + attr_reader :return_value + def initialize(code, message = nil, context = ...
Make RequestErrors a bit more concise. Everything works just the same. Also, this case-when syntax follows [this][styleguide-ref]. [styleguide-ref]: https://github.com/bbatsov/ruby-style-guide/blob/master/README.md#indent-conditional-assignment
diff --git a/lib/hanzo/modules/deploy.rb b/lib/hanzo/modules/deploy.rb index abc1234..def5678 100644 --- a/lib/hanzo/modules/deploy.rb +++ b/lib/hanzo/modules/deploy.rb @@ -25,6 +25,7 @@ def deploy branch = ask "-----> Branch to deploy in #{@env} [HEAD]: " + branch = 'HEAD' if branch.empty? ...
Add default branch to HEAD
diff --git a/lib/mako/commands/new.rb b/lib/mako/commands/new.rb index abc1234..def5678 100644 --- a/lib/mako/commands/new.rb +++ b/lib/mako/commands/new.rb @@ -3,17 +3,25 @@ module Mako class New # Copies template files stored in ../lib/templates to specified directory. + # If the directory specified doesn'...
Create the directory in PATH if it doesn't exist