diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/app/mailers/tip_mailer.rb b/app/mailers/tip_mailer.rb index abc1234..def5678 100644 --- a/app/mailers/tip_mailer.rb +++ b/app/mailers/tip_mailer.rb @@ -6,7 +6,7 @@ @tip = Tip.find(tip_id) @user = @tip.to mail to: @user.email_address, - subject: "#{@tip.from.username} tipped you #{@tip...
Fix subject lines on Tip Emails.
diff --git a/spec/dummy/config/routes.rb b/spec/dummy/config/routes.rb index abc1234..def5678 100644 --- a/spec/dummy/config/routes.rb +++ b/spec/dummy/config/routes.rb @@ -19,6 +19,4 @@ end get '*a' => 'errors#not_found' - - get 'index' => 'simplified_format#index' end
Remove meaningless line that was leftover.
diff --git a/test/integration/default/serverspec/default_spec.rb b/test/integration/default/serverspec/default_spec.rb index abc1234..def5678 100644 --- a/test/integration/default/serverspec/default_spec.rb +++ b/test/integration/default/serverspec/default_spec.rb @@ -25,10 +25,6 @@ it { is_expected.to be_listeni...
Remove the process check because rackup isn't run directly anymore. The important thing is that the app works anyway :)
diff --git a/spec/cask/artifact/binary_spec.rb b/spec/cask/artifact/binary_spec.rb index abc1234..def5678 100644 --- a/spec/cask/artifact/binary_spec.rb +++ b/spec/cask/artifact/binary_spec.rb @@ -55,4 +55,14 @@ Hbc.no_binaries = false end + + it "creates parent directory if it doesn't exist" do + FileUtil...
Add test for creating binarydir if it doesn't exist
diff --git a/spec/ci/reporter/cucumber_spec.rb b/spec/ci/reporter/cucumber_spec.rb index abc1234..def5678 100644 --- a/spec/ci/reporter/cucumber_spec.rb +++ b/spec/ci/reporter/cucumber_spec.rb @@ -0,0 +1,10 @@+# (c) Copyright 2006-2008 Nick Sieger <nicksieger@gmail.com> +# See the file LICENSE.txt included with the dis...
Add in a place to stick specs for the Cucumber integration.
diff --git a/spec/output_context_spec.rb b/spec/output_context_spec.rb index abc1234..def5678 100644 --- a/spec/output_context_spec.rb +++ b/spec/output_context_spec.rb @@ -0,0 +1,26 @@+require "spec_helper" + +describe Yarrow::Output::Context do + let(:context_hash) do + Yarrow::Output::Context.new(number: 99, tex...
Test dynamic accessor generation for output context class
diff --git a/spec/rspec_matchers_spec.rb b/spec/rspec_matchers_spec.rb index abc1234..def5678 100644 --- a/spec/rspec_matchers_spec.rb +++ b/spec/rspec_matchers_spec.rb @@ -0,0 +1,28 @@+require 'spec_helper' +require 'govuk-content-schema-test-helpers/rspec_matchers' + +describe GovukContentSchemaTestHelpers::RSpecMatc...
Add test for RSpec matcher Our custom matcher doesn't have a test. This commit fixes that so we can confidently work on it.
diff --git a/lib/sequelizer/connection_maker.rb b/lib/sequelizer/connection_maker.rb index abc1234..def5678 100644 --- a/lib/sequelizer/connection_maker.rb +++ b/lib/sequelizer/connection_maker.rb @@ -22,7 +22,12 @@ # Returns a Sequel connection to the database def connection - Sequel.connect(options.to...
Use URI/URL as a string in Sequel.connect
diff --git a/spec/support/bad_tests.rb b/spec/support/bad_tests.rb index abc1234..def5678 100644 --- a/spec/support/bad_tests.rb +++ b/spec/support/bad_tests.rb @@ -27,7 +27,7 @@ duration = Time.zone.now - config.start_time average = duration / examples - if duration > 2.minutes || average > 0.25 + ...
Increase test memory limit to stop random failures
diff --git a/spec/xml/encoding_spec.rb b/spec/xml/encoding_spec.rb index abc1234..def5678 100644 --- a/spec/xml/encoding_spec.rb +++ b/spec/xml/encoding_spec.rb @@ -10,12 +10,24 @@ it "should output those characters as input via methods" do res = TestResult.new res.message = "sadfk одловыа jjklsd " #r...
Expand on encoding spec a bit to accomodate libxml idosyncracies
diff --git a/app/jobs/update_cocoa_pod_from_github_job.rb b/app/jobs/update_cocoa_pod_from_github_job.rb index abc1234..def5678 100644 --- a/app/jobs/update_cocoa_pod_from_github_job.rb +++ b/app/jobs/update_cocoa_pod_from_github_job.rb @@ -1,7 +1,7 @@ class UpdateCocoaPodFromGithubJob def run github_updater = ...
Use batch find in job.
diff --git a/app/models/concerns/setup/namespace_named.rb b/app/models/concerns/setup/namespace_named.rb index abc1234..def5678 100644 --- a/app/models/concerns/setup/namespace_named.rb +++ b/app/models/concerns/setup/namespace_named.rb @@ -6,6 +6,9 @@ include CustomTitle included do + + build_in_data_t...
Update | Default namespace label for build-in types
diff --git a/app/models/renalware/patients/worry_query.rb b/app/models/renalware/patients/worry_query.rb index abc1234..def5678 100644 --- a/app/models/renalware/patients/worry_query.rb +++ b/app/models/renalware/patients/worry_query.rb @@ -13,7 +13,7 @@ def call search .result - .inc...
Resolve Worryboard list N+1 issues
diff --git a/lib/cms/hippo_importer/about_us.rb b/lib/cms/hippo_importer/about_us.rb index abc1234..def5678 100644 --- a/lib/cms/hippo_importer/about_us.rb +++ b/lib/cms/hippo_importer/about_us.rb @@ -2,7 +2,7 @@ module HippoImporter class AboutUs < CorporatePage def hippo_type - 'contentauthoringw...
Fix hippo type name on about us class
diff --git a/lib/amistad/config.rb b/lib/amistad/config.rb index abc1234..def5678 100644 --- a/lib/amistad/config.rb +++ b/lib/amistad/config.rb @@ -11,11 +11,11 @@ end def friendship_model - "#{self.friend_model}Friendship" + "Friendship" end def friendship_class - Amistad::Friend...
Add support to namespaced friend model This commit only removes the unecessary dependency of model naming. It's uneeded to have a friendship_model dependent on friend_model's name, since it brings problems with namespaced models (e.g. 'User::Profile').
diff --git a/lib/ansible/runner.rb b/lib/ansible/runner.rb index abc1234..def5678 100644 --- a/lib/ansible/runner.rb +++ b/lib/ansible/runner.rb @@ -3,6 +3,22 @@ class << self def run(env_vars, extra_vars, playbook_path) run_via_cli(env_vars, extra_vars, playbook_path) + end + + def run_qu...
Add a method to queue an Ansible::Runner.run This adds a way to queue an Ansible::Runner.run and wraps it in a task so that it can be invoked asynchronously from automate.
diff --git a/lib/healthcheck/s3.rb b/lib/healthcheck/s3.rb index abc1234..def5678 100644 --- a/lib/healthcheck/s3.rb +++ b/lib/healthcheck/s3.rb @@ -0,0 +1,16 @@+module Healthcheck + class S3 + def name + :s3 + end + + def status + connection = S3FileUploader.connection + connection.directories...
Add AWS S3 healthcheck module This will be required for the AWS S3 healthcheck.
diff --git a/lib/tasks/lucene.rake b/lib/tasks/lucene.rake index abc1234..def5678 100644 --- a/lib/tasks/lucene.rake +++ b/lib/tasks/lucene.rake @@ -7,20 +7,19 @@ source = File.read(file). gsub(/\n\s*/, ''). # Our JS multiline string implementation :-p gsub(/\/\*.*?\*\//, '') # And st...
Refactor design document creation/update using CouchRest::Design
diff --git a/lib/kosmos/packages/firespitter.rb b/lib/kosmos/packages/firespitter.rb index abc1234..def5678 100644 --- a/lib/kosmos/packages/firespitter.rb +++ b/lib/kosmos/packages/firespitter.rb @@ -0,0 +1,8 @@+class Firespitter < Kosmos::Package + title 'Firespitter' + url 'http://addons.cursecdn.com/files/2202/68...
Add a package for Firespitter.
diff --git a/lib/str_sanitizer/html_entities.rb b/lib/str_sanitizer/html_entities.rb index abc1234..def5678 100644 --- a/lib/str_sanitizer/html_entities.rb +++ b/lib/str_sanitizer/html_entities.rb @@ -20,12 +20,15 @@ # # Params: # +str+:: A +string+ which needs to be escaped from html entities + # +opt...
Add 'options' param to the html_encode method
diff --git a/test/integration/name_controller_supplemental_test.rb b/test/integration/name_controller_supplemental_test.rb index abc1234..def5678 100644 --- a/test/integration/name_controller_supplemental_test.rb +++ b/test/integration/name_controller_supplemental_test.rb @@ -0,0 +1,18 @@+require "test_helper" + +# Tes...
Write test which fails when `:mailing_address` in email tracking template. When tracking email is received, `:mailing_address` will be interpreted as **recipient's** address, asking her to send a specimen to herself.
diff --git a/lib/dossier/result.rb b/lib/dossier/result.rb index abc1234..def5678 100644 --- a/lib/dossier/result.rb +++ b/lib/dossier/result.rb @@ -51,8 +51,20 @@ end result_row.each_with_index.map do |field, i| - method = "format_#{headers[i]}" - report.respond_to?(method) ? repor...
Send the row to the formatter if it expects it
diff --git a/cookbooks/chef/attributes/default.rb b/cookbooks/chef/attributes/default.rb index abc1234..def5678 100644 --- a/cookbooks/chef/attributes/default.rb +++ b/cookbooks/chef/attributes/default.rb @@ -5,7 +5,7 @@ default[:chef][:server][:version] = "12.0.8-1" # Set the default client version -default[:chef][...
Update chef client to 12.6.0
diff --git a/lib/masamune/tasks/hive_thor.rb b/lib/masamune/tasks/hive_thor.rb index abc1234..def5678 100644 --- a/lib/masamune/tasks/hive_thor.rb +++ b/lib/masamune/tasks/hive_thor.rb @@ -13,6 +13,7 @@ desc 'hive', 'Launch a Hive session' method_option :file, :aliases => '-f', :desc => 'SQL from files' m...
Add option for specifying hive output file
diff --git a/lib/specinfra/command/fedora.rb b/lib/specinfra/command/fedora.rb index abc1234..def5678 100644 --- a/lib/specinfra/command/fedora.rb +++ b/lib/specinfra/command/fedora.rb @@ -1,50 +1,28 @@ module SpecInfra module Command - class Fedora < Linux - def check_access_by_user(file, user, access) - ...
Support SysV for Fedora 14 and under and share common functions with RedHat
diff --git a/lib/attache/job.rb b/lib/attache/job.rb index abc1234..def5678 100644 --- a/lib/attache/job.rb +++ b/lib/attache/job.rb @@ -5,7 +5,9 @@ config = Attache::VHost.new(env) config.send(method, args.symbolize_keys) rescue Exception - puts "[JOB] #{$!}", $@ + Attache.logger.error $@ + Attach...
Improve logging on error; also, add retry config in case of uncaught exception
diff --git a/lib/istwox/issn.rb b/lib/istwox/issn.rb index abc1234..def5678 100644 --- a/lib/istwox/issn.rb +++ b/lib/istwox/issn.rb @@ -0,0 +1,73 @@+module Istwox + class ISSN + attr_accessor :code, :original, :ponderated, :check_digit + + NB_CHAR = 8 + PRIME_NUMBER = 11 + + def ini...
Create firt version of ISSN class
diff --git a/backup.rb b/backup.rb index abc1234..def5678 100644 --- a/backup.rb +++ b/backup.rb @@ -34,9 +34,9 @@ if board_to_archive != -1 puts "Would you like to provide a filename? (y/n)" - response = gets.downcase - - if response=="y" + response = gets.downcase.chomp + + if response.to_s =="y" puts "Enter...
Fix code to chomp user input correctly so that it doesn't include newline
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index abc1234..def5678 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -4,17 +4,19 @@ @trail = Trail.find(params[:trail_id]) @comment = Comment.new if request.xh...
Include logic for ajax request on comment submission
diff --git a/lib/reel/server.rb b/lib/reel/server.rb index abc1234..def5678 100644 --- a/lib/reel/server.rb +++ b/lib/reel/server.rb @@ -11,6 +11,7 @@ def initialize(host, port, backlog = DEFAULT_BACKLOG, &callback) # This is actually an evented Celluloid::IO::TCPServer @server = TCPServer.new(host, p...
Disable Nagle's algorithm by default.
diff --git a/lib/citibike_trips.rb b/lib/citibike_trips.rb index abc1234..def5678 100644 --- a/lib/citibike_trips.rb +++ b/lib/citibike_trips.rb @@ -3,15 +3,17 @@ require 'citibike_trips/stations' require 'citibike_trips/trip' require 'citibike_trips/trips' -require 'highline/import' +require 'highline' require 'mec...
Allow user to change prompting file descriptor Primarily useful if the user wants to be prompted on stderr instead of stdout, if stdout is redirected to a file for example.
diff --git a/lib/cucumber/rails.rb b/lib/cucumber/rails.rb index abc1234..def5678 100644 --- a/lib/cucumber/rails.rb +++ b/lib/cucumber/rails.rb @@ -20,3 +20,24 @@ World(Cucumber::Rails::World) +ActionController::Base.class_eval do + cattr_accessor :allow_rescue +end + +ActionDispatch::ShowExceptions.class_eval do...
Allow user to control show_exceptions in tests
diff --git a/lib/models_watcher.rb b/lib/models_watcher.rb index abc1234..def5678 100644 --- a/lib/models_watcher.rb +++ b/lib/models_watcher.rb @@ -28,8 +28,7 @@ module InstanceMethods def update_changes_to_apply - Configuration.changes_to_apply = true - Configuration.save! + Configuration.firs...
Speed up the attribute update
diff --git a/lib/onebox/preview.rb b/lib/onebox/preview.rb index abc1234..def5678 100644 --- a/lib/onebox/preview.rb +++ b/lib/onebox/preview.rb @@ -1,6 +1,5 @@ require_relative "preview/example" require_relative "preview/amazon" - module Onebox class Preview @@ -12,8 +11,8 @@ def to_s case @url - ...
Indent case as deep as when
diff --git a/lib/tasks/router.rake b/lib/tasks/router.rake index abc1234..def5678 100644 --- a/lib/tasks/router.rake +++ b/lib/tasks/router.rake @@ -22,6 +22,7 @@ %w(/homepage exact), %w(/tour exact), %w(/ukwelcomes exact), + %w(/visas-immigration exact), ] routes << %w(/oil-and-gas p...
Make sure /visas-immigration is added to the Router Unfinished business from #508
diff --git a/lib/tasks/topics.rake b/lib/tasks/topics.rake index abc1234..def5678 100644 --- a/lib/tasks/topics.rake +++ b/lib/tasks/topics.rake @@ -21,7 +21,7 @@ [Announcement, Publicationesque].each do |edition_type| logger.info "-- Associating #{edition_type.name.downcase.pluralize} directly with polici...
Remove includes as it's buggy @heathd and I have dug into this more - when using `includes(:policy_topics)` the `class_name` directive for the association isn't used, which causes this to load WorldwidePriority objects instead of the Policy objects we actually wanted. Removing this will make the query slower but won'...
diff --git a/lib/when_committed.rb b/lib/when_committed.rb index abc1234..def5678 100644 --- a/lib/when_committed.rb +++ b/lib/when_committed.rb @@ -12,7 +12,7 @@ end def when_committed!(&block) - if self.connection.open_transactions > 0 + if self.class.connection.open_transactions > 0 whe...
Fix method removed in rails 4 ActiveRecord::Base#connection was removed in rails 4; we need to access the database connection from the class instead of the instance.
diff --git a/lib/abcing/scanner.rb b/lib/abcing/scanner.rb index abc1234..def5678 100644 --- a/lib/abcing/scanner.rb +++ b/lib/abcing/scanner.rb @@ -6,29 +6,38 @@ end def results - # p class_names contents(app_files) - p app_class_names - # { test_scan_results: [], - # app_letter_matche...
Fix up test class name finding to be based on app classes previously found
diff --git a/lib/backlogjp/base.rb b/lib/backlogjp/base.rb index abc1234..def5678 100644 --- a/lib/backlogjp/base.rb +++ b/lib/backlogjp/base.rb @@ -34,7 +34,7 @@ attributes = self.class.instance_variable_get(:@attributes) attributes.each do |var| - instance_variable_set(:"@#{var}", hash[var.to_s]...
Allow symbol-keyed hashes in creating objects
diff --git a/lib/filmbuff/title.rb b/lib/filmbuff/title.rb index abc1234..def5678 100644 --- a/lib/filmbuff/title.rb +++ b/lib/filmbuff/title.rb @@ -4,16 +4,16 @@ :poster_url, :genres, :release_date def initialize(options = {}) - @imdb_id = options["tconst"] - @title = options["title"] - @ta...
Replace double quotes with single quotes
diff --git a/lib/kosmos/web/app.rb b/lib/kosmos/web/app.rb index abc1234..def5678 100644 --- a/lib/kosmos/web/app.rb +++ b/lib/kosmos/web/app.rb @@ -18,6 +18,10 @@ post '/' do Kosmos.configure do |config| config.output_method = Proc.new do |str| + # Send to STDOUT + puts ...
Send Util.log to both STDOUT and UI when in server mode.
diff --git a/lib/logsaber/entry.rb b/lib/logsaber/entry.rb index abc1234..def5678 100644 --- a/lib/logsaber/entry.rb +++ b/lib/logsaber/entry.rb @@ -46,20 +46,21 @@ secondary.map{|item| analyze item }.join ' | ' end - def analyze object - object.is_a?(String) ? object : object.inspect + def view...
Improve handling of nil and empty objects. - Numeric#to_s or #inspect looks the same, so don't bother distinguishing - Realized nil.to_s gives an empty string, which is not helpful, nil.inspect actually tells us we're nil - Since we always want to inspect empty Strings, we can reuse the code for both view and an...
diff --git a/lib/lita-pagerduty.rb b/lib/lita-pagerduty.rb index abc1234..def5678 100644 --- a/lib/lita-pagerduty.rb +++ b/lib/lita-pagerduty.rb @@ -1,7 +1,7 @@ require 'lita' Lita.load_locales Dir[File.expand_path( - File.join('..', '..', 'locales', '*.yml'), __FILE__ + File.join('..', '..', 'locales', '*.yml')...
Remove extra spacing to get the build passing
diff --git a/spec/shard_monitor/config_spec.rb b/spec/shard_monitor/config_spec.rb index abc1234..def5678 100644 --- a/spec/shard_monitor/config_spec.rb +++ b/spec/shard_monitor/config_spec.rb @@ -4,7 +4,7 @@ RSpec.describe ShardMonitor::Config do subject { ShardMonitor::Config.new } - let(:argv) { %w(--redis red...
Fix config spec for table name
diff --git a/spec/shared/operation_behavior.rb b/spec/shared/operation_behavior.rb index abc1234..def5678 100644 --- a/spec/shared/operation_behavior.rb +++ b/spec/shared/operation_behavior.rb @@ -4,7 +4,9 @@ end it 'is idempotent on equivalency' do - should eql(instance_eval(&self.class.subject)) + first ...
Update shared spec to fit into newest rspec api
diff --git a/spec/unit/recipes/default_spec.rb b/spec/unit/recipes/default_spec.rb index abc1234..def5678 100644 --- a/spec/unit/recipes/default_spec.rb +++ b/spec/unit/recipes/default_spec.rb @@ -3,7 +3,7 @@ platforms = [ { platform: 'debian', - version: '9.3', + version: '9', package: 'cron', },...
Update specs for newer platforms Signed-off-by: Tim Smith <764ef62106582a09ed09dfa0b6bff7c05fd7d1e4@chef.io>
diff --git a/spec/unit/recipes/default_spec.rb b/spec/unit/recipes/default_spec.rb index abc1234..def5678 100644 --- a/spec/unit/recipes/default_spec.rb +++ b/spec/unit/recipes/default_spec.rb @@ -2,8 +2,8 @@ describe 'default recipe' do let(:chef_run) do - runner = ChefSpec::ServerRunner.new(platform: 'ubuntu'...
Test the correct recipe and test on RHEL not Ubuntu Signed-off-by: Tim Smith <764ef62106582a09ed09dfa0b6bff7c05fd7d1e4@chef.io>
diff --git a/vmdb/app/models/file_depot_smb.rb b/vmdb/app/models/file_depot_smb.rb index abc1234..def5678 100644 --- a/vmdb/app/models/file_depot_smb.rb +++ b/vmdb/app/models/file_depot_smb.rb @@ -5,7 +5,7 @@ def self.validate_settings(settings) res = MiqSmbSession.new(settings).verify - raise "Log Depot Se...
Fix the log message about depot settings. Which is used by both log depot and DB backup. https://bugzilla.redhat.com/show_bug.cgi?id=1173213
diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake index abc1234..def5678 100644 --- a/lib/tasks/assets.rake +++ b/lib/tasks/assets.rake @@ -0,0 +1,50 @@+require 'active_support/ordered_options' + +namespace :half_pipe do + + half_pipe = ActiveSupport::OrderedOptions.new + + task :clean do + Rake::Task["ha...
Add rake tasks for great deployments
diff --git a/lib/valanga/client.rb b/lib/valanga/client.rb index abc1234..def5678 100644 --- a/lib/valanga/client.rb +++ b/lib/valanga/client.rb @@ -7,7 +7,7 @@ LOGIN_PAGE = "https://p.eagate.573.jp/gate/p/login.html" - attr_reader :session + attr_reader :session, :pages def initialize(username, p...
Add `@page` instance * to cache the music info page url
diff --git a/db/data_migration/20170628130725_redirect_organisations_to_slash_world.rb b/db/data_migration/20170628130725_redirect_organisations_to_slash_world.rb index abc1234..def5678 100644 --- a/db/data_migration/20170628130725_redirect_organisations_to_slash_world.rb +++ b/db/data_migration/20170628130725_redirect...
Add migration to redirect organisations Currently a finder exists at /government/world/organisations. We are moving all things under /goverment/world to /world. As such we must send a redirect to the Publishing Api so that /government/world/organisations redirects to /world/organisations
diff --git a/app/models/spree/order_updater_decorator.rb b/app/models/spree/order_updater_decorator.rb index abc1234..def5678 100644 --- a/app/models/spree/order_updater_decorator.rb +++ b/app/models/spree/order_updater_decorator.rb @@ -0,0 +1,6 @@+Spree::OrderUpdater.class_eval do + # Override spree method to make it...
Make OrderUpdate update all adjustments again as in v2.0.4 otherwise adjustments that are not shipment adjustments will not be calculated correctly
diff --git a/lib/bencode/parser.rb b/lib/bencode/parser.rb index abc1234..def5678 100644 --- a/lib/bencode/parser.rb +++ b/lib/bencode/parser.rb @@ -7,11 +7,14 @@ end def self.parse(scanner) - new(scanner).parse! + val = new(scanner).parse! + + raise BEncode::DecodeError if val.nil? + + r...
Move error handling up in the call chain
diff --git a/spec/dcell/node_spec.rb b/spec/dcell/node_spec.rb index abc1234..def5678 100644 --- a/spec/dcell/node_spec.rb +++ b/spec/dcell/node_spec.rb @@ -2,6 +2,8 @@ describe DCell::Node do before do + fail "testing that failed tests break the build on travis" + @node = DCell::Node['test_node'] @no...
Test failed builds on Travis
diff --git a/spec/is_crawler_spec.rb b/spec/is_crawler_spec.rb index abc1234..def5678 100644 --- a/spec/is_crawler_spec.rb +++ b/spec/is_crawler_spec.rb @@ -1,12 +1,50 @@ describe IsCrawler do + let(:user_agent) { "Commodo Vestibulum/1.0" } describe '#is_any_crawler?' do - let(:user_agent) { "Commodo Vestibulum/...
Add more test coverage for is_crawler.rb
diff --git a/mixlib-config.gemspec b/mixlib-config.gemspec index abc1234..def5678 100644 --- a/mixlib-config.gemspec +++ b/mixlib-config.gemspec @@ -14,7 +14,8 @@ "LICENSE", "README.md" ] - s.files = [ "LICENSE", "NOTICE", "README.md", "Gemfile", "Rakefile" ] + Dir.glob("{lib,spec}/**/*") + s.files = [ "L...
Add gemspec files to allow bundler to run from the gem
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index abc1234..def5678 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -9,7 +9,7 @@ end def home_page_title - if @current_user.unread_count > 0 + if @current_user and @current_user...
Fix maintenance page not working
diff --git a/app/controllers/tips_controller.rb b/app/controllers/tips_controller.rb index abc1234..def5678 100644 --- a/app/controllers/tips_controller.rb +++ b/app/controllers/tips_controller.rb @@ -25,6 +25,7 @@ end def edit + redirect_to tip_path(@tip), alert: "That's not yours to edit!" unless can? :upda...
Fix security issue with updating and deleting other users tips
diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb index abc1234..def5678 100644 --- a/app/policies/application_policy.rb +++ b/app/policies/application_policy.rb @@ -62,9 +62,9 @@ teacher? && user.as_teacher end - # def student - # student? && user.as_student - # end + ...
Fix time table for students
diff --git a/lib/mumukit/runner.rb b/lib/mumukit/runner.rb index abc1234..def5678 100644 --- a/lib/mumukit/runner.rb +++ b/lib/mumukit/runner.rb @@ -33,6 +33,7 @@ [Mumukit::Directives::Sections.new, Mumukit::Directives::Interpolations.new('test'), Mumukit::Directives::Interpolations.ne...
Add content interpolation directive to pipeline
diff --git a/multi_json.gemspec b/multi_json.gemspec index abc1234..def5678 100644 --- a/multi_json.gemspec +++ b/multi_json.gemspec @@ -1,20 +1,20 @@ # coding: utf-8 -require File.expand_path('../lib/multi_json/version.rb', __FILE__) +require File.expand_path("../lib/multi_json/version.rb", __FILE__) Gem::Specifica...
Tidy up gemspec a bit
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index abc1234..def5678 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -1,3 +1,4 @@+ class PagesController < ApplicationController include HighVoltage::StaticPage @@ -6,11 +7,6 @@ ...
Switch to using nav on home page.
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index abc1234..def5678 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -23,8 +23,10 @@ return end - UserFetchJob.perform_later(@organization.id) - @organization.update(...
Migrate from Sidekiq to Java worker
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index abc1234..def5678 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -16,7 +16,7 @@ def show @user = User.find(session[:user_id]) @topics = @user.topics - redirect_to new...
Fix redirect path if a user has no topics
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index abc1234..def5678 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -17,6 +17,7 @@ end def show + @user = User.find_by(id:) user_params[:id] end def update @@ -32,4 +...
Create action for user show
diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index abc1234..def5678 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -2,13 +2,28 @@ def create @vote = Vote.new(vote_params) - @question = Question.find(params[:vote][:votab...
Update votes controller to handle question voting and response voting on create action
diff --git a/lib/timecrunch/cli.rb b/lib/timecrunch/cli.rb index abc1234..def5678 100644 --- a/lib/timecrunch/cli.rb +++ b/lib/timecrunch/cli.rb @@ -5,7 +5,7 @@ desc "start MINUTES", "Starts a new timer for MINUTES" option :s, :banner => "seconds" - def start(minutes) + def start(minutes=0) seco...
Add default 0 minutes if minutes aren't supplied It would be convenient to not have to include minutes if all you want is just to use the seconds argument.
diff --git a/cookbooks/universe_ubuntu/test/recipes/default_test.rb b/cookbooks/universe_ubuntu/test/recipes/default_test.rb index abc1234..def5678 100644 --- a/cookbooks/universe_ubuntu/test/recipes/default_test.rb +++ b/cookbooks/universe_ubuntu/test/recipes/default_test.rb @@ -29,7 +29,7 @@ end end -describe fi...
Use relative path on integration test
diff --git a/test/test_name_br.rb b/test/test_name_br.rb index abc1234..def5678 100644 --- a/test/test_name_br.rb +++ b/test/test_name_br.rb @@ -8,7 +8,7 @@ end def test_name - assert_match(/\A[[:alpha:]]+ [[:alpha:]]+\z/, @tester.name) + assert_match(/\A[a-zA-ZéúôóíáÍã\s]+\z/, @tester.name) end de...
Fix regexp for NameBR tests
diff --git a/simplecov-html.gemspec b/simplecov-html.gemspec index abc1234..def5678 100644 --- a/simplecov-html.gemspec +++ b/simplecov-html.gemspec @@ -11,9 +11,10 @@ s.homepage = "https://github.com/colszowka/simplecov-html" s.summary = %Q{Default HTML formatter for SimpleCov code coverage tool for ruby 1...
Add license to gemspec, is MIT
diff --git a/light-service.gemspec b/light-service.gemspec index abc1234..def5678 100644 --- a/light-service.gemspec +++ b/light-service.gemspec @@ -21,5 +21,5 @@ gem.add_development_dependency("rspec", "~> 3.0") gem.add_development_dependency("rspec-its", "~> 1.0") gem.add_development_dependency("simplecov", "...
Use a newer version of pry
diff --git a/db/migrate/013_create_track_artists.rb b/db/migrate/013_create_track_artists.rb index abc1234..def5678 100644 --- a/db/migrate/013_create_track_artists.rb +++ b/db/migrate/013_create_track_artists.rb @@ -0,0 +1,14 @@+class CreateTrackArtists < ActiveRecord::Migration[4.2] + def self.up + create_table :...
Add migrations that create track_artists table
diff --git a/app/services/nomis/prisoner_detailed_availability.rb b/app/services/nomis/prisoner_detailed_availability.rb index abc1234..def5678 100644 --- a/app/services/nomis/prisoner_detailed_availability.rb +++ b/app/services/nomis/prisoner_detailed_availability.rb @@ -21,6 +21,7 @@ end def error_messages...
Add sentry extra debugging for an issue There is an error reported infruenquently with prisoner detailed availability where one of the requested dates appears to not be on the response. When checking, it appears to be fine so hopefully this will let us know what exactly is going on next time the error happens.
diff --git a/validates_email_format_of.gemspec b/validates_email_format_of.gemspec index abc1234..def5678 100644 --- a/validates_email_format_of.gemspec +++ b/validates_email_format_of.gemspec @@ -11,7 +11,6 @@ s.email = ['code@dunae.ca', 'iybetesh@gmail.com'] s.homepage = 'https://github.com/validate...
Drop now-unused directive from gemspec The test_files directive is no longer used by RubyGems.org.
diff --git a/NSObject-SafeExpectations.podspec b/NSObject-SafeExpectations.podspec index abc1234..def5678 100644 --- a/NSObject-SafeExpectations.podspec +++ b/NSObject-SafeExpectations.podspec @@ -5,7 +5,7 @@ s.homepage = "https://github.com/wordpress-mobile/NSObject-SafeExpectations" s.license = { :type ...
Fix pod spec version reference.
diff --git a/partials/_rspec.rb b/partials/_rspec.rb index abc1234..def5678 100644 --- a/partials/_rspec.rb +++ b/partials/_rspec.rb @@ -3,7 +3,8 @@ remove_dir 'test' run "#{@rvm} exec rails generate rspec:install" +copy_static_file 'spec/spec_helper.rb' git :add => '.' git :commit => "-aqm 'Configured RSpec.'" ...
Copy spec/spec_helper.rb to the project.
diff --git a/flip_fab.gemspec b/flip_fab.gemspec index abc1234..def5678 100644 --- a/flip_fab.gemspec +++ b/flip_fab.gemspec @@ -23,4 +23,6 @@ spec.add_development_dependency 'rspec' spec.add_development_dependency 'rutabaga' spec.add_development_dependency 'timecop' + + spec.add_development_dependency 'ruboco...
Add rubocop gem for development
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index abc1234..def5678 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -1,11 +1,5 @@ class AdminController < ApplicationController layout "admin" - - # Don't serve admin assets from t...
Revert "Don’t serve admin assets from the CDN" The intention was to only affect admin pages, but in production-like environments it also broke assets on the frontend. For now, we'll live with the bug for respond.js and IE<9, until we have switched the frontend to a finder. This reverts commit 4396cc8e0c6477e9ca794ce...
diff --git a/app/controllers/auth0_controller.rb b/app/controllers/auth0_controller.rb index abc1234..def5678 100644 --- a/app/controllers/auth0_controller.rb +++ b/app/controllers/auth0_controller.rb @@ -1,7 +1,15 @@ class Auth0Controller < ApplicationController - def callback +def callback + # This stores all the...
Add the shell for the code that will hand the success and failure of the callback
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index abc1234..def5678 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -27,6 +27,6 @@ protected def user_params - params.require(:user).permit(:email, :admin, :name, :roles, :de...
Remove :admin key in param to stop Brakeman warning The issue that brakeman was complaining about is that admin was being allowed in .permit in the users_controller.rb. I think this was a mistake in that these params are only used on to update a user and the form that controls this has no :admin value to return. A co...
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index abc1234..def5678 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3,7 +3,7 @@ before_action :authenticate_user! def dashboard - flash.notice = "Welcome #{current_user.emai...
Fix User Controller to make user_sign_up_spec test pass
diff --git a/lib/rightscale_cli/monkey_patches/client_attributes.rb b/lib/rightscale_cli/monkey_patches/client_attributes.rb index abc1234..def5678 100644 --- a/lib/rightscale_cli/monkey_patches/client_attributes.rb +++ b/lib/rightscale_cli/monkey_patches/client_attributes.rb @@ -15,6 +15,7 @@ # limitations under the L...
Add missing class header comment.
diff --git a/week-5/nums-commas/my_solution.rb b/week-5/nums-commas/my_solution.rb index abc1234..def5678 100644 --- a/week-5/nums-commas/my_solution.rb +++ b/week-5/nums-commas/my_solution.rb @@ -1,3 +1,4 @@+=begin # Numbers to Commas Solo Challenge # I spent [] hours on this challenge. @@ -9,13 +10,39 @@ # 0. Pse...
Complete pseudocode and begin initial solution
diff --git a/CoreDataHelper.podspec b/CoreDataHelper.podspec index abc1234..def5678 100644 --- a/CoreDataHelper.podspec +++ b/CoreDataHelper.podspec @@ -4,6 +4,7 @@ s.summary = "A series of helper methods for managing your core data context as well as selecting, inserting, deleting, and sorting" s.license...
Add missing required homepage attribute
diff --git a/app/reports/asset_subtype_report.rb b/app/reports/asset_subtype_report.rb index abc1234..def5678 100644 --- a/app/reports/asset_subtype_report.rb +++ b/app/reports/asset_subtype_report.rb @@ -24,7 +24,7 @@ subtypes.each do |x| count = organization.assets.where("asset_subtype_id = ?", x.id).cou...
Remove blank lines from asset subtype report
diff --git a/config.ru b/config.ru index abc1234..def5678 100644 --- a/config.ru +++ b/config.ru @@ -26,4 +26,14 @@ t.complete end -run Bumbleworks::Gui::RackApp +if ENV['MOUNT_AT'] + app = Rack::Builder.new do + map ENV['MOUNT_AT'] do + run Bumbleworks::Gui::RackApp + end + end + run app +else + ru...
Enable mounting manual testing server at path (Use the MOUNT_AT env variable when launching the server)
diff --git a/app/serializers/movie_serializer.rb b/app/serializers/movie_serializer.rb index abc1234..def5678 100644 --- a/app/serializers/movie_serializer.rb +++ b/app/serializers/movie_serializer.rb @@ -1,3 +1,4 @@ class MovieSerializer < ActiveModel::Serializer attributes :id, :title, :gross, :release_date, :mpaa...
Add has_many reviews to movie serializer so child reviews show up in reviews index json response
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb index abc1234..def5678 100644 --- a/app/controllers/events_controller.rb +++ b/app/controllers/events_controller.rb @@ -1,7 +1,7 @@ class EventsController < ApplicationController - before_action :load_community, only: [:index, ...
Modify wording from 'load' to 'set'
diff --git a/app/controllers/rss_controller.rb b/app/controllers/rss_controller.rb index abc1234..def5678 100644 --- a/app/controllers/rss_controller.rb +++ b/app/controllers/rss_controller.rb @@ -9,7 +9,7 @@ # rss filter ads = Ad ads = params[:type] == 'want' ? ads.want : ads.give - ads = ads.where(wo...
Use helper for filtering by woeid
diff --git a/examples/blink_led.rb b/examples/blink_led.rb index abc1234..def5678 100644 --- a/examples/blink_led.rb +++ b/examples/blink_led.rb @@ -1,7 +1,7 @@ require 'bundler/setup' require 'firmata' -board = Firmata::Board.new('/dev/tty.usbmodemfd13131') +board = Firmata::Board.new('/dev/tty.usbmodemfa131') b...
Use correct serialport for demo.
diff --git a/features/step_definitions/antivirus_steps.rb b/features/step_definitions/antivirus_steps.rb index abc1234..def5678 100644 --- a/features/step_definitions/antivirus_steps.rb +++ b/features/step_definitions/antivirus_steps.rb @@ -8,8 +8,10 @@ s3 = Aws::S3::Resource.new(region: 'eu-west-1') # actual region...
antivirus: PUT file with "bucket-owner-full-control" acl
diff --git a/app/models/commit_monitor_repo.rb b/app/models/commit_monitor_repo.rb index abc1234..def5678 100644 --- a/app/models/commit_monitor_repo.rb +++ b/app/models/commit_monitor_repo.rb @@ -3,6 +3,27 @@ validates :name, :presence => true, :uniqueness => true validates :path, :presence => true, :uniqueness...
Add helper method for adding a new github based repo.
diff --git a/app/models/concerns/searchable.rb b/app/models/concerns/searchable.rb index abc1234..def5678 100644 --- a/app/models/concerns/searchable.rb +++ b/app/models/concerns/searchable.rb @@ -43,10 +43,28 @@ } }) - # Do something like #name_prefix_search('FOR') to get everything starting with FOR +...
Use scroll to get all elasticsearch results
diff --git a/app/models/journal_spreadsheet.rb b/app/models/journal_spreadsheet.rb index abc1234..def5678 100644 --- a/app/models/journal_spreadsheet.rb +++ b/app/models/journal_spreadsheet.rb @@ -28,7 +28,7 @@ line[3] = row.activity line[4] = row.program line[5] = row.account - line[6] = row.a...
Convert floats to strings for spreadsheet writing.
diff --git a/app/models/spree/bp_order_note.rb b/app/models/spree/bp_order_note.rb index abc1234..def5678 100644 --- a/app/models/spree/bp_order_note.rb +++ b/app/models/spree/bp_order_note.rb @@ -11,7 +11,7 @@ Nacre::API::OrderRow.create @order.brightpearl_id, match_fields end - def create(order) + ...
Make create instance method class method
diff --git a/app/views/papers/show.json.jbuilder b/app/views/papers/show.json.jbuilder index abc1234..def5678 100644 --- a/app/views/papers/show.json.jbuilder +++ b/app/views/papers/show.json.jbuilder @@ -14,7 +14,7 @@ if @paper.editor json.editor_name @paper.editor.full_name json.editor_url @paper.editor.u...
Handle case of missing user (ORCID)
diff --git a/app/views/posts/_post.json.jbuilder b/app/views/posts/_post.json.jbuilder index abc1234..def5678 100644 --- a/app/views/posts/_post.json.jbuilder +++ b/app/views/posts/_post.json.jbuilder @@ -1 +1 @@-json.(post, :guid, :url, :published_at, :edited_at, :referenced_guid, :body, :body_html, :domain, :slug, :s...
Include post titles in JSON.
diff --git a/app/workers/publish_links_worker.rb b/app/workers/publish_links_worker.rb index abc1234..def5678 100644 --- a/app/workers/publish_links_worker.rb +++ b/app/workers/publish_links_worker.rb @@ -10,8 +10,11 @@ links_update = LinksUpdate.new( base_path: base_path, tag_mappings: tag_mappings, ...
Add comment explaining early return in PublishLinksWorker
diff --git a/db/migrate/20170317013214_create_saved_enclosures.rb b/db/migrate/20170317013214_create_saved_enclosures.rb index abc1234..def5678 100644 --- a/db/migrate/20170317013214_create_saved_enclosures.rb +++ b/db/migrate/20170317013214_create_saved_enclosures.rb @@ -0,0 +1,14 @@+class CreateSavedEnclosures < Acti...
Add migration that creates saved_enclosures table
diff --git a/aws/rakefiles/setup_versions.rake b/aws/rakefiles/setup_versions.rake index abc1234..def5678 100644 --- a/aws/rakefiles/setup_versions.rake +++ b/aws/rakefiles/setup_versions.rake @@ -1,7 +1,7 @@ require "yaml" task :setup_versions, [:path_to_version_yml] do |taskname, args| - args.with_defaults(path_t...
Fix relative path to versions.yml