diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/lib/mongoid-app_settings.rb b/lib/mongoid-app_settings.rb index abc1234..def5678 100644 --- a/lib/mongoid-app_settings.rb +++ b/lib/mongoid-app_settings.rb @@ -3,6 +3,10 @@ module Mongoid module AppSettings extend ActiveSupport::Concern + + included do |base| + @base = base + end ...
Remove method_missing and dynamically create methods
diff --git a/lib/tasks/gitlab/setup.rake b/lib/tasks/gitlab/setup.rake index abc1234..def5678 100644 --- a/lib/tasks/gitlab/setup.rake +++ b/lib/tasks/gitlab/setup.rake @@ -16,7 +16,7 @@ Rake::Task["db:setup"].invoke - config = YAML.load_file(File.join(Rails.root,'config','database.yml'))[Rails.env] + con...
Allow to parse heroku-generated database.yml config file.
diff --git a/spec/factories/user_factory.rb b/spec/factories/user_factory.rb index abc1234..def5678 100644 --- a/spec/factories/user_factory.rb +++ b/spec/factories/user_factory.rb @@ -3,6 +3,8 @@ name 'User' email 'email@test.com' login 'user' + password 'coolness' + password_confirmation { passwor...
Add password and password_confirmation attrs to UserFactory
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index abc1234..def5678 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -3,6 +3,12 @@ hosts.each do |host| on host, install_puppet end + +zookeeper_pp = <<-EOS +class { 'zookeeper': + client_ip => $::ipa...
Add deric-zookeeper module setup to acceptance spec helper. The acceptance test for the running druid services need a working instance of zookeeper to connect to. The deric-zookeeper module is used to accomplish this and its utilization has been added to spec_helper_acceptance.rb to initialize the test VM.
diff --git a/lib/webdriver_utils/page.rb b/lib/webdriver_utils/page.rb index abc1234..def5678 100644 --- a/lib/webdriver_utils/page.rb +++ b/lib/webdriver_utils/page.rb @@ -8,7 +8,7 @@ def define_page_methods opts={} page_module = opts[:page_module] || raise('must set page_module') target_class = o...
Add watir alias for driver opt
diff --git a/Casks/macupdate-desktop.rb b/Casks/macupdate-desktop.rb index abc1234..def5678 100644 --- a/Casks/macupdate-desktop.rb +++ b/Casks/macupdate-desktop.rb @@ -1,8 +1,8 @@ cask :v1 => 'macupdate-desktop' do - version '6.0.2' - sha256 '1aa04e0bec920f28af5417a2b875e40af832d5303a29dca27e527e30c4db42f5' + versi...
Upgrade MacUpdate Desktop.app to v6.0.6
diff --git a/Casks/omnipresence-beta.rb b/Casks/omnipresence-beta.rb index abc1234..def5678 100644 --- a/Casks/omnipresence-beta.rb +++ b/Casks/omnipresence-beta.rb @@ -1,6 +1,6 @@ cask :v1 => 'omnipresence-beta' do - version '1.4.x-r232733' - sha256 'c21289a7a90b4efc8f0eb9cf3775bb4bb19145688229cd886718881b2c34377a' ...
Update Omnipresence Beta to version 1.4.x-r233232 This commit updates the version and sha256 stanzas.
diff --git a/test/test_helper.rb b/test/test_helper.rb index abc1234..def5678 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,6 @@ require File.expand_path('../../lib/colirby.rb', __FILE__) - require 'minitest/autorun' -require 'minitest/pride' +require 'turn' require 'webmock/minitest' require...
Use turn instead of pride to print test output
diff --git a/test/unit/deletion_test.rb b/test/unit/deletion_test.rb index abc1234..def5678 100644 --- a/test/unit/deletion_test.rb +++ b/test/unit/deletion_test.rb @@ -3,9 +3,7 @@ class DeletionTest < ActiveSupport::TestCase self.use_transactional_fixtures = false # Disabled to test after_commit - def setup - ...
Use setup helper with block instead of overriding it
diff --git a/lib/email_address/active_record_validator.rb b/lib/email_address/active_record_validator.rb index abc1234..def5678 100644 --- a/lib/email_address/active_record_validator.rb +++ b/lib/email_address/active_record_validator.rb @@ -38,7 +38,7 @@ e = Address.new(r[f]) unless e.valid? error...
Use I18n strings if available Like #67 but I18n is used on Rails' side
diff --git a/core/app/controllers/admin/global_feature_toggles_controller.rb b/core/app/controllers/admin/global_feature_toggles_controller.rb index abc1234..def5678 100644 --- a/core/app/controllers/admin/global_feature_toggles_controller.rb +++ b/core/app/controllers/admin/global_feature_toggles_controller.rb @@ -7,7...
Allow setting to the empty global feature toggle list.
diff --git a/db/migrate/20131118115555_add_customer_number.rb b/db/migrate/20131118115555_add_customer_number.rb index abc1234..def5678 100644 --- a/db/migrate/20131118115555_add_customer_number.rb +++ b/db/migrate/20131118115555_add_customer_number.rb @@ -2,10 +2,24 @@ def up rename_column :customers, :id, :num...
Fix migration of customer number
diff --git a/db/migrate/20110509092008_add_neutral_feedback_to_reputation.rb b/db/migrate/20110509092008_add_neutral_feedback_to_reputation.rb index abc1234..def5678 100644 --- a/db/migrate/20110509092008_add_neutral_feedback_to_reputation.rb +++ b/db/migrate/20110509092008_add_neutral_feedback_to_reputation.rb @@ -0,0...
Add neutral feedback to reputation
diff --git a/custom_counter_cache.gemspec b/custom_counter_cache.gemspec index abc1234..def5678 100644 --- a/custom_counter_cache.gemspec +++ b/custom_counter_cache.gemspec @@ -13,7 +13,7 @@ s.require_paths = ['lib'] s.files = Dir['lib/**/*.rb'] s.required_rubygems_version = '>= 1.3.6' - s.add_dependency('rail...
Fix version ternary for Travis.
diff --git a/app.rb b/app.rb index abc1234..def5678 100644 --- a/app.rb +++ b/app.rb @@ -19,10 +19,12 @@ end post '/upload' do - File.open('uploads/' + params['birthdayFile'][:filename], "w") do |f| + filename = 'uploads/' + params['birthdayFile'][:filename] + + File.open(filename, "w") do |f| f.write(params...
Change duplicate data with a variable
diff --git a/app.rb b/app.rb index abc1234..def5678 100644 --- a/app.rb +++ b/app.rb @@ -7,5 +7,8 @@ get '/echofile' do halt 404 if params[:content].nil? or params[:file].nil? content_type "text/x-shellscript" - "echo \"#{params[:content]}\" > #{params[:file]}" -end+ <<-eos + #!/bin/sh + echo "#{params[:c...
Write out directive as first line of script file
diff --git a/test/node_test.rb b/test/node_test.rb index abc1234..def5678 100644 --- a/test/node_test.rb +++ b/test/node_test.rb @@ -32,4 +32,16 @@ empty_node.size.zero? end end + + group '.new' do + assert 'given a block, evaluates it in the context of the object' do + node_with_method = Node.ne...
Test initializing Node with block
diff --git a/db/migrate/20160511145349_update_format_to_dual_specialist_publisher.rb b/db/migrate/20160511145349_update_format_to_dual_specialist_publisher.rb index abc1234..def5678 100644 --- a/db/migrate/20160511145349_update_format_to_dual_specialist_publisher.rb +++ b/db/migrate/20160511145349_update_format_to_dual...
Set document_type of specialist documents to be more specific Specialist publisher has a separate document_type from schema name. Currently, these are set to the same thing. This migration sets the document_type from details.metadata.document_type
diff --git a/extras/sanitizable_attributes.rb b/extras/sanitizable_attributes.rb index abc1234..def5678 100644 --- a/extras/sanitizable_attributes.rb +++ b/extras/sanitizable_attributes.rb @@ -31,7 +31,8 @@ module ClassMethods def sanitize_attributes(*attr_names) cattr_accessor :sanitizable_attributes - ...
Support multiple calls to sanitize_attributes in same model. Implement formatable descriptions [story: #40582233]
diff --git a/lib/happy-helpers/helpers/numbers.rb b/lib/happy-helpers/helpers/numbers.rb index abc1234..def5678 100644 --- a/lib/happy-helpers/helpers/numbers.rb +++ b/lib/happy-helpers/helpers/numbers.rb @@ -1,6 +1,6 @@ # -*- encoding: utf-8 -*- - require 'i18n' +require 'money' module HappyHelpers module Helpe...
Make sure 'money' is required
diff --git a/lib/infoblox/resource/roaminghost.rb b/lib/infoblox/resource/roaminghost.rb index abc1234..def5678 100644 --- a/lib/infoblox/resource/roaminghost.rb +++ b/lib/infoblox/resource/roaminghost.rb @@ -0,0 +1,18 @@+module Infoblox + # minimum WAPI version: 1.1 + class RoamingHost < Resource + remote_attr_ac...
Add Roaming host entry for Infoblox This allows specifying DHCP options for MAC addresses without explicitly locking them to a fixed address.
diff --git a/app/models/blueprint.rb b/app/models/blueprint.rb index abc1234..def5678 100644 --- a/app/models/blueprint.rb +++ b/app/models/blueprint.rb @@ -7,10 +7,13 @@ validates :name, uniqueness: true validate do - patterns.each(&:set_metadata_from_repository) - - unless patterns.any? { |pattern| patte...
Return error response when pattern is invalid
diff --git a/app/models/excursion.rb b/app/models/excursion.rb index abc1234..def5678 100644 --- a/app/models/excursion.rb +++ b/app/models/excursion.rb @@ -17,7 +17,7 @@ private def parse_for_meta - parsed_json = ActiveSupport::JSON.decode(json) + parsed_json = JSON(json) activity_object.title = pars...
Use more efficient JSON parser
diff --git a/app/models/micropost.rb b/app/models/micropost.rb index abc1234..def5678 100644 --- a/app/models/micropost.rb +++ b/app/models/micropost.rb @@ -12,6 +12,7 @@ private def picture_size - erros.add(:picture, 'should be less than 5MB') if picture.size > 5.megabytes + errors.add(:picture, 'should b...
Fix bug not to add error
diff --git a/lib/language_pack/helpers/nodebin.rb b/lib/language_pack/helpers/nodebin.rb index abc1234..def5678 100644 --- a/lib/language_pack/helpers/nodebin.rb +++ b/lib/language_pack/helpers/nodebin.rb @@ -19,7 +19,7 @@ end def self.hardcoded_yarn - version = "1.5.1" + version = "1.12.3" { "...
Update included Yarn to latest 1.x version
diff --git a/lib/plugins/graphite/graphite_api.rb b/lib/plugins/graphite/graphite_api.rb index abc1234..def5678 100644 --- a/lib/plugins/graphite/graphite_api.rb +++ b/lib/plugins/graphite/graphite_api.rb @@ -0,0 +1,27 @@+require 'net/http' +require 'json' + +class GraphiteAPI + def initialize(host, port) + @uri = ...
Create a wrapper around the graphite api
diff --git a/travis-saucelabs-api.gemspec b/travis-saucelabs-api.gemspec index abc1234..def5678 100644 --- a/travis-saucelabs-api.gemspec +++ b/travis-saucelabs-api.gemspec @@ -19,5 +19,5 @@ gem.add_runtime_dependency('faraday', '~> 0.7') gem.add_runtime_dependency('faraday_middleware', '~> 0.9') - gem.add_runt...
Downgrade the necessary thor version
diff --git a/providers/configure_init_scripts.rb b/providers/configure_init_scripts.rb index abc1234..def5678 100644 --- a/providers/configure_init_scripts.rb +++ b/providers/configure_init_scripts.rb @@ -22,7 +22,7 @@ path "#{new_resource.installer_prefix_dir}/dynatrace/init.d/#{script}" owner new_reso...
Make init scripts be 0755.
diff --git a/config/deploy.rb b/config/deploy.rb index abc1234..def5678 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -20,7 +20,7 @@ desc 'Pull in local OBRA code' task :after_update_code do - sudo "svn co svn+ssh://sw@butlerpress.com/var/repos/obra /srv/www/rails/#{application}/local" + sudo "svn co --p...
Add SVN password to deplloy file!
diff --git a/config/routes.rb b/config/routes.rb index abc1234..def5678 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,9 +7,9 @@ end Guides::Application.routes.draw do - authenticate :user do + # authenticate :user do match '/preview/:edition_id' => GuidesFrontEnd::Preview, :anchor => false, :as =...
Disable requirement that you log in to preview as that was causing problems
diff --git a/config/routes.rb b/config/routes.rb index abc1234..def5678 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -14,7 +14,7 @@ resources :link_categories resources :partners resources :events, :path => 'eventos' do - post :register, on: :member + post :register, on: :member collection ...
Add rota para post de subscribe
diff --git a/config/routes.rb b/config/routes.rb index abc1234..def5678 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -35,4 +35,7 @@ match '/about', :to => 'static_pages#about' root :to => 'static_pages#home' + unless Rails.application.config.consider_all_requests_local + match '*not_found', to: ...
Add missing route for error pages
diff --git a/config/routes.rb b/config/routes.rb index abc1234..def5678 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,6 @@ Rails.application.routes.draw do + + get 'faqs/:id' => 'faqs#show_with_token' devise_for :users devise_scope :user do @@ -17,9 +19,7 @@ resources :c...
Add route to fetch FAQs based on id and token Also move the `root` directive out of the `devise_scope`.
diff --git a/config/routes.rb b/config/routes.rb index abc1234..def5678 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,11 @@ Rails.application.routes.draw do devise_for :users get 'welcome/index' - root 'welcome#index' + resources :docs - resources :docs + authenticated :user do + root "...
Change root of application for authenticated user
diff --git a/config/routes.rb b/config/routes.rb index abc1234..def5678 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,56 +1,3 @@ Rails.application.routes.draw do - # The priority is based upon order of creation: first created -> highest priority. - # See how all your routes lay out with "rake routes". - ...
Create articles as a resource
diff --git a/spec/features/subapps_spec.rb b/spec/features/subapps_spec.rb index abc1234..def5678 100644 --- a/spec/features/subapps_spec.rb +++ b/spec/features/subapps_spec.rb @@ -10,6 +10,12 @@ response.send("logged in as #{request.params[:username]}") end cannon_app.mount(admin_app, at: '/admin') + +...
Add spec for confirming sub app mounting within app works
diff --git a/redis-rails-instrumentation.gemspec b/redis-rails-instrumentation.gemspec index abc1234..def5678 100644 --- a/redis-rails-instrumentation.gemspec +++ b/redis-rails-instrumentation.gemspec @@ -24,4 +24,5 @@ spec.add_development_dependency 'bundler', '~> 1.6' spec.add_development_dependency 'rake' sp...
Define 2.0.0 as minimum Ruby version
diff --git a/phantomjs.gemspec b/phantomjs.gemspec index abc1234..def5678 100644 --- a/phantomjs.gemspec +++ b/phantomjs.gemspec @@ -14,6 +14,9 @@ gem.add_development_dependency 'rspec', "~> 2.99" gem.add_development_dependency 'simplecov' gem.add_development_dependency 'rake' + if RUBY_VERSION < '2' + gem....
Fix Travis builds on Ruby 1.9 The mime-types gem versions 3+ no longer supports Ruby < 2.0. This sets a version constraint for Ruby versions less than 2.
diff --git a/app/models/item_default.rb b/app/models/item_default.rb index abc1234..def5678 100644 --- a/app/models/item_default.rb +++ b/app/models/item_default.rb @@ -1,6 +1,6 @@ class ItemDefault < ActiveRecord::Base include AuthUtilities - + acts_as_authorization_object has_one :playlist_item, :as => :r...
Fix for default item model git-svn-id: 40f48ef6be603b97d118b87e4ef5b23ea6e9fa7c@199 ac1452a4-9358-4c15-a3b0-de1119e254d8
diff --git a/files/private-chef-cookbooks/private-chef/recipes/add_ons_remote.rb b/files/private-chef-cookbooks/private-chef/recipes/add_ons_remote.rb index abc1234..def5678 100644 --- a/files/private-chef-cookbooks/private-chef/recipes/add_ons_remote.rb +++ b/files/private-chef-cookbooks/private-chef/recipes/add_ons_r...
Fix for missing apt-transport-http package under ubuntu
diff --git a/lib/miq_automation_engine/service_models/miq_ae_service_manageiq-providers-storage_manager-swift_manager.rb b/lib/miq_automation_engine/service_models/miq_ae_service_manageiq-providers-storage_manager-swift_manager.rb index abc1234..def5678 100644 --- a/lib/miq_automation_engine/service_models/miq_ae_servi...
Add automation engine service model for SwiftManager Omitted from prior commits. (transferred from ManageIQ/manageiq@14399372b77ba247d65d4d1800473ba09562e121)
diff --git a/provisioner/daemon/plugins/automators/chef_automator/chef_automator/cookbooks/loom_hosts/recipes/default.rb b/provisioner/daemon/plugins/automators/chef_automator/chef_automator/cookbooks/loom_hosts/recipes/default.rb index abc1234..def5678 100644 --- a/provisioner/daemon/plugins/automators/chef_automator/...
Fix aliases in /etc/hosts for machines using a DNS suffix other than '.local'
diff --git a/Casks/beersmith2.rb b/Casks/beersmith2.rb index abc1234..def5678 100644 --- a/Casks/beersmith2.rb +++ b/Casks/beersmith2.rb @@ -2,6 +2,7 @@ version '2.2.12' sha256 'e4aa64af9e9c65e0cfe132de67ab580d0c3b2f527d598fcda0d9b2cc84b74da6' + # amazonaws.com/BeerSmith2-2 was verified as official when first i...
Fix `url` stanza comment for BeerSmith2.
diff --git a/Casks/opera-beta.rb b/Casks/opera-beta.rb index abc1234..def5678 100644 --- a/Casks/opera-beta.rb +++ b/Casks/opera-beta.rb @@ -1,6 +1,6 @@ cask :v1 => 'opera-beta' do - version '29.0.1795.30' - sha256 '6ef44a4236ad4f29bfc2c66bc8b542fb583fb50fb7c267fbd4777ccaca59adcb' + version '29.0.1795.35' + sha256 ...
Upgrade Opera Beta.app to v29.0.1795.35
diff --git a/publify_core/app/controllers/theme_controller.rb b/publify_core/app/controllers/theme_controller.rb index abc1234..def5678 100644 --- a/publify_core/app/controllers/theme_controller.rb +++ b/publify_core/app/controllers/theme_controller.rb @@ -32,8 +32,6 @@ src = this_blog.current_theme.path + "/#{type...
Remove last remaining page cache
diff --git a/db/data_migrations/20190122153116_add_filterable_class_name_to_audits.rb b/db/data_migrations/20190122153116_add_filterable_class_name_to_audits.rb index abc1234..def5678 100644 --- a/db/data_migrations/20190122153116_add_filterable_class_name_to_audits.rb +++ b/db/data_migrations/20190122153116_add_filter...
[TTPLAT-633] Add data migration for filterable class name in audits.
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 @@ -2,5 +2,10 @@ include Authenticatable include ErrorHandler - protect_from_forgery wi...
Add csrf protection to API endpoints
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 @@ -3,13 +3,16 @@ # Prevent CSRF attacks by raising an exception. # For APIs, you may want...
Add Pundit Exception rescue to ApplicationController Updates the application controller to rescue pundit expections and redirects the user to the login page. We'll refactor this soon to make the redirects more relevant to where they originated.
diff --git a/app/controllers/contractors_controller.rb b/app/controllers/contractors_controller.rb index abc1234..def5678 100644 --- a/app/controllers/contractors_controller.rb +++ b/app/controllers/contractors_controller.rb @@ -1,8 +1,8 @@ class ContractorsController < ApplicationController def index @contract...
Remove date query from version collections
diff --git a/app/controllers/derivatives_controller.rb b/app/controllers/derivatives_controller.rb index abc1234..def5678 100644 --- a/app/controllers/derivatives_controller.rb +++ b/app/controllers/derivatives_controller.rb @@ -33,6 +33,8 @@ derivative.masterfile = masterfile masterfile.save deriva...
Fix MH postback of rtmp url in a production environment
diff --git a/app/controllers/json/status_controller.rb b/app/controllers/json/status_controller.rb index abc1234..def5678 100644 --- a/app/controllers/json/status_controller.rb +++ b/app/controllers/json/status_controller.rb @@ -14,8 +14,8 @@ res_body = http_get_response_body("http://#{server}/status-json.xsl...
Fix online listeners calculation formula
diff --git a/spec/support/examples_group/shared_examples_for_column_migration.rb b/spec/support/examples_group/shared_examples_for_column_migration.rb index abc1234..def5678 100644 --- a/spec/support/examples_group/shared_examples_for_column_migration.rb +++ b/spec/support/examples_group/shared_examples_for_column_migr...
Add spec for data migration of one column to shared examples
diff --git a/spec/features/user_views_solicitors_list_spec.rb b/spec/features/user_views_solicitors_list_spec.rb index abc1234..def5678 100644 --- a/spec/features/user_views_solicitors_list_spec.rb +++ b/spec/features/user_views_solicitors_list_spec.rb @@ -1,8 +1,15 @@ require "rails_helper" RSpec.feature "User view...
Update test to use new sign in helpers
diff --git a/feedzirra.gemspec b/feedzirra.gemspec index abc1234..def5678 100644 --- a/feedzirra.gemspec +++ b/feedzirra.gemspec @@ -16,6 +16,8 @@ s.files = Dir['{lib/spec}/**/*.rb'] + %w[README.textile Rakefile .rspec] s.test_files = Dir['spec/**/*.rb'] + s.platform = Gem::Platform::RUBY + s.add_...
Add missing platform setting in gemspec
diff --git a/spec/support/define_rails_classes.rb b/spec/support/define_rails_classes.rb index abc1234..def5678 100644 --- a/spec/support/define_rails_classes.rb +++ b/spec/support/define_rails_classes.rb @@ -13,9 +13,9 @@ FATAL = 4 attr_accessor :level - def initialize(device) - @logdev = MyLogDevice.new(de...
Make fake logger class more like Rails
diff --git a/test/filters/test_rdiscount.rb b/test/filters/test_rdiscount.rb index abc1234..def5678 100644 --- a/test/filters/test_rdiscount.rb +++ b/test/filters/test_rdiscount.rb @@ -14,16 +14,17 @@ end end - def test_with_extensions - if_have 'rdiscount' do - # Create filter - filter = ::Nanoc...
Revert "Re-enable rdiscount extensions test" This reverts commit 0bb17fff6bd1197909f1e49bceba91d84529f03a. Still flaky?!
diff --git a/spec/replication/util/migration_order_spec.rb b/spec/replication/util/migration_order_spec.rb index abc1234..def5678 100644 --- a/spec/replication/util/migration_order_spec.rb +++ b/spec/replication/util/migration_order_spec.rb @@ -17,22 +17,29 @@ current_release_migrations.last end + def invalid...
Change the invalid migration message to live in a method The reasoning for this is that RSpec spits out the failing line in addition to the message. Since the long string is part of the line, it appears "twice" in the RSpec message which is confusing. By moving it into a method, then the output won't contain the fir...
diff --git a/spec/cucumber/world/pending_spec.rb b/spec/cucumber/world/pending_spec.rb index abc1234..def5678 100644 --- a/spec/cucumber/world/pending_spec.rb +++ b/spec/cucumber/world/pending_spec.rb @@ -29,7 +29,7 @@ @world.pending "TODO" do m = double('thing') m.should_receive(:fo...
Fix spec change due to RSpec update. RSpec mocks interface has changed - rspec_verify removed.
diff --git a/roles/lysator.rb b/roles/lysator.rb index abc1234..def5678 100644 --- a/roles/lysator.rb +++ b/roles/lysator.rb @@ -11,7 +11,7 @@ :hosted_by => "Lysator", :location => "Linköping, Sweden", :networking => { - :nameservers => ["130.236.254.225", "2001:6b0:17:f0a0::e1"], + :nameservers => ["130....
Add an extra resolve for nidhogg
diff --git a/rsscache.gemspec b/rsscache.gemspec index abc1234..def5678 100644 --- a/rsscache.gemspec +++ b/rsscache.gemspec @@ -18,11 +18,11 @@ spec.test_files = spec.files.grep('^(test|spec|features)/') spec.require_paths = ['lib'] - spec.add_dependency 'simple-rss' + spec.add_dependency 'simple-rss', '~>...
Add version constraints to dependencies
diff --git a/spec/classes/mailman_spec.rb b/spec/classes/mailman_spec.rb index abc1234..def5678 100644 --- a/spec/classes/mailman_spec.rb +++ b/spec/classes/mailman_spec.rb @@ -0,0 +1,25 @@+require 'spec_helper' + +describe 'mailman' do + + let :params do + { :password => 'password', :admin_email => 'admin@email.co...
unit-test: Add test for mailman class
diff --git a/spec/helpers/locales_helper_spec.rb b/spec/helpers/locales_helper_spec.rb index abc1234..def5678 100644 --- a/spec/helpers/locales_helper_spec.rb +++ b/spec/helpers/locales_helper_spec.rb @@ -13,6 +13,7 @@ after do I18n.backend.reload! I18n.enforce_available_locales = default_enforce + ...
Fix flaky spec for translations This spec was causing a side effect on another spec[2], making it fail 😌 I think it was because no translation had been called yet, in the failing spec, and so the the i18n backend translations had not been initialized, and was always returning empty translations for any locale. This ...
diff --git a/roles/datahata.rb b/roles/datahata.rb index abc1234..def5678 100644 --- a/roles/datahata.rb +++ b/roles/datahata.rb @@ -2,6 +2,11 @@ description "Role applied to all servers at DataHata" default_attributes( + :accounts => { + :users => { + :kom => { :status => :administrator } + } + }, :...
Make komzpa an admin on cmok
diff --git a/resources/chef-repo/site-cookbooks/mysql_part/recipes/create_database.rb b/resources/chef-repo/site-cookbooks/mysql_part/recipes/create_database.rb index abc1234..def5678 100644 --- a/resources/chef-repo/site-cookbooks/mysql_part/recipes/create_database.rb +++ b/resources/chef-repo/site-cookbooks/mysql_par...
Allow access to mysql from other instances
diff --git a/lib/chef-api/resources/search.rb b/lib/chef-api/resources/search.rb index abc1234..def5678 100644 --- a/lib/chef-api/resources/search.rb +++ b/lib/chef-api/resources/search.rb @@ -10,7 +10,7 @@ class << self # - # About search : http://docs.opscode.com/essentials_search.html + # Abou...
Change Search docs URI to docs.chef.io
diff --git a/lib/deep_cover/node/arguments.rb b/lib/deep_cover/node/arguments.rb index abc1234..def5678 100644 --- a/lib/deep_cover/node/arguments.rb +++ b/lib/deep_cover/node/arguments.rb @@ -38,6 +38,9 @@ class Args < Node has_child arguments: [Arg, Optarg, Restarg, Kwarg, Kwoptarg, Kwrestarg, Blockarg],...
Mark args as non executable
diff --git a/lib/inuit-rails/rails/version.rb b/lib/inuit-rails/rails/version.rb index abc1234..def5678 100644 --- a/lib/inuit-rails/rails/version.rb +++ b/lib/inuit-rails/rails/version.rb @@ -1,5 +1,5 @@ module Inuit module Rails - VERSION = "6.0.0.beta.5" + VERSION = "6.0.0.beta.6" end end
Tweak to generator output file
diff --git a/activesupport-db-cache.gemspec b/activesupport-db-cache.gemspec index abc1234..def5678 100644 --- a/activesupport-db-cache.gemspec +++ b/activesupport-db-cache.gemspec @@ -1,6 +1,6 @@ # -*- encoding: utf-8 -*- $:.push File.expand_path("../lib", __FILE__) -require File.expand_path('../lib/activesupport-db-...
Correct the require not to use relative path
diff --git a/lib/rambo/raml_models/headers.rb b/lib/rambo/raml_models/headers.rb index abc1234..def5678 100644 --- a/lib/rambo/raml_models/headers.rb +++ b/lib/rambo/raml_models/headers.rb @@ -17,17 +17,14 @@ end def pretty - beginning, ending = "{\n", "}" + beginning = "{\n" + endin...
Mark test as pending :/
diff --git a/app/models/parted.rb b/app/models/parted.rb index abc1234..def5678 100644 --- a/app/models/parted.rb +++ b/app/models/parted.rb @@ -13,7 +13,7 @@ output = super return output unless latest_edition output['additional_links'] = [] - latest_edition.parts.each do |part| + latest_edition.par...
Add the link order to additional links
diff --git a/app/models/school.rb b/app/models/school.rb index abc1234..def5678 100644 --- a/app/models/school.rb +++ b/app/models/school.rb @@ -1,3 +1,7 @@ class School < ActiveRecord::Base + include PgSearch + has_many :programs + multisearchable :against => [:school_name, :school_type] + end
Change pg_search from pg_search_scope to multisearchable against
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb index abc1234..def5678 100644 --- a/spec/controllers/sessions_controller_spec.rb +++ b/spec/controllers/sessions_controller_spec.rb @@ -0,0 +1,60 @@+require 'rails_helper' + +RSpec.describe SessionsController, type:...
Add tests for sessions controller; all tests pass
diff --git a/lib/tasks/move_to_paperclip.rake b/lib/tasks/move_to_paperclip.rake index abc1234..def5678 100644 --- a/lib/tasks/move_to_paperclip.rake +++ b/lib/tasks/move_to_paperclip.rake @@ -0,0 +1,50 @@+namespace :onebody do + + desc 'Move existing pictures and files to new locations for OneBody 2.0.0.' + task :mo...
Put back rake task that was used in migration. Oops.
diff --git a/spec/coverage.rb b/spec/coverage.rb index abc1234..def5678 100644 --- a/spec/coverage.rb +++ b/spec/coverage.rb @@ -7,5 +7,5 @@ formatters << Coveralls::SimpleCov::Formatter end -SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[*formatters] +SimpleCov.formatter = SimpleCov::Formatter::MultiF...
Fix test suite for Ruby 2.4 compatibility.
diff --git a/spec/support/uses_tmp_dir.rb b/spec/support/uses_tmp_dir.rb index abc1234..def5678 100644 --- a/spec/support/uses_tmp_dir.rb +++ b/spec/support/uses_tmp_dir.rb @@ -0,0 +1,12 @@+require 'tmpdir' + +shared_context :uses_tmp_dir do + around do |example| + Dir.mktmpdir('yacs-rspec-') do |dir| + @tmp_d...
yacs: Add helper to create tmp dirs in rspec
diff --git a/services/prowl.rb b/services/prowl.rb index abc1234..def5678 100644 --- a/services/prowl.rb +++ b/services/prowl.rb @@ -1,14 +1,15 @@ service :prowl do |data, payload| url = URI.parse('https://prowl.weks.net/publicapi/add') repository = payload['repository']['url'].split("/") - application = reposit...
Move repo name into 'event' field, use generic 'GitHub' for application name. Potentially helpful for easy redirection to iOctocat (possibly also to the specific repo in the future).
diff --git a/definitions/user_ulimit.rb b/definitions/user_ulimit.rb index abc1234..def5678 100644 --- a/definitions/user_ulimit.rb +++ b/definitions/user_ulimit.rb @@ -9,8 +9,15 @@ # memory_limit 1024 # end -define :user_ulimit, :filehandle_limit => nil, :process_limit => nil, :memory_limit => nil, :stack_soft_lim...
Allow passing a param to change the filename of the conf file.
diff --git a/db/migrate/20190806071559_remove_epic_issues_default_relative_position.rb b/db/migrate/20190806071559_remove_epic_issues_default_relative_position.rb index abc1234..def5678 100644 --- a/db/migrate/20190806071559_remove_epic_issues_default_relative_position.rb +++ b/db/migrate/20190806071559_remove_epic_iss...
Make epic_issues relative_position migration more robust If someone installed EE, then downgraded to CE before this column was added, upgrading to the latest version of CE will fail: 1. We have a backport migration for the entire EE schema but the table `epic_issues` exists, just not the `relative_position` column...
diff --git a/spec/helpers/application_helper/buttons/generic_feature_button_with_disable_spec.rb b/spec/helpers/application_helper/buttons/generic_feature_button_with_disable_spec.rb index abc1234..def5678 100644 --- a/spec/helpers/application_helper/buttons/generic_feature_button_with_disable_spec.rb +++ b/spec/helper...
Fix failing spec for generic feature button with disable
diff --git a/test/setup.rb b/test/setup.rb index abc1234..def5678 100644 --- a/test/setup.rb +++ b/test/setup.rb @@ -1,3 +1,4 @@ require 'xpool' require 'minitest/mock' require 'test/unit' +XPool.debug = ENV.has_key? "DEBUG"
Add debug switch to test environment.
diff --git a/app/controllers/application.rb b/app/controllers/application.rb index abc1234..def5678 100644 --- a/app/controllers/application.rb +++ b/app/controllers/application.rb @@ -22,4 +22,11 @@ end helper_method :space, :space! + + before_filter :not_activated_warning + def not_activated_warning + if ...
Add before filter to warn users that are not already authenticated
diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb index abc1234..def5678 100644 --- a/app/helpers/sessions_helper.rb +++ b/app/helpers/sessions_helper.rb @@ -1,2 +1,13 @@ module SessionsHelper + + def sign_in(user) + remember_token = User.new_remember_token + cookies.permanent[rememb...
Create a sign-in action with a token
diff --git a/test/functional/admin/base_controller_test.rb b/test/functional/admin/base_controller_test.rb index abc1234..def5678 100644 --- a/test/functional/admin/base_controller_test.rb +++ b/test/functional/admin/base_controller_test.rb @@ -0,0 +1,41 @@+require "test_helper" + +=begin + + What's being tested here?...
Make sure user_guide is only accessible to authenticated users
diff --git a/examples/firehose-consumer.rb b/examples/firehose-consumer.rb index abc1234..def5678 100644 --- a/examples/firehose-consumer.rb +++ b/examples/firehose-consumer.rb @@ -0,0 +1,57 @@+$LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__)) + +require "kafka" + +KAFKA_CLIENT_CERT = ENV.fetch("KAFKA_CLIENT_...
Add a balanced consumer example
diff --git a/app/helpers/session_helper.rb b/app/helpers/session_helper.rb index abc1234..def5678 100644 --- a/app/helpers/session_helper.rb +++ b/app/helpers/session_helper.rb @@ -1,5 +1,5 @@ module SessionHelper - def find_question(recent_question, id) + def find_question(recent_questions, id) recent_questions...
Add sorted question link details
diff --git a/lib/ahoy_matey.rb b/lib/ahoy_matey.rb index abc1234..def5678 100644 --- a/lib/ahoy_matey.rb +++ b/lib/ahoy_matey.rb @@ -11,7 +11,11 @@ module Ahoy def self.visit_model - ::Visit + @visit_model || ::Visit + end + + def self.visit_model=(visit_model) + @visit_model = visit_model end #...
Attach user on devise sign up and added ability to specify visit model
diff --git a/spec/test_node.rb b/spec/test_node.rb index abc1234..def5678 100644 --- a/spec/test_node.rb +++ b/spec/test_node.rb @@ -25,9 +25,9 @@ end end -class TestApplication < Celluloid::Application - supervise DCell::Application +class TestGroup < Celluloid::Group + supervise DCell::Group supervise TestA...
Use Celluloid::Group for defining the test node
diff --git a/core/db/migrate/20170323151450_add_missing_unique_indexes_for_unique_attributes.rb b/core/db/migrate/20170323151450_add_missing_unique_indexes_for_unique_attributes.rb index abc1234..def5678 100644 --- a/core/db/migrate/20170323151450_add_missing_unique_indexes_for_unique_attributes.rb +++ b/core/db/migrat...
Add indexes for unique attributes
diff --git a/lib/backup-gitbucket/tools.rb b/lib/backup-gitbucket/tools.rb index abc1234..def5678 100644 --- a/lib/backup-gitbucket/tools.rb +++ b/lib/backup-gitbucket/tools.rb @@ -2,6 +2,18 @@ require 'json' module BackupGitBucket + + class HTTPInstrumentor + class << self + attr_accessor :events + + ...
Add instrumentor to debug BitBucket issues.
diff --git a/lib/can_haz_poster/grabber.rb b/lib/can_haz_poster/grabber.rb index abc1234..def5678 100644 --- a/lib/can_haz_poster/grabber.rb +++ b/lib/can_haz_poster/grabber.rb @@ -25,7 +25,8 @@ def parse_movie_url(page, year) doc = Nokogiri::HTML(page) cell = doc.css('.content td:nth-child(2)').find ...
Add a nil-check when fetching a year Some of the movies on the site may have no year specified. Check is required to not fail on these.
diff --git a/week-6/nested_data_solution.rb b/week-6/nested_data_solution.rb index abc1234..def5678 100644 --- a/week-6/nested_data_solution.rb +++ b/week-6/nested_data_solution.rb @@ -7,7 +7,7 @@ # attempts: # ============================================================ - +p array[1][1][2][0] # =================...
Complete nested data solution pair challenge
diff --git a/lib/ktutils/os.rb b/lib/ktutils/os.rb index abc1234..def5678 100644 --- a/lib/ktutils/os.rb +++ b/lib/ktutils/os.rb @@ -10,13 +10,16 @@ module Ktutils # Sourced from # http://stackoverflow.com/questions/170956/how-can-i-find-which-operating-system-my-ruby-program-is-running-on/171011#171011 + # NOTE...
Change how OS is detected * Use host_os instead of arch
diff --git a/lib/pay/engine.rb b/lib/pay/engine.rb index abc1234..def5678 100644 --- a/lib/pay/engine.rb +++ b/lib/pay/engine.rb @@ -4,31 +4,32 @@ config.autoload_paths += Dir["#{config.root}/lib/**/"] + initializer 'pay.processors' do + ActiveSupport::Reloader.to_prepare do + # Include processor...
Use ActiveSupport Reloader to continuously include modules on reloads
diff --git a/lib/rubycritic.rb b/lib/rubycritic.rb index abc1234..def5678 100644 --- a/lib/rubycritic.rb +++ b/lib/rubycritic.rb @@ -14,18 +14,13 @@ end def critique - smell_adapters = AnalysersRunner.new(@source.paths).run - smelly_pathnames = SmellsAggregator.new(smell_adapters).smelly_pathnames ...
Use the compare method by default The compare method is better than critique, so let's merge the two and use the compare logic whenever possible.
diff --git a/lib/token_auth.rb b/lib/token_auth.rb index abc1234..def5678 100644 --- a/lib/token_auth.rb +++ b/lib/token_auth.rb @@ -1,4 +1,6 @@ module TokenAuthentication + + class Unauthorized < StandardError; end module ActsAsTokenAuthenticatable extend ActiveSupport::Concern @@ -40,17 +42,13 @@ end ...
Raise Unauthorized if authentication fail
diff --git a/lib/turbograft.rb b/lib/turbograft.rb index abc1234..def5678 100644 --- a/lib/turbograft.rb +++ b/lib/turbograft.rb @@ -14,16 +14,20 @@ self.controllers = ["ActionController::Base"] end + def self.included(controller) + controller.class_eval do + include XHRHeaders, Cookies, XDomainBlocke...
Allow to configure Turbogradft in a way that doesn't compromise lazy loading
diff --git a/lib/money-rails/active_record/migration_extensions/table_pg_rails4.rb b/lib/money-rails/active_record/migration_extensions/table_pg_rails4.rb index abc1234..def5678 100644 --- a/lib/money-rails/active_record/migration_extensions/table_pg_rails4.rb +++ b/lib/money-rails/active_record/migration_extensions/ta...
Support both 1.9.3 and 3.0.0 Added RVM GPG to download ruby 3.0.0 correctly in Travis
diff --git a/libs/ldap_auth.rb b/libs/ldap_auth.rb index abc1234..def5678 100644 --- a/libs/ldap_auth.rb +++ b/libs/ldap_auth.rb @@ -1,6 +1,10 @@ def ldap_authenticate(username, password) name, domain = username.split('@') auth_conf = get_conf[:authentication][param_to_sym(domain)] + + if name == '' or password ...
Fix LDAP Auth bug: Allows anyone to login w/o password
diff --git a/lib/active_pivot/activity.rb b/lib/active_pivot/activity.rb index abc1234..def5678 100644 --- a/lib/active_pivot/activity.rb +++ b/lib/active_pivot/activity.rb @@ -49,7 +49,12 @@ end def new_values - remote_activity.changes[0]['new_values'] + remote_activity.changes.each do |change| + ...
Fix Story start date detection
diff --git a/lib/emque/consuming/router.rb b/lib/emque/consuming/router.rb index abc1234..def5678 100644 --- a/lib/emque/consuming/router.rb +++ b/lib/emque/consuming/router.rb @@ -56,11 +56,11 @@ end def map(map) - mapping.merge!(map.symbolize_keys) + mapping.merge!(map) e...
Use strings as keys to remove dependency on ActiveSupport