diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,11 +1,5 @@-# -*- encoding: utf-8 -*- +# coding: utf-8 -require 'rubygems' - -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) -$LOAD_PATH.unshift(File.dirnam...
Remove craft from spec helper.
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -3,6 +3,7 @@ Dir[File.join(File.dirname(__FILE__), "../lib/**/*.rb")].each { |f| require f } require 'webmock/rspec' +WebMock.disable_net_connect!(:allow => "codeclimate.com") ...
Add Webmock configure for Code Climate
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -20,7 +20,7 @@ # do not change the coverage percentage, instead add more unit tests to fix coverage failures. if SimpleCov.result.covered_percent < 60 print "ERROR::BAD_C...
Add missing newline from coverage message
diff --git a/lib/rblogger/platforms/blogger.rb b/lib/rblogger/platforms/blogger.rb index abc1234..def5678 100644 --- a/lib/rblogger/platforms/blogger.rb +++ b/lib/rblogger/platforms/blogger.rb @@ -22,13 +22,9 @@ attr_reader :client, :configuration - def api - Document.new(client, configuration).fetch - ...
Refactor internals of Blogger for readability
diff --git a/lib/ethereum/deployment.rb b/lib/ethereum/deployment.rb index abc1234..def5678 100644 --- a/lib/ethereum/deployment.rb +++ b/lib/ethereum/deployment.rb @@ -39,9 +39,9 @@ start_time = Time.now loop do raise "Transaction #{@id} timed out." if ((Time.now - start_time) > timeout) - ...
Return first if mined, then sleep in Deployment.
diff --git a/example_server.rb b/example_server.rb index abc1234..def5678 100644 --- a/example_server.rb +++ b/example_server.rb @@ -4,14 +4,23 @@ class TrafficLightPiServer < Sinatra::Base configure do @@line_map = { - 0 => { + :devant => { + :red => 12, + :orange => 13, + :green...
Put all line for my pi
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -44,6 +44,15 @@ RSpec.configure do |config| # some (optional) config here + config.mock_with :rspec do |mocks| + + # This option should be set when all dependencies are be...
Verify doubles when we get to that point [skip ci]
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,10 +1,5 @@-require 'rubygems' unless Object.const_defined?(:Gem) -gem 'rake', "~> #{ENV['rake']}.0" if ENV['rake'] - require 'van_helsing' require 'rake' - -puts "Testing with...
Undo the Rake magic heh.
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -12,10 +12,14 @@ if ENV['COVERAGE'] require 'simplecov' + require 'simplecov-rcov' require 'coveralls' Coveralls.wear! - SimpleCov.formatter = Coveralls::SimpleCov::...
Add simplecov-rcov formatter for development coverage
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -24,7 +24,7 @@ add_group 'Relationship', 'lib/data_mapper/relationship' add_group 'Attribute', 'lib/data_mapper/attribute' - minimum_coverage 98.21 + minimum_co...
Update spec coverage threshold to work for JRuby * The threshold is about 0.10% lower under JRuby, so adjust it downward to compensate.
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,7 +1,9 @@+require 'rubygems' +require 'bundler/setup' + spec_root = File.dirname(__FILE__) $:.unshift(File.join(spec_root, '..', 'lib')) $:.unshift(spec_root) - require 'net...
Use bundler to setup gems in specs
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -7,10 +7,7 @@ require "webmock/rspec" require "pry" require "timecop" -begin - require "pry-byebug" -rescue LoadError -end +require "pry-byebug" require "activerecord-turntab...
Enable byebug always because supported ruby versions are >= 2.2.2
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -31,7 +31,8 @@ end config.after(connectivity: true) do - Thread.kill @consumer_thread if @consumer_thread.present? + @consumer_thread.kill if @consumer_thread.present?...
Fix flakey test due to consumer thread not joining before next test starts
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -22,11 +22,6 @@ require 'equalizer' -# TODO: FIXME! -# Cache correct freezer in ice_nine before -# rspec2 infects the world... -Equalizer.new - RSpec.configure do |config| ...
Remove work-around that is no longer needed with the rspec expect syntax
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -20,6 +20,7 @@ fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures')) RSpec.configure do |config| + config.tty = true config.mock_with :mocha config.modul...
Fix rspec colour in jenkins Signed-off-by: Ken Barber <470bc578162732ac7f9d387d34c4af4ca6e1b6f7@bob.sh>
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -9,6 +9,8 @@ config.run_all_when_everything_filtered = true config.treat_symbols_as_metadata_keys_with_true_values = true + config.order = :random + # Output config.c...
Configure tests to run in random order
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -30,4 +30,7 @@ # == Mock Framework config.mock_with :rspec + + # Fixtures + config.use_transactional_fixtures = true end
Use transactional fixtures for tests.
diff --git a/spec/stubs/rails.rb b/spec/stubs/rails.rb index abc1234..def5678 100644 --- a/spec/stubs/rails.rb +++ b/spec/stubs/rails.rb @@ -1,4 +1,10 @@ require 'stubs/dummy' + +module Logger + extend self + + def try(*args); end +end module Rails extend self @@ -30,7 +36,13 @@ module Application extend...
Add some more stubs to make specs pass Change-Id: I0b69ad23b1980e9854d0cfcc32038703974276c1 Reviewed-on: https://gerrit.causes.com/6792 Tested-by: Steve Dee <239b710744079cbd443875b57204a43cb15ab5d1@causes.com> Reviewed-by: Greg Hurrell <79e2475f81a6317276bf7cbb3958b20d289b78df@causes.com>
diff --git a/lib/ffi-rxs/libc.rb b/lib/ffi-rxs/libc.rb index abc1234..def5678 100644 --- a/lib/ffi-rxs/libc.rb +++ b/lib/ffi-rxs/libc.rb @@ -1,6 +1,6 @@ # encoding: utf-8 -class LibC +module LibC extend FFI::Library # figures out the correct libc for each platform including Windows library = ffi_lib(FFI::Lib...
Revert "Further Travis CI investigation" This reverts commit 4d66fe38224d5cc8ce8742fc23b6522d524ea252.
diff --git a/lib/mementus/node_proxy.rb b/lib/mementus/node_proxy.rb index abc1234..def5678 100644 --- a/lib/mementus/node_proxy.rb +++ b/lib/mementus/node_proxy.rb @@ -21,10 +21,6 @@ @node.props end - def out_e - Pipeline::Step.new(adjacent_edges, Pipeline::Pipe.new(@graph), @graph) - end - ...
Remove outgoing node pipeline from NodeProxy
diff --git a/lib/phpcop/configloader.rb b/lib/phpcop/configloader.rb index abc1234..def5678 100644 --- a/lib/phpcop/configloader.rb +++ b/lib/phpcop/configloader.rb @@ -6,8 +6,10 @@ class ConfigLoader attr_reader :options + # Path to gem + DEFAULT_PATH = File.realpath(File.join(File.dirname(__FILE__), '....
Fix path default config yaml
diff --git a/lib/god/compat19.rb b/lib/god/compat19.rb index abc1234..def5678 100644 --- a/lib/god/compat19.rb +++ b/lib/god/compat19.rb @@ -1,13 +1,10 @@ require 'monitor' + +# Taken from http://redmine.ruby-lang.org/repositories/entry/ruby-19/lib/monitor.rb + module MonitorMixin - # - # FIXME: This isn't docum...
Add another method definition to move forward in 1.9 support.
diff --git a/lib/tasks/import/hits.rake b/lib/tasks/import/hits.rake index abc1234..def5678 100644 --- a/lib/tasks/import/hits.rake +++ b/lib/tasks/import/hits.rake @@ -13,7 +13,8 @@ end desc 'Copy filenames and etags for all old stats files from s3' - task update_legacy_from_s3: :environment do + task :update...
Add missing arg to import:update_legacy_from_s3 task
diff --git a/lib/spawn.rb b/lib/spawn.rb index abc1234..def5678 100644 --- a/lib/spawn.rb +++ b/lib/spawn.rb @@ -2,7 +2,7 @@ module Spawn - Invalid = Class.new(ArgumentError) + class Invalid < ArgumentError; end def spawner &default @@spawn ||= Hash.new
Change error class declaration (thanks to oboxodo) The declaring Invalid = Class.new(ArgumentError) has worse performance than class Invalid < ArgumentError; end. As in testing every nanosecond counts, this change was necessary.
diff --git a/lib/access_lint/cli.rb b/lib/access_lint/cli.rb index abc1234..def5678 100644 --- a/lib/access_lint/cli.rb +++ b/lib/access_lint/cli.rb @@ -1,9 +1,10 @@ require 'thor' module AccessLint - class CLI < Thor - desc 'audit TARGET', "Run an accessibility audit on a target file or url." - def audit(tar...
Use the first argument as the audit target
diff --git a/lib/angularjs-rails.rb b/lib/angularjs-rails.rb index abc1234..def5678 100644 --- a/lib/angularjs-rails.rb +++ b/lib/angularjs-rails.rb @@ -2,10 +2,10 @@ module AngularJS module Rails - if defined? Rails::Engine + if defined? ::Rails::Engine require "angularjs-rails/engine" elsif def...
Fix detection of Rails::Engine for Rails 4 There was code saying if defined?(Rails::Engine), but that didn't work on our Rails 4 project. It seems to work better as defined(::Rails::Engine).
diff --git a/lib/beaglebone/GPIO.rb b/lib/beaglebone/GPIO.rb index abc1234..def5678 100644 --- a/lib/beaglebone/GPIO.rb +++ b/lib/beaglebone/GPIO.rb @@ -2,7 +2,7 @@ module Beaglebone module GPIO def self.list - `ls /sys/class/gpio/` + `ls /sys/class/gpio/`.split('\n') end end end
Convert list string to array
diff --git a/lib/core_ext/object.rb b/lib/core_ext/object.rb index abc1234..def5678 100644 --- a/lib/core_ext/object.rb +++ b/lib/core_ext/object.rb @@ -23,7 +23,11 @@ def to_equal(expected) if (self.actual != expected) ^ self.inverted - raise RuntimeError.new("expected #{self.actual} to equal #{expected}...
Add an inversion error message
diff --git a/sequelizer.gemspec b/sequelizer.gemspec index abc1234..def5678 100644 --- a/sequelizer.gemspec +++ b/sequelizer.gemspec @@ -11,7 +11,7 @@ spec.summary = %q{Sequel database connections via config/database.yml or .env} spec.description = %q{Easily establish a connection to a database via Sequel ...
gemspec: Update license to Apache 2.0
diff --git a/lib/markdown_api.rb b/lib/markdown_api.rb index abc1234..def5678 100644 --- a/lib/markdown_api.rb +++ b/lib/markdown_api.rb @@ -6,7 +6,12 @@ return @host if @host config_file = Rails.root.join 'config/markdown.yml' config = YAML.load(config_file.read)[Rails.env] if config_file.exist? - @ho...
Allow docker ENV to override markdown host
diff --git a/lib/implicit_schema.rb b/lib/implicit_schema.rb index abc1234..def5678 100644 --- a/lib/implicit_schema.rb +++ b/lib/implicit_schema.rb @@ -1,3 +1,5 @@+# Wraps a Hash object, and raises ImplicitSchema::ValidationError when #[] is +# called with a missing key class ImplicitSchema < BasicObject Validatio...
Add missing documentation to ImplicitSchema
diff --git a/lib/object_momma.rb b/lib/object_momma.rb index abc1234..def5678 100644 --- a/lib/object_momma.rb +++ b/lib/object_momma.rb @@ -1,4 +1,4 @@-require 'ostruct' +require 'yaml' require 'object_momma/class_attributes'
Remove (now) unneeded require 'ostruct' call
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 @@ -27,6 +27,9 @@ # Raise an error on page load if there are pending migrations config.active_record.migration_error =...
Allow web-consoles from anywhere, for docker containers
diff --git a/lib/redfish/core.rb b/lib/redfish/core.rb index abc1234..def5678 100644 --- a/lib/redfish/core.rb +++ b/lib/redfish/core.rb @@ -14,7 +14,7 @@ module Redfish Logger = ::Logger.new(STDOUT) - Logger.level = ::Logger::WARN + Logger.level = ::Logger::INFO Logger.formatter = proc { |severity, datetime,...
Enable info logging by default
diff --git a/serverspec.gemspec b/serverspec.gemspec index abc1234..def5678 100644 --- a/serverspec.gemspec +++ b/serverspec.gemspec @@ -20,6 +20,7 @@ spec.add_dependency "net-ssh" spec.add_dependency "rspec" + spec.add_dependency "highline" spec.add_development_dependency "bundler", "~> 1.3" spec.add_dev...
Add highline gem to dependencies
diff --git a/lib/orbacle/indexer.rb b/lib/orbacle/indexer.rb index abc1234..def5678 100644 --- a/lib/orbacle/indexer.rb +++ b/lib/orbacle/indexer.rb @@ -1,7 +1,48 @@ require 'pathname' +require 'thread' module Orbacle class Indexer + QueueElement = Struct.new(:ast, :file_path) + + class ParsingProcess + ...
Split parsing and building into two parts
diff --git a/event_store-client-http.gemspec b/event_store-client-http.gemspec index abc1234..def5678 100644 --- a/event_store-client-http.gemspec +++ b/event_store-client-http.gemspec @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- Gem::Specification.new do |s| s.name = 'event_store-client-http' - s.version = '0.3.1' +...
Package version is increased from 0.3.1 to 0.3.2
diff --git a/simple_aws.gemspec b/simple_aws.gemspec index abc1234..def5678 100644 --- a/simple_aws.gemspec +++ b/simple_aws.gemspec @@ -10,7 +10,7 @@ s.summary = "The simplest and easiest to use AWS communication library" s.description = "SimpleAWS is a clean, simple, and forward compatible library for talkin...
Change nokogiri dependency to hopefully work on 1.8.7 on Travis
diff --git a/lib/tango/logger.rb b/lib/tango/logger.rb index abc1234..def5678 100644 --- a/lib/tango/logger.rb +++ b/lib/tango/logger.rb @@ -1,7 +1,20 @@ # coding: utf-8 module Tango + module TermANSIColorStubs + [:red, :green, :yellow].each do |color| + define_method(color) { |str| str } + end + end + ...
Add a little colour to the dance.
diff --git a/lib/tasks/seed.rake b/lib/tasks/seed.rake index abc1234..def5678 100644 --- a/lib/tasks/seed.rake +++ b/lib/tasks/seed.rake @@ -12,7 +12,8 @@ first_name: name.split[0], last_name: name.split[1], phone_number: Faker::PhoneNumber.cell_phone, - email: Faker::Internet.email + ...
Add country to racer faker
diff --git a/lib/rails-observers.rb b/lib/rails-observers.rb index abc1234..def5678 100644 --- a/lib/rails-observers.rb +++ b/lib/rails-observers.rb @@ -14,7 +14,7 @@ end end - initializer "action_controller.caching.sweppers" do + initializer "action_controller.caching.sweepers" do A...
Use correct name for initializer key
diff --git a/lib/slatan/buttocks.rb b/lib/slatan/buttocks.rb index abc1234..def5678 100644 --- a/lib/slatan/buttocks.rb +++ b/lib/slatan/buttocks.rb @@ -2,7 +2,7 @@ require 'logger' module Slatan - # Wrapper class of Logger + ## Wrapper class of Logger class Buttocks @@use_log = Spirit.use_log class <...
Add comment to Buttocks class
diff --git a/lib/solidus_gateway.rb b/lib/solidus_gateway.rb index abc1234..def5678 100644 --- a/lib/solidus_gateway.rb +++ b/lib/solidus_gateway.rb @@ -3,5 +3,3 @@ require "active_merchant" require "spree_gateway/engine" require "solidus_gateway/version" -require "sass/rails" -require "coffee_script"
Remove sass/rails and coffeescript requires They are useless and sass/rails break the build on master after solidusio/solidus#2883
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 @@ -14,12 +14,17 @@ def new @user = User.new end - + def create @user = User.new(params[:user]) ...
Add API endpoint for User create
diff --git a/HSGoogleDrivePicker.podspec b/HSGoogleDrivePicker.podspec index abc1234..def5678 100644 --- a/HSGoogleDrivePicker.podspec +++ b/HSGoogleDrivePicker.podspec @@ -2,7 +2,7 @@ Pod::Spec.new do |s| s.name = "HSGoogleDrivePicker" - s.version = "1.0.1" + s.version = "2.0.0" s.summary ...
Update podspec to version 2.0
diff --git a/cookbooks/wt_netacuity/metadata.rb b/cookbooks/wt_netacuity/metadata.rb index abc1234..def5678 100644 --- a/cookbooks/wt_netacuity/metadata.rb +++ b/cookbooks/wt_netacuity/metadata.rb @@ -3,5 +3,4 @@ license "All rights reserved" description "Installs/Configures NetAcuity with a Webtrends li...
Remove java dependency for netacuity
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 @@ -10,7 +10,6 @@ end def full_title(page_title) - base_title = 'Issuet' - page_title.empty? ? base_title : "#{bas...
Remove base title from page titles
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 @@ -10,11 +10,11 @@ end def full_url(page_url) - base_url = "https://coderdojo.jp" + default_url = "https://coderd...
Fix wrong url set in full_url helper
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 @@ -1,7 +1,7 @@ module ApplicationHelper def nav_item(text, image, url, options = {}) content_tag(:li, class: (current_...
Declare dimensions for header images This way, the text doesn't jump around since the text loads before the svg as the space is reserved for the image.
diff --git a/crawlers/lib/facebook_extractor.rb b/crawlers/lib/facebook_extractor.rb index abc1234..def5678 100644 --- a/crawlers/lib/facebook_extractor.rb +++ b/crawlers/lib/facebook_extractor.rb @@ -11,12 +11,9 @@ end def blocks(page) - if page.class == String - puts "PAGE SHIT #{page}" - end J...
Clean facebook extractor from debug prints
diff --git a/monetizable.gemspec b/monetizable.gemspec index abc1234..def5678 100644 --- a/monetizable.gemspec +++ b/monetizable.gemspec @@ -22,5 +22,5 @@ spec.add_development_dependency "pry" spec.add_development_dependency "rake" - spec.add_dependency "money", "~> 5.1.1" + spec.add_dependency "money", "~> ...
Upgrade Money gem to 6.13.2
diff --git a/spec/rbNFA_spec.rb b/spec/rbNFA_spec.rb index abc1234..def5678 100644 --- a/spec/rbNFA_spec.rb +++ b/spec/rbNFA_spec.rb @@ -46,7 +46,11 @@ end - it "on question mark generate zero or one token" + it "on question mark generate zero or one token" do + result = lexer.lex("?") + r...
Add test for zero or one token
diff --git a/carceropolis/carceropolis/config.rb b/carceropolis/carceropolis/config.rb index abc1234..def5678 100644 --- a/carceropolis/carceropolis/config.rb +++ b/carceropolis/carceropolis/config.rb @@ -1,10 +1,10 @@-http_path = "../" -css_dir = "static/css" -sass_dir = "scss" -images_dir = "static/images" -fonts...
Change file mode form dos to unix
diff --git a/game.rb b/game.rb index abc1234..def5678 100644 --- a/game.rb +++ b/game.rb @@ -40,7 +40,7 @@ end def night_mode - @villagers.sample.kill! + @villagers.select(&:alive?).sample.kill! end def day_mode
Kill only alive villagers in the night mode
diff --git a/init.rb b/init.rb index abc1234..def5678 100644 --- a/init.rb +++ b/init.rb @@ -1,14 +1,4 @@ require 'redmine' - -# Patches! -require 'dispatcher' - -Dispatcher.to_prepare :overview_view_page_forward do - gem 'lockfile' - - require_dependency 'projects_helper' - ProjectsHelper.send(:include, Overv...
Revert "Patch the change in, instead." This reverts commit e86f2e484e7e01eb95cbc82c87b61269b6bd9e0f.
diff --git a/app/observers/project_observer.rb b/app/observers/project_observer.rb index abc1234..def5678 100644 --- a/app/observers/project_observer.rb +++ b/app/observers/project_observer.rb @@ -1,5 +1,7 @@ class ProjectObserver < BaseObserver def after_create(project) + project.update_column(:last_activity_at,...
Update project last_activity_at on creation
diff --git a/app/services/manual_migrations.rb b/app/services/manual_migrations.rb index abc1234..def5678 100644 --- a/app/services/manual_migrations.rb +++ b/app/services/manual_migrations.rb @@ -0,0 +1,31 @@+class ManualMigrations + def self.move_snapshot_images! + Snapshot.all.each do |snapshot| + if snapsh...
Add manual-migration tool for images This tool should be run from a Rails console: ManualMigrations.move_snapshot_images! You might see errors along the way (we haven't been good at cleaning out bad snapshots) but the script should always continue. It is safe to run the script multiple times.
diff --git a/app.rb b/app.rb index abc1234..def5678 100644 --- a/app.rb +++ b/app.rb @@ -10,6 +10,6 @@ if params[:name].nil? then File.readlines(params[:name]) else - "File not found" + status 400 end end
Return 404 if the request file is not there
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index abc1234..def5678 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,8 +1,8 @@ class ApplicationController < ActionController::Base protect_from_forgery wi...
Set language before authenticating the user
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index abc1234..def5678 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,7 +1,7 @@ class ApplicationController < ActionController::Base protect_from_forgery wi...
Use before_action instead of before_filter
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,7 +3,7 @@ before_filter :authenticate before_filter :adjust_format_for_iphone - b...
Use an around_filter for adjusting the time zone.
diff --git a/cli.rb b/cli.rb index abc1234..def5678 100644 --- a/cli.rb +++ b/cli.rb @@ -17,7 +17,7 @@ exit if input.nil? begin null = modules.get('null') - steps = input.split('.').map { |step| Step.new(step, modules) } + steps = input.split('>').map { |step| Step.new(step, modules)...
Change command separator to > This is to allow the use of `.ext` when specifying a filename
diff --git a/build/dist/bin/generate_build_metadata.rb b/build/dist/bin/generate_build_metadata.rb index abc1234..def5678 100644 --- a/build/dist/bin/generate_build_metadata.rb +++ b/build/dist/bin/generate_build_metadata.rb @@ -2,10 +2,13 @@ require 'java' require 'rubygems' require 'json' -require File.join( File.d...
Adjust dist for polyglot module reshuffle.
diff --git a/db/migrate/20170328121315_remove_land_registry.rb b/db/migrate/20170328121315_remove_land_registry.rb index abc1234..def5678 100644 --- a/db/migrate/20170328121315_remove_land_registry.rb +++ b/db/migrate/20170328121315_remove_land_registry.rb @@ -0,0 +1,10 @@+class RemoveLandRegistry < Mongoid::Migration ...
Remove Land Registry Corporate Information Page Adds a migration to remove Land Registry Corporate Information Page. When Whitehall republishes the document, it should push everything through correctly.
diff --git a/jquerydotdotdot-rails.gemspec b/jquerydotdotdot-rails.gemspec index abc1234..def5678 100644 --- a/jquerydotdotdot-rails.gemspec +++ b/jquerydotdotdot-rails.gemspec @@ -10,7 +10,7 @@ spec.email = ["kinseyann505@gmail.com"] spec.description = %q{TODO: Write a gem description} spec.summary ...
Set homepage to Github repo
diff --git a/app/forms/db/program_detail_rows_form.rb b/app/forms/db/program_detail_rows_form.rb index abc1234..def5678 100644 --- a/app/forms/db/program_detail_rows_form.rb +++ b/app/forms/db/program_detail_rows_form.rb @@ -30,6 +30,8 @@ fetched_rows.each do |row_data| started_at = row_data[:started_at]...
Allow blank to started_at on program_details
diff --git a/lib/arcanus/command/unlock.rb b/lib/arcanus/command/unlock.rb index abc1234..def5678 100644 --- a/lib/arcanus/command/unlock.rb +++ b/lib/arcanus/command/unlock.rb @@ -34,6 +34,7 @@ loop do ui.print 'Enter password: ', newline: false password = ui.secret_user_input + ui.newli...
Print blank line after entering password This prevents the message from appearing after the "Enter password:" prompt.
diff --git a/lib/gene/macro/interpreter.rb b/lib/gene/macro/interpreter.rb index abc1234..def5678 100644 --- a/lib/gene/macro/interpreter.rb +++ b/lib/gene/macro/interpreter.rb @@ -31,8 +31,18 @@ end def parse_and_process input - result = Gene::CoreInterpreter.parse_and_process input do |output| - proces...
Remove unnecessary steps of calling CoreInterpreter in Macro Interpreter
diff --git a/lib/active_admin/globalize3/engine.rb b/lib/active_admin/globalize3/engine.rb index abc1234..def5678 100644 --- a/lib/active_admin/globalize3/engine.rb +++ b/lib/active_admin/globalize3/engine.rb @@ -1,7 +1,7 @@ module ActiveAdmin module Globalize3 class Engine < ::Rails::Engine - initializer ...
Fix assets precompile with config.assets.initialize_on_precompile = true
diff --git a/lib/octopolo/commands/pull_request.rb b/lib/octopolo/commands/pull_request.rb index abc1234..def5678 100644 --- a/lib/octopolo/commands/pull_request.rb +++ b/lib/octopolo/commands/pull_request.rb @@ -8,6 +8,6 @@ c.action do |global_options, options, args| require_relative '../scripts/pull_request' ...
Use the correct key when passing destination flag
diff --git a/lib/tinplate/request_authenticator.rb b/lib/tinplate/request_authenticator.rb index abc1234..def5678 100644 --- a/lib/tinplate/request_authenticator.rb +++ b/lib/tinplate/request_authenticator.rb @@ -1,4 +1,7 @@ # https://services.tineye.com/developers/tineyeapi/authentication.html + +require "securerandom...
Add missing require statements to RequestAuthenticator.
diff --git a/lib/travis/build/script/shared/jdk.rb b/lib/travis/build/script/shared/jdk.rb index abc1234..def5678 100644 --- a/lib/travis/build/script/shared/jdk.rb +++ b/lib/travis/build/script/shared/jdk.rb @@ -17,6 +17,9 @@ sh.if '-f build.gradle || -f build.gradle.kts' do sh.export 'TERM', 'd...
Disable Gradle daemon for user In CI environment, Gradle daemons are discouraged. See https://docs.gradle.org/current/userguide/gradle_daemon.html#sec:ways_to_disable_gradle_daemon This resolves https://github.com/travis-ci/travis-ci/issues/8205
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb index abc1234..def5678 100644 --- a/config/initializers/secret_token.rb +++ b/config/initializers/secret_token.rb @@ -9,4 +9,4 @@ # Make sure your secret_key_base is kept private # if you're sharing your code publicly. -PaperSearc...
Define Application.config.secret_key_base for the test environment
diff --git a/test/dummy/config/environments/test.rb b/test/dummy/config/environments/test.rb index abc1234..def5678 100644 --- a/test/dummy/config/environments/test.rb +++ b/test/dummy/config/environments/test.rb @@ -8,7 +8,7 @@ config.cache_classes = true # Configure static asset server for tests with Cache-Con...
Rename deprecated config.serve_static_assets to config.serve_static_files
diff --git a/app/uploaders/attach_uploader.rb b/app/uploaders/attach_uploader.rb index abc1234..def5678 100644 --- a/app/uploaders/attach_uploader.rb +++ b/app/uploaders/attach_uploader.rb @@ -1,51 +1,13 @@-# encoding: utf-8 +class AttachUploader < CarrierWave::Uploader::Base + storage :file -class AttachUploader < ...
Fix cyrilic names for attach
diff --git a/lib/link_thumbnailer/scrapers/default/images.rb b/lib/link_thumbnailer/scrapers/default/images.rb index abc1234..def5678 100644 --- a/lib/link_thumbnailer/scrapers/default/images.rb +++ b/lib/link_thumbnailer/scrapers/default/images.rb @@ -57,7 +57,10 @@ def base_href base = document.a...
Fix image URL's when base tag is an invalid URL Fixes #108.
diff --git a/lib/tasks/sample_data/payment_method_factory.rb b/lib/tasks/sample_data/payment_method_factory.rb index abc1234..def5678 100644 --- a/lib/tasks/sample_data/payment_method_factory.rb +++ b/lib/tasks/sample_data/payment_method_factory.rb @@ -24,7 +24,7 @@ def create_cash_method(enterprise) create_pa...
Improve payment method factory in sample data by removing constantize
diff --git a/jamespath.gemspec b/jamespath.gemspec index abc1234..def5678 100644 --- a/jamespath.gemspec +++ b/jamespath.gemspec @@ -11,6 +11,7 @@ spec.license = 'MIT' spec.files = `git ls-files`.split($/) spec.test_files = spec.files.grep(%r{^test/}) + spec.add_development_dependency('rake', ...
Add rake to development dependencies
diff --git a/cookbooks/ondemand_base/recipes/ubuntu.rb b/cookbooks/ondemand_base/recipes/ubuntu.rb index abc1234..def5678 100644 --- a/cookbooks/ondemand_base/recipes/ubuntu.rb +++ b/cookbooks/ondemand_base/recipes/ubuntu.rb @@ -1,4 +1,16 @@ #Make sure that this recipe only runs on ubuntu systems if platform?("ubuntu"...
Install VIM and some useful tools. This was pulled from Optimize. It's awesome Former-commit-id: f1eb9a00f5a1717a28640003b2db582d029038c9
diff --git a/_plugins/utf8.rb b/_plugins/utf8.rb index abc1234..def5678 100644 --- a/_plugins/utf8.rb +++ b/_plugins/utf8.rb @@ -0,0 +1,18 @@+module Jekyll + module Commands + class Serve + + class << self + alias :_original_webrick_options :webrick_options + end + + def self.webrick_options(c...
Set RSS to serve UTF8 information
diff --git a/app/controllers/concerns/authenticate.rb b/app/controllers/concerns/authenticate.rb index abc1234..def5678 100644 --- a/app/controllers/concerns/authenticate.rb +++ b/app/controllers/concerns/authenticate.rb @@ -16,7 +16,11 @@ def authenticate_token authenticate_or_request_with_http_token do |toke...
Revert part of authentication for explicit returns
diff --git a/app/controllers/executions_controller.rb b/app/controllers/executions_controller.rb index abc1234..def5678 100644 --- a/app/controllers/executions_controller.rb +++ b/app/controllers/executions_controller.rb @@ -9,8 +9,8 @@ return end - nb = Notebook.find_by!(uuid: params[:uuid]) - cell ...
Fix up execution click log
diff --git a/app/models/setup/xslt_template_common.rb b/app/models/setup/xslt_template_common.rb index abc1234..def5678 100644 --- a/app/models/setup/xslt_template_common.rb +++ b/app/models/setup/xslt_template_common.rb @@ -9,6 +9,8 @@ else 'xml' #TODO Infers html method from structure end + r...
Fix | Prevent malformed XSLT documents
diff --git a/test/representers/api/musical_work_representer_test.rb b/test/representers/api/musical_work_representer_test.rb index abc1234..def5678 100644 --- a/test/representers/api/musical_work_representer_test.rb +++ b/test/representers/api/musical_work_representer_test.rb @@ -1,7 +1,6 @@ # encoding: utf-8 requir...
Add testing for musical work duration
diff --git a/lib/commands/convert_command.rb b/lib/commands/convert_command.rb index abc1234..def5678 100644 --- a/lib/commands/convert_command.rb +++ b/lib/commands/convert_command.rb @@ -7,9 +7,6 @@ if File.exists?(mod.work_dir) ResetCommand.new(@config).apply(mod) - Dir.chdir mod.work_dir do ...
Remove "git pull" called during "convert" I don't think we should call "git pull" during "convert" if the work directory exists, only do a reset. The reason is that "pull" can change the source code you are working with under your hands, which is really bad during debugging. If needed, we can add "yk pull" command to...
diff --git a/lib/cucumber/a11y/a11y_steps.rb b/lib/cucumber/a11y/a11y_steps.rb index abc1234..def5678 100644 --- a/lib/cucumber/a11y/a11y_steps.rb +++ b/lib/cucumber/a11y/a11y_steps.rb @@ -8,26 +8,26 @@ expect(page).to_not be_accessible end -Then(/^"(.*?)" should be accessible$/) do |scope| - expect(page).to be_a...
Update Cucumber steps for within scope
diff --git a/lib/factory_girl/null_object.rb b/lib/factory_girl/null_object.rb index abc1234..def5678 100644 --- a/lib/factory_girl/null_object.rb +++ b/lib/factory_girl/null_object.rb @@ -16,5 +16,9 @@ def respond_to?(method, include_private=false) @methods_to_respond_to.include? method.to_s end + + ...
Add respond_to_missing? on NullObject for 1.9 compatability
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake index abc1234..def5678 100644 --- a/lib/tasks/ci.rake +++ b/lib/tasks/ci.rake @@ -3,9 +3,13 @@ task :build => %w( sunspot:stop sunspot:start spec jasmine:ci cucumber:all ) task :default => :build - + task :reload_nginx_conf do + require 'pathname' n...
Make sure nginx log files are in place before trying to restart it
diff --git a/lib/ninetails/key_conversion.rb b/lib/ninetails/key_conversion.rb index abc1234..def5678 100644 --- a/lib/ninetails/key_conversion.rb +++ b/lib/ninetails/key_conversion.rb @@ -15,8 +15,14 @@ end end + def should_modify_keys? + @headers["Content-Type"].present? && + @headers["Con...
Check if Content-Type is present before running key conversion
diff --git a/test/l2/ts_misc.rb b/test/l2/ts_misc.rb index abc1234..def5678 100644 --- a/test/l2/ts_misc.rb +++ b/test/l2/ts_misc.rb @@ -7,9 +7,10 @@ class TestL2Misc < Test::Unit::TestCase def test_convert - (0..512).each { - len = rand(512) + (0..rand(1024)).each { + len = rand(512)+1 mac...
Test that proper number of : exist git-svn-id: b3d365f95d627ddffb8722c756fee9dc0a59d335@114 64fbf49a-8b99-41c6-b593-eb2128c2192d
diff --git a/lib/tasks/import_cic_codes.rake b/lib/tasks/import_cic_codes.rake index abc1234..def5678 100644 --- a/lib/tasks/import_cic_codes.rake +++ b/lib/tasks/import_cic_codes.rake @@ -6,9 +6,7 @@ CSV.foreach("#{Rails.root}/app/assets/csv/cic_codes.csv", :headers => false) do |row| unless row[0].blank? ...
Update CicCode importer rake task
diff --git a/lib/capistrano_deploy_webhook/notifier.rb b/lib/capistrano_deploy_webhook/notifier.rb index abc1234..def5678 100644 --- a/lib/capistrano_deploy_webhook/notifier.rb +++ b/lib/capistrano_deploy_webhook/notifier.rb @@ -11,12 +11,14 @@ namespace :notify do task :post_request do application_name =...
Deploy hook can now get git user email
diff --git a/Tabman.podspec b/Tabman.podspec index abc1234..def5678 100644 --- a/Tabman.podspec +++ b/Tabman.podspec @@ -3,7 +3,8 @@ s.name = "Tabman" s.platform = :ios, "9.0" s.requires_arc = true - s.swift_version = "4.0" + + s.swift_versions = ['4.0', '4.1', '4.2', '5.0'] s.version = ...
Support multiple versions of Swift in podspec
diff --git a/lib/heroku/deploy/tasks/compile_assets.rb b/lib/heroku/deploy/tasks/compile_assets.rb index abc1234..def5678 100644 --- a/lib/heroku/deploy/tasks/compile_assets.rb +++ b/lib/heroku/deploy/tasks/compile_assets.rb @@ -13,5 +13,9 @@ task "Precompiling assets" shell "bundle exec rake assets:precom...
Clean up assets on rollback
diff --git a/lib/rails-i18n-js/rack/i18n/javascript.rb b/lib/rails-i18n-js/rack/i18n/javascript.rb index abc1234..def5678 100644 --- a/lib/rails-i18n-js/rack/i18n/javascript.rb +++ b/lib/rails-i18n-js/rack/i18n/javascript.rb @@ -1,6 +1,9 @@ module Rack module I18n class Javascript + class_attribute :namesp...
Use Namespace for fetch a subset of translations
diff --git a/rakefiles/quality.rake b/rakefiles/quality.rake index abc1234..def5678 100644 --- a/rakefiles/quality.rake +++ b/rakefiles/quality.rake @@ -4,13 +4,13 @@ directory report_dir desc "Run pep8 on all #{system} code" - task "pep8_#{system}" => report_dir do + task "pep8_#{system}" => [report_d...
Install prereqs before running pep8 or pylint
diff --git a/padrino-rpm.gemspec b/padrino-rpm.gemspec index abc1234..def5678 100644 --- a/padrino-rpm.gemspec +++ b/padrino-rpm.gemspec @@ -16,6 +16,6 @@ s.summary = %q{Padrino Instrumentation for New Relic RPM} s.files = `git ls-files`.split("\n") - s.add_dependency(%q<newrelic_rpm>, "~> 3.5.3.25") + s.add_d...
Revert "Bump NewRelic dependency to 3.5.3.25 for security" This reverts commit 80b6b55905067047d1a8b9c5b454a32deebb26d6.
diff --git a/app/jobs/log_job.rb b/app/jobs/log_job.rb index abc1234..def5678 100644 --- a/app/jobs/log_job.rb +++ b/app/jobs/log_job.rb @@ -8,7 +8,10 @@ log_files.each do |log_file| initial_location = "log/#{log_file}.log" final_location = "log/old_#{log_file}.log" + FileUtils.mv initial_locat...
Fix bug where new log files were not writable
diff --git a/flippant.gemspec b/flippant.gemspec index abc1234..def5678 100644 --- a/flippant.gemspec +++ b/flippant.gemspec @@ -1,19 +1,17 @@-# coding: utf-8 - lib = File.expand_path("../lib", __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require "flippant/version" Gem::Specification.new do |...
Remove unnecessary utf-8 coding comment
diff --git a/lib/dm-types/csv.rb b/lib/dm-types/csv.rb index abc1234..def5678 100644 --- a/lib/dm-types/csv.rb +++ b/lib/dm-types/csv.rb @@ -10,27 +10,26 @@ module DataMapper class Property class Csv < Text + def primitive?(value) super || value.kind_of?(::Array) end def load(val...
Remove unnecessary nils, and keep code within 80 columns.