diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index abc1234..def5678 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -12,6 +12,6 @@ private def form_params - params.require(:rsvp_form).permit(:guest_count, :guest_...
Add missing form parameters in welcome controller
diff --git a/app/helpers/georgia/sidebar_helper.rb b/app/helpers/georgia/sidebar_helper.rb index abc1234..def5678 100644 --- a/app/helpers/georgia/sidebar_helper.rb +++ b/app/helpers/georgia/sidebar_helper.rb @@ -6,8 +6,7 @@ end def sidebar_navigation_sublink text, url, options={} - controller = options...
Fix sidebar_sublink to use presenter
diff --git a/benchmark-perf.gemspec b/benchmark-perf.gemspec index abc1234..def5678 100644 --- a/benchmark-perf.gemspec +++ b/benchmark-perf.gemspec @@ -12,10 +12,14 @@ spec.homepage = "" spec.license = "MIT" - spec.files = `git ls-files -z`.split("\x0") + spec.files = Dir['{lib,spec...
Change to read files and require ruby > 2.0
diff --git a/app/models/conversation_summarizer.rb b/app/models/conversation_summarizer.rb index abc1234..def5678 100644 --- a/app/models/conversation_summarizer.rb +++ b/app/models/conversation_summarizer.rb @@ -14,7 +14,7 @@ end def summary - if subject + if subject.present? subject elsif fir...
Fix weird failing test case
diff --git a/lib/discordrb/commands/container.rb b/lib/discordrb/commands/container.rb index abc1234..def5678 100644 --- a/lib/discordrb/commands/container.rb +++ b/lib/discordrb/commands/container.rb @@ -17,5 +17,13 @@ @commands ||= {} @commands.delete name end + + # Adds all commands from another...
Add an include method to the CommandContainer, similar to the EventContainer one
diff --git a/lib/eventbrite/attendee_invoicer.rb b/lib/eventbrite/attendee_invoicer.rb index abc1234..def5678 100644 --- a/lib/eventbrite/attendee_invoicer.rb +++ b/lib/eventbrite/attendee_invoicer.rb @@ -18,7 +18,39 @@ # # Returns nil. def self.perform(user_details, event_details, payment_details) + # Conne...
Create new contacts with names, emails, and phone numbers 2:00
diff --git a/lib/integrity/helpers/url_helper.rb b/lib/integrity/helpers/url_helper.rb index abc1234..def5678 100644 --- a/lib/integrity/helpers/url_helper.rb +++ b/lib/integrity/helpers/url_helper.rb @@ -16,7 +16,7 @@ # sinatra-url-for[http://github.com/emk/sinatra-url-for] for the underlying # library th...
Return full urls on our url helpers
diff --git a/lib/rspec/core/backtrace_cleaner.rb b/lib/rspec/core/backtrace_cleaner.rb index abc1234..def5678 100644 --- a/lib/rspec/core/backtrace_cleaner.rb +++ b/lib/rspec/core/backtrace_cleaner.rb @@ -11,11 +11,17 @@ end def include?(line) - if @include_patterns.any? {|p| line =~ p} - ...
Refactor the backtrace cleaner for greater clarity Signed-off-by: Sam Phippen <e5a09176608998a68778e11d5021c871e8fae93c@googlemail.com>
diff --git a/lib/slayer_rails/extensions/form.rb b/lib/slayer_rails/extensions/form.rb index abc1234..def5678 100644 --- a/lib/slayer_rails/extensions/form.rb +++ b/lib/slayer_rails/extensions/form.rb @@ -6,7 +6,7 @@ extend ActiveSupport::Concern included do - include ActiveModel::Validations + ...
Include ActiveModel::Model on Slayer Forms
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,4 +5,4 @@ default[:chef][:server][:version] = "12.17.33" # Set the default client version -default[:chef][...
Update chef client to 16.16.13
diff --git a/lib/seed_migration.rb b/lib/seed_migration.rb index abc1234..def5678 100644 --- a/lib/seed_migration.rb +++ b/lib/seed_migration.rb @@ -14,7 +14,7 @@ def register(model, &block) unregister model entry = RegisterEntry.new(model) - entry.instance_eval &block if block_given? + entr...
Add missing parenthesis to reduce ambiguity
diff --git a/lib/simctl/runtime.rb b/lib/simctl/runtime.rb index abc1234..def5678 100644 --- a/lib/simctl/runtime.rb +++ b/lib/simctl/runtime.rb @@ -4,6 +4,11 @@ module SimCtl class Runtime < Object attr_reader :availability, :buildversion, :identifier, :name, :type, :version + + def initialize(args) + ...
Fix reading new isAvailable property
diff --git a/lib/rail/generator.rb b/lib/rail/generator.rb index abc1234..def5678 100644 --- a/lib/rail/generator.rb +++ b/lib/rail/generator.rb @@ -3,8 +3,6 @@ module Rail class Generator < Support::Generator - Error = Class.new(StandardError) - FILES = [ 'app/assets/javascripts/application.js.coff...
Use ArgumentError instead of a custom one
diff --git a/lib/referehencible.rb b/lib/referehencible.rb index abc1234..def5678 100644 --- a/lib/referehencible.rb +++ b/lib/referehencible.rb @@ -1,5 +1,31 @@ require 'referehencible/version' module Referehencible - # Your code goes here... + def self.included(base) + base.class_eval do + ### + # V...
Move the ReferenceNumber code from the project
diff --git a/lib/spree_fishbowl.rb b/lib/spree_fishbowl.rb index abc1234..def5678 100644 --- a/lib/spree_fishbowl.rb +++ b/lib/spree_fishbowl.rb @@ -10,9 +10,7 @@ end def self.enabled? - defined? @@enabled ? - @@enabled : - Spree::Config[:enable_fishbowl] + Spree::Config[:enable_fishbowl] end ...
Read from Spree config to determine whether Fishbowl integration is enabled, always
diff --git a/app/view/raw_output_view.rb b/app/view/raw_output_view.rb index abc1234..def5678 100644 --- a/app/view/raw_output_view.rb +++ b/app/view/raw_output_view.rb @@ -10,7 +10,7 @@ html = '<ul class="raw_output">' $raw_output.compact.each do |output| html << '<li>' - html << "<small>#{output[...
Add the date to the timestamp in the log output, to add just a bit more context (helpful when you have RSpactor running for days on end). Signed-off-by: Andreas Wolff <454a08182fae7f7960d8a9a6764ff415cde95dea@dynamicdudes.com>
diff --git a/lib/tomcat_manager.rb b/lib/tomcat_manager.rb index abc1234..def5678 100644 --- a/lib/tomcat_manager.rb +++ b/lib/tomcat_manager.rb @@ -1,3 +1,4 @@ # -*- coding: utf-8 -*- # © 2012 Dakota Bailey +require 'rest_client' require 'tomcat_manager/core.rb'
Include required gems on load.
diff --git a/app/workers/post_receive.rb b/app/workers/post_receive.rb index abc1234..def5678 100644 --- a/app/workers/post_receive.rb +++ b/app/workers/post_receive.rb @@ -6,11 +6,15 @@ return false if project.nil? # Ignore push from non-gitlab users - if /^[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]...
Fix hooks for merge request which were accepted by web-interface
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index abc1234..def5678 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -18,4 +18,7 @@ expire_after: 1.month, secure: Rails.env.production? || Rails.env.staging?, path: Rails.a...
Use SameSite=Lax for LTI login
diff --git a/lib/wikitext/rails.rb b/lib/wikitext/rails.rb index abc1234..def5678 100644 --- a/lib/wikitext/rails.rb +++ b/lib/wikitext/rails.rb @@ -16,8 +16,7 @@ module Wikitext class TemplateHandler - def initialize view - end + def initialize view; end def render text, locals = {} text.w
Trim flab from Rails compatibility module Lose an unneeded line. Signed-off-by: Wincent Colaiuta <c76ac2e9cd86441713c7dfae92c451f3e6d17fdc@wincent.com>
diff --git a/app/controllers/user/registrations_controller.rb b/app/controllers/user/registrations_controller.rb index abc1234..def5678 100644 --- a/app/controllers/user/registrations_controller.rb +++ b/app/controllers/user/registrations_controller.rb @@ -4,7 +4,7 @@ protected def configure_permitted_parameters...
Correct name of first_name in User::Reg Ctlr.
diff --git a/app/controllers/user_confirmations_controller.rb b/app/controllers/user_confirmations_controller.rb index abc1234..def5678 100644 --- a/app/controllers/user_confirmations_controller.rb +++ b/app/controllers/user_confirmations_controller.rb @@ -4,7 +4,7 @@ def after_confirmation_path_for(resource_name, ...
Fix delayed e-mail delivery bug for on boarding e-mail
diff --git a/app/controllers/mentors_controller.rb b/app/controllers/mentors_controller.rb index abc1234..def5678 100644 --- a/app/controllers/mentors_controller.rb +++ b/app/controllers/mentors_controller.rb @@ -1,5 +1,27 @@ class MentorsController < ApplicationController def create + details = mentor_params + ...
Create method added to the mentors controller for when new mentors sign up.
diff --git a/app/controllers/project_controller.rb b/app/controllers/project_controller.rb index abc1234..def5678 100644 --- a/app/controllers/project_controller.rb +++ b/app/controllers/project_controller.rb @@ -10,4 +10,21 @@ end end + def create + if true #current_professor + new_project = Project...
Create a first draft of the create controller for projects
diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb index abc1234..def5678 100644 --- a/app/controllers/reports_controller.rb +++ b/app/controllers/reports_controller.rb @@ -22,6 +22,6 @@ private def report_params - params.require(:report).permit(:source, :open, :weather...
Fix report_params for new column name.
diff --git a/set_attributes.gemspec b/set_attributes.gemspec index abc1234..def5678 100644 --- a/set_attributes.gemspec +++ b/set_attributes.gemspec @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- Gem::Specification.new do |s| s.name = 'set_attributes' - s.version = '0.1.0' + s.version = '0.1.1' s.summary = "Set an ...
Package version path number is incremented from 0.1.0 to 0.1.1
diff --git a/config/software/python-pyopenssl.rb b/config/software/python-pyopenssl.rb index abc1234..def5678 100644 --- a/config/software/python-pyopenssl.rb +++ b/config/software/python-pyopenssl.rb @@ -2,6 +2,7 @@ default_version "0.14" dependency 'pip' +dependency 'libffi' pip_install = "embedded/bin/pip inst...
Add missing libffi dep to pyopenssl
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 @@ -12,8 +12,11 @@ def update authorize @page - @page.update( page_params ) - redirect_to edit_page_path...
Update Page controller with update notice.
diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb index abc1234..def5678 100644 --- a/app/controllers/stats_controller.rb +++ b/app/controllers/stats_controller.rb @@ -1,8 +1,8 @@ class StatsController < ApplicationController def index - procedures = Procedure - dossiers ...
Exclude draft Dossiers and unpublished Procedures from Stats
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 @@ -15,7 +15,10 @@ @user.save end end - redirect_to({:action => "index"}, :notice => "Users upda...
Use respond_to block for bulk user update
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 @@ -15,6 +15,10 @@ def leave_combat if user_combat = UserCombat.find_by_combat_id_and_user_id(params[:combat_id]...
Destroy a combat if there are no users.
diff --git a/app/models/pull_request_downloader.rb b/app/models/pull_request_downloader.rb index abc1234..def5678 100644 --- a/app/models/pull_request_downloader.rb +++ b/app/models/pull_request_downloader.rb @@ -16,7 +16,7 @@ def download_pull_requests begin - events = Octokit.user_events(login) + e...
Revert "Use Octokit client for now" This reverts commit af2cc66975bc81594484d31089d392bc52b84763.
diff --git a/app/models/pull_request_downloader.rb b/app/models/pull_request_downloader.rb index abc1234..def5678 100644 --- a/app/models/pull_request_downloader.rb +++ b/app/models/pull_request_downloader.rb @@ -16,7 +16,7 @@ def download_pull_requests begin - events = github_client.user_events(login) + ...
Use Octokit client for now
diff --git a/app/serializers/event_serializer.rb b/app/serializers/event_serializer.rb index abc1234..def5678 100644 --- a/app/serializers/event_serializer.rb +++ b/app/serializers/event_serializer.rb @@ -1,6 +1,6 @@ class EventSerializer < BaseSerializer - attributes :id, :course_id, :organization_id, :name, :start_t...
Add home_time_zone as an attribute to the EventSerializer.
diff --git a/lib/application_controller_patch.rb b/lib/application_controller_patch.rb index abc1234..def5678 100644 --- a/lib/application_controller_patch.rb +++ b/lib/application_controller_patch.rb @@ -1,15 +1,21 @@-if require "application_controller" - class ApplicationController < ActionController::Base +module A...
Refactor ApplicationControllerPath that uses ActiveSupport::Concern
diff --git a/rakelib/presentation.rake b/rakelib/presentation.rake index abc1234..def5678 100644 --- a/rakelib/presentation.rake +++ b/rakelib/presentation.rake @@ -1,7 +1,12 @@+ +DIR_IMAGES_FILES = FileList["images/**/*"] + desc 'Build presentation' task :presentation => [ 'slides', 'slides.html'] do cp 'slides.h...
[make-an-executable] Copy over images when building slides
diff --git a/lib/channel9/instruction/swap.rb b/lib/channel9/instruction/swap.rb index abc1234..def5678 100644 --- a/lib/channel9/instruction/swap.rb +++ b/lib/channel9/instruction/swap.rb @@ -0,0 +1,23 @@+module Channel9 + module Instruction + # swap + # --- + # Switches the top two elements of the stack. + ...
Swap instruction switches top 2 items of stack
diff --git a/lib/copian/collector/hp/ports.rb b/lib/copian/collector/hp/ports.rb index abc1234..def5678 100644 --- a/lib/copian/collector/hp/ports.rb +++ b/lib/copian/collector/hp/ports.rb @@ -2,7 +2,7 @@ module Collector class HpPortsCollector < PortsCollector # :nodoc: def collect - oid = SNMP::O...
Change the HP Ports collection ObjectID based on real world switches. Also ensure the OID encoded MAC has the first suboid stripped as HP place the port index into the OID returned as well as in the value.
diff --git a/lib/liquid/pagination_filters.rb b/lib/liquid/pagination_filters.rb index abc1234..def5678 100644 --- a/lib/liquid/pagination_filters.rb +++ b/lib/liquid/pagination_filters.rb @@ -5,9 +5,9 @@ def paginate(pagination_info) pagination_html = "" if pagination_info.is_a? Hash - paginat...
Add previous page link to pagination.
diff --git a/lib/magnum/integration/github.rb b/lib/magnum/integration/github.rb index abc1234..def5678 100644 --- a/lib/magnum/integration/github.rb +++ b/lib/magnum/integration/github.rb @@ -38,7 +38,8 @@ id: repo.id, name: repo.name, description: repo.description, - s...
Add private flag to repo results
diff --git a/lib/relevancy/load_judgements.rb b/lib/relevancy/load_judgements.rb index abc1234..def5678 100644 --- a/lib/relevancy/load_judgements.rb +++ b/lib/relevancy/load_judgements.rb @@ -15,7 +15,7 @@ raise "missing score for row '#{row}'" if score.nil? raise "missing link|content_id for row '#{r...
Fix generating training data locally JudgementsToSvm expects :score but gets :rank. This class is only called when running the class locally.
diff --git a/lib/rubygems-compile/analyzer.rb b/lib/rubygems-compile/analyzer.rb index abc1234..def5678 100644 --- a/lib/rubygems-compile/analyzer.rb +++ b/lib/rubygems-compile/analyzer.rb @@ -15,10 +15,10 @@ # Check the given string of code for potential issues when compiled. # Returns the analyzer instance after...
Fix a couple of typos
diff --git a/lib/sequenceserver/api_errors.rb b/lib/sequenceserver/api_errors.rb index abc1234..def5678 100644 --- a/lib/sequenceserver/api_errors.rb +++ b/lib/sequenceserver/api_errors.rb @@ -59,13 +59,13 @@ end def title - 'Job failed' + 'System error' end def message <<MSG -Sorry BL...
Update SystemError's title and message Signed-off-by: Anurag Priyam <6e6ab5ea9cb59fe7c35d2a1fc74443577eb60635@gmail.com>
diff --git a/lib/starting_blocks/publisher.rb b/lib/starting_blocks/publisher.rb index abc1234..def5678 100644 --- a/lib/starting_blocks/publisher.rb +++ b/lib/starting_blocks/publisher.rb @@ -27,4 +27,4 @@ end end StartingBlocks::Publisher.subscribers = [] -StartingBlocks::Publisher.result_parser = StartingBlocks:...
Use the new result parser.
diff --git a/lib/video_transcoding/mplayer.rb b/lib/video_transcoding/mplayer.rb index abc1234..def5678 100644 --- a/lib/video_transcoding/mplayer.rb +++ b/lib/video_transcoding/mplayer.rb @@ -12,16 +12,17 @@ def setup Tool.provide(COMMAND_NAME, ['-version']) do |output, _, _| - unless output =~ /^M...
Check extra version number for MPlayer to accept all builds.
diff --git a/app/controllers/errors_controller.rb b/app/controllers/errors_controller.rb index abc1234..def5678 100644 --- a/app/controllers/errors_controller.rb +++ b/app/controllers/errors_controller.rb @@ -2,6 +2,7 @@ before_action :authenticate_user! def create + logger.warn "JS error for user #{current_u...
Add current user id to js error logging.
diff --git a/lib/resque/cli.rb b/lib/resque/cli.rb index abc1234..def5678 100644 --- a/lib/resque/cli.rb +++ b/lib/resque/cli.rb @@ -2,19 +2,28 @@ module Resque class CLI < Thor + class_option :config, :aliases => ["-c"], :required => true desc "work QUEUE", "Start processing jobs." method_option...
Add config option & handle worker setup
diff --git a/app/controllers/region_controller.rb b/app/controllers/region_controller.rb index abc1234..def5678 100644 --- a/app/controllers/region_controller.rb +++ b/app/controllers/region_controller.rb @@ -7,7 +7,6 @@ private def load_vars - params[:iso]!="GL" or raise_404 @region = Region.where(iso: ...
Remove raise_404 if region iso code is GL
diff --git a/lib/slatan/ear.rb b/lib/slatan/ear.rb index abc1234..def5678 100644 --- a/lib/slatan/ear.rb +++ b/lib/slatan/ear.rb @@ -1,3 +1,5 @@+require 'active_support/core_ext/object/blank' + module Slatan ## class to Event Dispatching for concerns module Ear @@ -5,14 +7,19 @@ class << self ## reg...
Add condtion option to publish 'message' receive event
diff --git a/lib/tasks/om.rake b/lib/tasks/om.rake index abc1234..def5678 100644 --- a/lib/tasks/om.rake +++ b/lib/tasks/om.rake @@ -1,7 +1,7 @@ namespace :om do desc "Fetch data for all cafeterias" task :fetch => :environment do - Rails.logger.info "[INFO] Fetch cafeteria data..." + Rails.logger.info "[#{T...
Prepend fetch data log info with current time
diff --git a/test/test_file_flag.rb b/test/test_file_flag.rb index abc1234..def5678 100644 --- a/test/test_file_flag.rb +++ b/test/test_file_flag.rb @@ -1,5 +1,6 @@ class TestFileFlag < Minitest::Test def setup + FileUtils.mkdir_p('tmp') @flag = RFlags::FileFlag.new('tmp/file_flag') FileUtils.rm_f('tmp/...
Add tmp directory for testing
diff --git a/services/stock_info.rb b/services/stock_info.rb index abc1234..def5678 100644 --- a/services/stock_info.rb +++ b/services/stock_info.rb @@ -33,9 +33,8 @@ def quotes today = Date.today start_of_week = today - 5 - end_of_week = today - 1 - @_quotes ||= MarketBeat.quotes(symbo...
Make sure to include today in chart history
diff --git a/gem/lib/commands/push.rb b/gem/lib/commands/push.rb index abc1234..def5678 100644 --- a/gem/lib/commands/push.rb +++ b/gem/lib/commands/push.rb @@ -27,7 +27,7 @@ name = get_one_gem_name response = make_request(:post, "gems") do |request| - request.body = File.open(name).read + request....
Fix wrong Content-Length on Ruby 1.9, leading to Timeout in some cases
diff --git a/recipes/source_install.rb b/recipes/source_install.rb index abc1234..def5678 100644 --- a/recipes/source_install.rb +++ b/recipes/source_install.rb @@ -26,7 +26,8 @@ } ark 'consul' do + has_binaries ['bin/consul'] environment env url URI.join('https://github.com/hashicorp/consul/archive/', "#{sou...
Fix a few issues with source install.
diff --git a/constants/ooe_randomizer_constants.rb b/constants/ooe_randomizer_constants.rb index abc1234..def5678 100644 --- a/constants/ooe_randomizer_constants.rb +++ b/constants/ooe_randomizer_constants.rb @@ -6,7 +6,7 @@ (0xD7..0xE4).to_a + # no-damage medals [0xAE, 0xB6, 0xD6] # usable items with a hardcoded ...
Add Winged Skeleton to list of spawners
diff --git a/0_code_wars/7_is_this_a_triangle.rb b/0_code_wars/7_is_this_a_triangle.rb index abc1234..def5678 100644 --- a/0_code_wars/7_is_this_a_triangle.rb +++ b/0_code_wars/7_is_this_a_triangle.rb @@ -0,0 +1,12 @@+# http://www.codewars.com/kata/is-this-a-triangle/ +# iteration 1 +def isTriangle(a,b,c) + return fal...
Add code wars (7) is this a triangle
diff --git a/BHCDatabase/app/grids/users_grid.rb b/BHCDatabase/app/grids/users_grid.rb index abc1234..def5678 100644 --- a/BHCDatabase/app/grids/users_grid.rb +++ b/BHCDatabase/app/grids/users_grid.rb @@ -10,19 +10,20 @@ # # Filters # - + filter(:id, :string, :multiple => ',') #filter(:name, :string, :m...
Add emergency contact to user grid.
diff --git a/backend/spec/features/admin/orders/return_payment_state_spec.rb b/backend/spec/features/admin/orders/return_payment_state_spec.rb index abc1234..def5678 100644 --- a/backend/spec/features/admin/orders/return_payment_state_spec.rb +++ b/backend/spec/features/admin/orders/return_payment_state_spec.rb @@ -0,0...
Add regression test for refund outstanding_balance
diff --git a/spec/exif_jpeg_spec.rb b/spec/exif_jpeg_spec.rb index abc1234..def5678 100644 --- a/spec/exif_jpeg_spec.rb +++ b/spec/exif_jpeg_spec.rb @@ -0,0 +1,39 @@+require 'support/test_stream' +require 'file_data/formats/exif/exif_jpeg' + +RSpec.describe FileData::ExifJpeg do + let(:exif_jpeg) { FileData::ExifJpeg....
Improve test coverage for exit_jpeg.rb
diff --git a/spec/file_info_spec.rb b/spec/file_info_spec.rb index abc1234..def5678 100644 --- a/spec/file_info_spec.rb +++ b/spec/file_info_spec.rb @@ -2,15 +2,15 @@ require 'file_data/file_types/file_info' require 'file_data/formats/mpeg4/mpeg4' -RSpec.describe FileData::FileInfo do - # context 'Given an actual f...
Comment out test that uses file from local hard drive
diff --git a/spec/nanoc/cli_spec.rb b/spec/nanoc/cli_spec.rb index abc1234..def5678 100644 --- a/spec/nanoc/cli_spec.rb +++ b/spec/nanoc/cli_spec.rb @@ -6,7 +6,7 @@ end let(:exceptions) do - # FIXME: Get rid of these exceptions by Nanoc 5.0 + # FIXME: [Nanoc 5] Get rid of these exceptions [ ['d...
Improve formatting of Nanoc 5 FIXMEs
diff --git a/backend/app/controllers/comable/admin/orders_controller.rb b/backend/app/controllers/comable/admin/orders_controller.rb index abc1234..def5678 100644 --- a/backend/app/controllers/comable/admin/orders_controller.rb +++ b/backend/app/controllers/comable/admin/orders_controller.rb @@ -6,7 +6,7 @@ befor...
Add the per page option to orders
diff --git a/volunteermatch.gemspec b/volunteermatch.gemspec index abc1234..def5678 100644 --- a/volunteermatch.gemspec +++ b/volunteermatch.gemspec @@ -11,7 +11,7 @@ spec.summary = %q{A Ruby wrapper for VolunteerMatch's Public-Use API.} spec.description = %q{A lightweight Ruby wrapper that queries Volun...
Change homepage link in gemspec
diff --git a/test/integration/default/squid_spec.rb b/test/integration/default/squid_spec.rb index abc1234..def5678 100644 --- a/test/integration/default/squid_spec.rb +++ b/test/integration/default/squid_spec.rb @@ -5,10 +5,11 @@ it { should be_listening } end -squid_syntax_check = 'sudo squid -k parse' -squid_sy...
Comment out the syntax test for now This isn't going to work since there's a million binary names to work out Signed-off-by: Tim Smith <764ef62106582a09ed09dfa0b6bff7c05fd7d1e4@chef.io>
diff --git a/core/app/classes/open_graph/object.rb b/core/app/classes/open_graph/object.rb index abc1234..def5678 100644 --- a/core/app/classes/open_graph/object.rb +++ b/core/app/classes/open_graph/object.rb @@ -7,6 +7,7 @@ private def open_graph_field key, value + raise "Graph fied requires value" unl...
Raise when no value is supplied
diff --git a/core/db/default/spree/store_credit.rb b/core/db/default/spree/store_credit.rb index abc1234..def5678 100644 --- a/core/db/default/spree/store_credit.rb +++ b/core/db/default/spree/store_credit.rb @@ -10,8 +10,8 @@ type: "Spree::PaymentMethod::StoreCredit" ) -Spree::StoreCreditType.create_with(priority...
Update seeding for store credits to use constants
diff --git a/lib/salesforce_bulk/query_result_collection.rb b/lib/salesforce_bulk/query_result_collection.rb index abc1234..def5678 100644 --- a/lib/salesforce_bulk/query_result_collection.rb +++ b/lib/salesforce_bulk/query_result_collection.rb @@ -2,7 +2,6 @@ class QueryResultCollection < Array attr_reade...
Remove currentIndex as its no longer needed.
diff --git a/lib/sitemap_generator/adapters/file_adapter.rb b/lib/sitemap_generator/adapters/file_adapter.rb index abc1234..def5678 100644 --- a/lib/sitemap_generator/adapters/file_adapter.rb +++ b/lib/sitemap_generator/adapters/file_adapter.rb @@ -19,7 +19,7 @@ end stream = open(location.path, 'wb') - ...
Fix the FileAdaptor * Don't use ends_with?
diff --git a/lib/engineyard-cloud-client/version.rb b/lib/engineyard-cloud-client/version.rb index abc1234..def5678 100644 --- a/lib/engineyard-cloud-client/version.rb +++ b/lib/engineyard-cloud-client/version.rb @@ -1,7 +1,7 @@ # This file is maintained by a herd of rabid monkeys with Rakes. module EY class CloudC...
Add .pre for next release
diff --git a/parallel_rspec.gemspec b/parallel_rspec.gemspec index abc1234..def5678 100644 --- a/parallel_rspec.gemspec +++ b/parallel_rspec.gemspec @@ -19,6 +19,7 @@ spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] + spec.add_dependency "rake", "~> 10.0" + ...
Make rake and rspec normal dependencies, since the gem won't load successfully without them
diff --git a/config/initializers/decimal_to_s.rb b/config/initializers/decimal_to_s.rb index abc1234..def5678 100644 --- a/config/initializers/decimal_to_s.rb +++ b/config/initializers/decimal_to_s.rb @@ -12,4 +12,11 @@ end end end + + refine Fixnum do + # Same as `to_s`, since there is no fractional ...
Add `to_st` refinement to Fixnum This way, both `Placement` and `SubPlacement` models can have `to_st` called on them easily.
diff --git a/csv_to_popolo.gemspec b/csv_to_popolo.gemspec index abc1234..def5678 100644 --- a/csv_to_popolo.gemspec +++ b/csv_to_popolo.gemspec @@ -27,4 +27,5 @@ spec.add_dependency 'json' spec.add_dependency 'facebook_username_extractor' spec.add_dependency 'twitter_username_extractor' + spec.add_dependency ...
Add rcsv dependency to gemspec
diff --git a/lib/carto/google_maps_api_signer.rb b/lib/carto/google_maps_api_signer.rb index abc1234..def5678 100644 --- a/lib/carto/google_maps_api_signer.rb +++ b/lib/carto/google_maps_api_signer.rb @@ -3,42 +3,35 @@ module Carto class GoogleMapsApiSigner - def initialize(user) - @user = user - end - ...
Refactor Google Maps Api Signer
diff --git a/lib/connect/controller_additions.rb b/lib/connect/controller_additions.rb index abc1234..def5678 100644 --- a/lib/connect/controller_additions.rb +++ b/lib/connect/controller_additions.rb @@ -13,12 +13,12 @@ @current_token ||= request.env[Rack::OAuth2::Server::Resource::ACCESS_TOKEN] end -...
Rename current_scopes to current_oauth_scopes to avoid conflicts with has_scope gem
diff --git a/concurrent-ruby.gemspec b/concurrent-ruby.gemspec index abc1234..def5678 100644 --- a/concurrent-ruby.gemspec +++ b/concurrent-ruby.gemspec @@ -26,11 +26,6 @@ s.require_paths = ['lib'] s.required_ruby_version = '>= 1.9.2' - s.post_install_message = <<-MSG - future = Concurrent::Future.new{ '...
Remove (unnecessary) gem post-install message.
diff --git a/lib/coffee_filter.rb b/lib/coffee_filter.rb index abc1234..def5678 100644 --- a/lib/coffee_filter.rb +++ b/lib/coffee_filter.rb @@ -1,25 +1,9 @@-require "open3" -require "win32/open3" if RUBY_PLATFORM.match /win32/ +require "coffee_script" class CoffeeFilter < Nanoc3::Filter identifier :coffee d...
Use the coffee-script rubygem for CS compiling.
diff --git a/lib/rack/rejector.rb b/lib/rack/rejector.rb index abc1234..def5678 100644 --- a/lib/rack/rejector.rb +++ b/lib/rack/rejector.rb @@ -19,6 +19,8 @@ options = @options.clone reject?(request, options) ? reject!(request, options) : @app.call(env) end + + private def reject?(request, ...
Move internal methods to private
diff --git a/smart_asana.gemspec b/smart_asana.gemspec index abc1234..def5678 100644 --- a/smart_asana.gemspec +++ b/smart_asana.gemspec @@ -9,7 +9,7 @@ gem.homepage = "http://github.com/rbright/smart_asana" gem.add_dependency 'activesupport', '~> 3.2.3' - gem.add_dependency 'asana', '~> 0.0.2' + gem.add_...
Bump asana gem version to 0.0.3
diff --git a/lib/wixy/vigenere.rb b/lib/wixy/vigenere.rb index abc1234..def5678 100644 --- a/lib/wixy/vigenere.rb +++ b/lib/wixy/vigenere.rb @@ -3,9 +3,6 @@ module Wixy class Vigenere - ENCRYPT = 1 - DECRYPT = -1 - def initialize(config = Config.new) @config = config @alphabet = Alphabet.n...
Add recursive solver for Vigenere
diff --git a/lib/yle_tf/config.rb b/lib/yle_tf/config.rb index abc1234..def5678 100644 --- a/lib/yle_tf/config.rb +++ b/lib/yle_tf/config.rb @@ -35,7 +35,7 @@ block ||= DEFAULT_NOT_FOUND_BLOCK keys.inject(config) do |conf, key| - break block.call(keys) if !conf || !conf.key?(key) + break bl...
Fix `Config.fetch` when a key is not a Hash With config like: ```yaml foo: bar: something ``` `fetch('foo', 'bar', 'baz')` raised an exception instead of normal "key not found" handling.
diff --git a/lib/sparkpost_rails/delivery_method.rb b/lib/sparkpost_rails/delivery_method.rb index abc1234..def5678 100644 --- a/lib/sparkpost_rails/delivery_method.rb +++ b/lib/sparkpost_rails/delivery_method.rb @@ -19,14 +19,14 @@ :recipients => [ { :address => { - # :name...
Add in display names, return response
diff --git a/collector-ruby.gemspec b/collector-ruby.gemspec index abc1234..def5678 100644 --- a/collector-ruby.gemspec +++ b/collector-ruby.gemspec @@ -18,7 +18,6 @@ spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_runtime_dependency "vanguard" spec.ad...
Disable vanguard, causes dep conflicts. * We're not actually using vanguard anyway, so let's resolve this if/when we want to do that.
diff --git a/lib/sshkit/sudo/interaction_handler.rb b/lib/sshkit/sudo/interaction_handler.rb index abc1234..def5678 100644 --- a/lib/sshkit/sudo/interaction_handler.rb +++ b/lib/sshkit/sudo/interaction_handler.rb @@ -6,6 +6,9 @@ def on_data(command, stream_name, data, channel) if data =~ wrong_password...
Fix output when using with airbrussh
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 @@ -14,7 +14,7 @@ def authenticate authenticate_or_request_with_http_basic do |user_na...
Cut out my initial user/pass from code :)
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 @@ -11,6 +11,7 @@ if current_user.present? return true else + flash[:error...
Make it so that failed auth notifies user. I made it so that when authenticate! fails and it redirects to the login page it flash notices an error message telling them they need to login to gain access.
diff --git a/app/controllers/kaui/queues_controller.rb b/app/controllers/kaui/queues_controller.rb index abc1234..def5678 100644 --- a/app/controllers/kaui/queues_controller.rb +++ b/app/controllers/kaui/queues_controller.rb @@ -6,7 +6,7 @@ @now = Kaui::Admin.get_clock(nil, options_for_klient)['currentUtcTime'].t...
Add UTC timezone to NOW computation in rescue block
diff --git a/app/overrides/add_events_to_order_tabs.rb b/app/overrides/add_events_to_order_tabs.rb index abc1234..def5678 100644 --- a/app/overrides/add_events_to_order_tabs.rb +++ b/app/overrides/add_events_to_order_tabs.rb @@ -3,7 +3,7 @@ :insert_bottom => "[data-hook='admin_order_tabs']", ...
Use exclamation sign icon for order events tab
diff --git a/data_objects/lib/data_objects/uri.rb b/data_objects/lib/data_objects/uri.rb index abc1234..def5678 100644 --- a/data_objects/lib/data_objects/uri.rb +++ b/data_objects/lib/data_objects/uri.rb @@ -30,13 +30,5 @@ string << "##{fragment}" if fragment string end - - def eql?(other) - ...
Revert "[data_objects] Made nice eql? and hash methods which work with hashes" This reverts commit 29f8024d9a4741b7e46f28701cde24ff8e313c1c.
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 @@ -16,6 +16,12 @@ RSpec.configure do |config| config.before(:all) { Hutch::Config.log_level = Logger::FATAL } config.raise_errors_for_deprecations! + + if defined?(JRUBY_VERSI...
Add a way to skip bunny specs under jruby and march_hare specs under mri/rubinius
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,13 +1,14 @@ $LOAD_PATH.unshift(File.dirname(__FILE__)) $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) +$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), ...
Fix for spec helper so specs can be run from anywhere
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,7 +7,7 @@ config.formatter = :documentation config.color = true config.platform = 'ubuntu' - config.version = '14.04' + config.version = '18.04' config.log...
Set Ubuntu 18.04 for unit tests
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,3 +2,44 @@ require 'cucumber/salad' require 'rspec/given' +require 'sinatra/base' +require 'capybara' + +class SaladApp < Sinatra::Base; end +Capybara.app = SaladApp + +modul...
Configure rspec to allow widget tests.
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 @@ -21,5 +21,5 @@ end RSpec.configure do |config| - config.mock_with nil + config.mock_with :rspec end
Add the mock_with :rspec since newer versions of rspec apparently barf if you don't supply a mocker.
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,9 @@ require File.expand_path("../../config/environment", __FILE__) require 'rspec/rails' require 'rspec/autorun' + +init = Adhearsion::Initializer.new +init.load_lib_fol...
Make sure we load app libs during spec runs
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 @@ -4,7 +4,10 @@ require 'pp' Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each { |f| require f } require 'simplecov' -SimpleCov.start +SimpleCov.start do + add_filter '/spec/'...
Exclude spec and feature from code 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 @@ -18,6 +18,8 @@ end RSpec.configure do |config| + config.infer_spec_type_from_file_location! + config.include Rails.application.routes.url_helpers config.include Adminab...
Add infer_spec_type_from_file_location to rspec config
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 @@ -19,7 +19,6 @@ config.example_status_persistence_file_path = 'spec/examples.txt' config.disable_monkey_patching! - config.warnings = true config.default_formatter = 'd...
Drop RSpec warnings due to noise
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 @@ -43,7 +43,6 @@ c.syntax = :expect end - config.before( :each ) { - clean_current_dir - } + config.include Aruba::Api + config.before(:each) { clean_current_dir } e...
Make it possible to run rspec with single spec file
diff --git a/lib/capistrano-fastly.rb b/lib/capistrano-fastly.rb index abc1234..def5678 100644 --- a/lib/capistrano-fastly.rb +++ b/lib/capistrano-fastly.rb @@ -1,14 +1,32 @@ require 'capistrano' require 'capistrano-fastly/version' +require 'net/https' module Capistrano module Fastly def self.load_into(conf...
Add Fastly cache purge all code
diff --git a/webhook.rb b/webhook.rb index abc1234..def5678 100644 --- a/webhook.rb +++ b/webhook.rb @@ -8,6 +8,6 @@ end post '/' do - pp JSON.parse(CGI.unescape(request.body.read.sub(/^payload=/, ''))) + pp JSON.parse(params[:payload]) 'OK' end
Use Sinatra's params rather than parsing ourselves