diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/acts_as_tenant.gemspec b/acts_as_tenant.gemspec index abc1234..def5678 100644 --- a/acts_as_tenant.gemspec +++ b/acts_as_tenant.gemspec @@ -15,7 +15,7 @@ spec.require_paths = ["lib"] - spec.add_runtime_dependency "request_store", ">= 1.0.5" + spec.add_dependency "request_store", ">= 1.0.5" spec....
Rename runtime dependency to dependency since they're just aliased
diff --git a/install.rb b/install.rb index abc1234..def5678 100644 --- a/install.rb +++ b/install.rb @@ -37,7 +37,7 @@ end def destination_filename - '.' + @source_pathname.basename('.*') + '.' + @source_pathname.basename('.*').to_s end end
Fix TypeError exception raised by Ruby 2.0.
diff --git a/app/models/proof/tree.rb b/app/models/proof/tree.rb index abc1234..def5678 100644 --- a/app/models/proof/tree.rb +++ b/app/models/proof/tree.rb @@ -5,9 +5,10 @@ end def as_json opts={} - # FIXME: cache by space + # FIXME: cache tree by space + # FIXME: cache theorem names #...
Fix another n+1 ... kindof
diff --git a/app/models/repository.rb b/app/models/repository.rb index abc1234..def5678 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -3,6 +3,20 @@ has_many :reminders uniquify :access_token, :length => 10 + + class << self + def with_access_by(username, access_type = :admin) + ...
Add with_access_by scope for Repository
diff --git a/test/features/approve_services_test.rb b/test/features/approve_services_test.rb index abc1234..def5678 100644 --- a/test/features/approve_services_test.rb +++ b/test/features/approve_services_test.rb @@ -0,0 +1,36 @@+require "test_helper" +require_relative 'support/ui_test_helper' + +class ApproveServiceTe...
Add test for Approve Service version
diff --git a/guides/config/deploy.rb b/guides/config/deploy.rb index abc1234..def5678 100644 --- a/guides/config/deploy.rb +++ b/guides/config/deploy.rb @@ -27,9 +27,9 @@ namespace :deploy do desc "Builds static html for guides" task :build_guides do - cmd = "cd #{release_path} && bundle exec guides build --cl...
Include GA for edge and stable
diff --git a/spec/functions/get_rc_conf_vlan_spec.rb b/spec/functions/get_rc_conf_vlan_spec.rb index abc1234..def5678 100644 --- a/spec/functions/get_rc_conf_vlan_spec.rb +++ b/spec/functions/get_rc_conf_vlan_spec.rb @@ -0,0 +1,18 @@+require 'spec_helper' + +describe 'get_rc_conf_vlan' do + context 'with a simple conf...
Add bassing spec for basic vlan configuration
diff --git a/spec/support/helpers/session_helpers.rb b/spec/support/helpers/session_helpers.rb index abc1234..def5678 100644 --- a/spec/support/helpers/session_helpers.rb +++ b/spec/support/helpers/session_helpers.rb @@ -4,7 +4,7 @@ visit new_user_registration_path fill_in "Email", with: email fill_...
Use the new Ruby 1.9 hash syntax.
diff --git a/app/models/pame_evaluation.rb b/app/models/pame_evaluation.rb index abc1234..def5678 100644 --- a/app/models/pame_evaluation.rb +++ b/app/models/pame_evaluation.rb @@ -4,12 +4,4 @@ has_and_belongs_to_many :countries validates :methodology, :year, :metadata_id, :url, presence: true - - def visible -...
Remove visible method from pame evaluation model
diff --git a/app/models/hackbot/interactions/gifs.rb b/app/models/hackbot/interactions/gifs.rb index abc1234..def5678 100644 --- a/app/models/hackbot/interactions/gifs.rb +++ b/app/models/hackbot/interactions/gifs.rb @@ -1,20 +1,16 @@ module Hackbot module Interactions - class Gifs < Hackbot::Interactions::Channe...
Convert Hackbot::Interactions::Gifs to a Command
diff --git a/app/controllers/polls.rb b/app/controllers/polls.rb index abc1234..def5678 100644 --- a/app/controllers/polls.rb +++ b/app/controllers/polls.rb @@ -3,8 +3,8 @@ erb :'polls/index' end -get'/polls/:poll_id/responses' do - @poll = Poll.find(params[:poll_id]) +get'/polls/:poll_id/responses' do |id| + @p...
Update route to shorten parameter name
diff --git a/app/controllers/podcasts_controller.rb b/app/controllers/podcasts_controller.rb index abc1234..def5678 100644 --- a/app/controllers/podcasts_controller.rb +++ b/app/controllers/podcasts_controller.rb @@ -2,7 +2,7 @@ def index @title = 'DojoCast' @desc = 'Highlight people around CoderDojo commu...
Sort episodes up to 3-digit episodes by ascending order
diff --git a/app/controllers/telegram_controller.rb b/app/controllers/telegram_controller.rb index abc1234..def5678 100644 --- a/app/controllers/telegram_controller.rb +++ b/app/controllers/telegram_controller.rb @@ -3,6 +3,8 @@ class TelegramController < ApplicationController + protect_from_forgery with: :null_se...
Make telegram controller work with stateless POST requests
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index abc1234..def5678 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -2,17 +2,11 @@ describe User do - let(:user) { FactoryGirl.build(:user) } - - it "has valid factory" do - FactoryGirl.build(:user).should be_valid - e...
Remove unnecessary test for user factory
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index abc1234..def5678 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -2,7 +2,67 @@ require 'rails_helper' describe User do + before(:each) do + @user = build(:user) + end + it 'has a valid factory' do expect(creat...
Write username and email address tests for User model
diff --git a/spec/tic_tac_toe_spec.rb b/spec/tic_tac_toe_spec.rb index abc1234..def5678 100644 --- a/spec/tic_tac_toe_spec.rb +++ b/spec/tic_tac_toe_spec.rb @@ -16,8 +16,13 @@ @game = TicTacToe::Board.new end - it 'initially has empty positions' do - expect(@game.pos [1,1]).to eq(" ") + it 'init...
Test all 9 positions are empty
diff --git a/app/models/file_depot_ftp_anonymous.rb b/app/models/file_depot_ftp_anonymous.rb index abc1234..def5678 100644 --- a/app/models/file_depot_ftp_anonymous.rb +++ b/app/models/file_depot_ftp_anonymous.rb @@ -1,12 +1,4 @@ class FileDepotFtpAnonymous < FileDepotFtp - def self.requires_credentials? - true - ...
Remove redundant methods implemented in parent class
diff --git a/app/models/material.rb b/app/models/material.rb index abc1234..def5678 100644 --- a/app/models/material.rb +++ b/app/models/material.rb @@ -19,6 +19,10 @@ def filename=(filename) self.file.original_name = filename end + + def title + self.filename + end def filesize self.file.f...
Add title method to duck type.
diff --git a/app/models/contractor.rb b/app/models/contractor.rb index abc1234..def5678 100644 --- a/app/models/contractor.rb +++ b/app/models/contractor.rb @@ -1,3 +1,6 @@ class Contractor < ActiveRecord::Base has_many :contracts, inverse_of: :contractor + + validates :name, :abn, presence: true + validates :abn,...
Add basic validation to Contractor
diff --git a/app/models/submission.rb b/app/models/submission.rb index abc1234..def5678 100644 --- a/app/models/submission.rb +++ b/app/models/submission.rb @@ -4,7 +4,7 @@ validates_inclusion_of :first_time, in: [true, false] validates :age, numericality: { greater_than: 0, less_than: 110 } validates_format_of...
Change email uniqueness validation so it does take into account capitalization
diff --git a/app/models/submission.rb b/app/models/submission.rb index abc1234..def5678 100644 --- a/app/models/submission.rb +++ b/app/models/submission.rb @@ -14,16 +14,25 @@ alias_method :repo, :repository private + # + # The given lab {lab} must be active + # def lab_access if lab and no...
Add comments to validation methods in Submission model
diff --git a/i18n.gemspec b/i18n.gemspec index abc1234..def5678 100644 --- a/i18n.gemspec +++ b/i18n.gemspec @@ -13,6 +13,13 @@ s.description = "New wave Internationalization support for Ruby." s.license = "MIT" + s.metadata = { + 'bug_tracker_uri' => 'https://github.com/svenfuch...
Add project metadata to the gemspec
diff --git a/week-4/address/format_address_spec.rb b/week-4/address/format_address_spec.rb index abc1234..def5678 100644 --- a/week-4/address/format_address_spec.rb +++ b/week-4/address/format_address_spec.rb @@ -0,0 +1,16 @@+require_relative "my_solution" + +describe "make_address" do + it 'is defined as a method' do...
Add rspec file for challenge 4.3 release 4
diff --git a/config/initializers/csv_renderer.rb b/config/initializers/csv_renderer.rb index abc1234..def5678 100644 --- a/config/initializers/csv_renderer.rb +++ b/config/initializers/csv_renderer.rb @@ -1,4 +1,4 @@ # frozen_string_literal: true ActionController::Renderers.add :csv do |object, _| - send_data object....
Remove `Mime` access deprecation warning
diff --git a/config/initializers/time_formats.rb b/config/initializers/time_formats.rb index abc1234..def5678 100644 --- a/config/initializers/time_formats.rb +++ b/config/initializers/time_formats.rb @@ -0,0 +1,6 @@+Time::DATE_FORMATS[:short_ordinal] = lambda do |time| + time.strftime("#{time.day.ordinalize} %B") +en...
Add new Time formats for short and medium ordinals
diff --git a/ivy-serializers.gemspec b/ivy-serializers.gemspec index abc1234..def5678 100644 --- a/ivy-serializers.gemspec +++ b/ivy-serializers.gemspec @@ -20,5 +20,5 @@ spec.add_development_dependency 'json-schema-rspec', '~> 0.0.4' spec.add_development_dependency 'rake' spec.add_development_dependency 'rspec...
Update simplecov requirement from ~> 0.19.0 to ~> 0.20.0 Updates the requirements on [simplecov](https://github.com/simplecov-ruby/simplecov) to permit the latest version. - [Release notes](https://github.com/simplecov-ruby/simplecov/releases) - [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGEL...
diff --git a/lib/cex.rb b/lib/cex.rb index abc1234..def5678 100644 --- a/lib/cex.rb +++ b/lib/cex.rb @@ -2,7 +2,7 @@ require "cex/net" require "cex/model" require "cex/orders" -require "cex/executions" +require "cex/transactions" require "cex/balances" module Cex
Fix bug: annot load such file
diff --git a/auth/lib/tasks/auth.rake b/auth/lib/tasks/auth.rake index abc1234..def5678 100644 --- a/auth/lib/tasks/auth.rake +++ b/auth/lib/tasks/auth.rake @@ -2,7 +2,7 @@ namespace :admin do desc "Create admin username and password" task :create => :environment do - require File.join(Rails.root, 'db'...
Fix db:admin:create task to locate the correct users.rb file
diff --git a/spec/adhearsion/punchblock_plugin_spec.rb b/spec/adhearsion/punchblock_plugin_spec.rb index abc1234..def5678 100644 --- a/spec/adhearsion/punchblock_plugin_spec.rb +++ b/spec/adhearsion/punchblock_plugin_spec.rb @@ -0,0 +1,11 @@+require 'spec_helper' + +module Adhearsion + describe PunchblockPlugin do + ...
[FEATURE] Add test coverage for client accessor on PunchblockPlugin
diff --git a/spec/dummy/db/schema.rb b/spec/dummy/db/schema.rb index abc1234..def5678 100644 --- a/spec/dummy/db/schema.rb +++ b/spec/dummy/db/schema.rb @@ -13,7 +13,7 @@ ActiveRecord::Schema.define(version: 20141126120426) do - create_table "users", force: true do |t| + create_table "users", force: :cascade do |...
Remove extra .css extension in files
diff --git a/spec/factories/picks.rb b/spec/factories/picks.rb index abc1234..def5678 100644 --- a/spec/factories/picks.rb +++ b/spec/factories/picks.rb @@ -8,7 +8,7 @@ multiplier { 3 } end - factory :failed_pick do + factory :failed_pick, class: Pick do draw_date { Faker::Time.between(30.days.ago, Time...
Add subclass to factory :failed_pick.
diff --git a/lib/bot.rb b/lib/bot.rb index abc1234..def5678 100644 --- a/lib/bot.rb +++ b/lib/bot.rb @@ -6,9 +6,9 @@ class WelcomePlugin include Cinch::Plugin - listen_to :PRIVMSG, use_prefix: false, method: :doWelcome + match /(.*)/i, react_on: :channel, use_prefix: false, method: :doWelcome - def doWelcome(m...
Make it a match type
diff --git a/test/integration/table_content_test.rb b/test/integration/table_content_test.rb index abc1234..def5678 100644 --- a/test/integration/table_content_test.rb +++ b/test/integration/table_content_test.rb @@ -28,7 +28,7 @@ within :css, '#call_list_content' do assert has_content? @patient.primary_...
Test fluke after 4:00 Pacific time - fixed date display
diff --git a/test/rubygems/comparator/test_utils.rb b/test/rubygems/comparator/test_utils.rb index abc1234..def5678 100644 --- a/test/rubygems/comparator/test_utils.rb +++ b/test/rubygems/comparator/test_utils.rb @@ -0,0 +1,33 @@+require 'rubygems/test_case' +require 'rubygems/comparator' + +class TestGemComparatorUtil...
Add tests for Utils class
diff --git a/lib/air_blade/air_budd/form_helper.rb b/lib/air_blade/air_budd/form_helper.rb index abc1234..def5678 100644 --- a/lib/air_blade/air_budd/form_helper.rb +++ b/lib/air_blade/air_budd/form_helper.rb @@ -19,12 +19,12 @@ # TODO: complete this. See README. # TODO: DRY with FormBuilder#button implem...
Allow any icon to be specified in the link.
diff --git a/Casks/intellij-idea-eap.rb b/Casks/intellij-idea-eap.rb index abc1234..def5678 100644 --- a/Casks/intellij-idea-eap.rb +++ b/Casks/intellij-idea-eap.rb @@ -1,6 +1,6 @@ cask :v1 => 'intellij-idea-eap' do - version '141.588.1' - sha256 '4748d0785eb9e7df24fe43524ee196db69ebde50125eb2d6879702eecc64a604' + v...
Upgrade Intellij Idea EAP to 141.1192.2 Signed-off-by: Koichi Shiraishi <41a18128582fec5418c0a92661f7d4b13d21d912@gmail.com>
diff --git a/narwhal.rb b/narwhal.rb index abc1234..def5678 100644 --- a/narwhal.rb +++ b/narwhal.rb @@ -3,10 +3,17 @@ require 'redis' require './increment_count' -Resque.redis = Redis.new +# connect to Redis +r = Redis.new + +# initialize count +r.set('narwhal_count', 0) + +# make sure Resque knows what to do +Resq...
Add a little more startup logic
diff --git a/LeetCode/remove_n_element_from_list.rb b/LeetCode/remove_n_element_from_list.rb index abc1234..def5678 100644 --- a/LeetCode/remove_n_element_from_list.rb +++ b/LeetCode/remove_n_element_from_list.rb @@ -16,18 +16,18 @@ end def remove_k(root, k) - len = 0 - it = root - while it - len += ...
Remove nth element single pass
diff --git a/lani.gemspec b/lani.gemspec index abc1234..def5678 100644 --- a/lani.gemspec +++ b/lani.gemspec @@ -19,5 +19,7 @@ spec.require_paths = ["lib"] spec.add_development_dependency "bundler", "~> 1.3" + spec.add_development_dependency "rexical" + spec.add_runtime_dependency "racc" spec.add_developmen...
Add racc and rexical dependencies
diff --git a/lib/rack/contrib/common_cookies.rb b/lib/rack/contrib/common_cookies.rb index abc1234..def5678 100644 --- a/lib/rack/contrib/common_cookies.rb +++ b/lib/rack/contrib/common_cookies.rb @@ -19,10 +19,8 @@ private def domain - @domain ||= begin - @host =~ DOMAIN_REGEXP - ".#{$1}....
Fix bug with domain caching for common cookies in production
diff --git a/config/initializers/pivotal_tracker.rb b/config/initializers/pivotal_tracker.rb index abc1234..def5678 100644 --- a/config/initializers/pivotal_tracker.rb +++ b/config/initializers/pivotal_tracker.rb @@ -1,5 +1,5 @@ require 'pivotal-tracker' -token = ENV['CI'] ? '' : ENV['PIVOTAL_TOKEN'] +token = ENV['CI...
Fix error when using empty Pivotal token
diff --git a/lib/dox.rb b/lib/dox.rb index abc1234..def5678 100644 --- a/lib/dox.rb +++ b/lib/dox.rb @@ -24,10 +24,6 @@ require 'dox/version' module Dox - class << self - attr_writer :config - end - def self.configure yield(config) if block_given? end
Remove dispensable Dox.config= attr writer
diff --git a/app/policies/campaign_policy.rb b/app/policies/campaign_policy.rb index abc1234..def5678 100644 --- a/app/policies/campaign_policy.rb +++ b/app/policies/campaign_policy.rb @@ -14,4 +14,8 @@ def toggle_membership? user.present? end + + def new? + record.member?(user) + end end
Add policy for new campaign
diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb index abc1234..def5678 100644 --- a/app/uploaders/image_uploader.rb +++ b/app/uploaders/image_uploader.rb @@ -53,6 +53,6 @@ end def calculate_md5 - Digest::MD5.hexdigest(model.image.read) + Digest::MD5.hexdigest(file.read) en...
Fix a rare issue where setting of md5 fails.
diff --git a/lib/memes.rb b/lib/memes.rb index abc1234..def5678 100644 --- a/lib/memes.rb +++ b/lib/memes.rb @@ -1,28 +1,28 @@ class Memes @memes = { # "a wild ruby library appears" - :pokemon => /a wild (.*) appears/, + :pokemon => /a wild (.*) appears/i, # "I don't always write regexp but when I ...
Make all the regexes case-insensitive.
diff --git a/lib/lurn/text/bernoulli_vectorizer.rb b/lib/lurn/text/bernoulli_vectorizer.rb index abc1234..def5678 100644 --- a/lib/lurn/text/bernoulli_vectorizer.rb +++ b/lib/lurn/text/bernoulli_vectorizer.rb @@ -17,7 +17,7 @@ def fit(documents) @vocabulary = [] tokenized_docs = tokenize_documen...
Handle ngram vocabularies in the bernoulli vectorizer
diff --git a/lib/multi_json/adapters/jr_jackson.rb b/lib/multi_json/adapters/jr_jackson.rb index abc1234..def5678 100644 --- a/lib/multi_json/adapters/jr_jackson.rb +++ b/lib/multi_json/adapters/jr_jackson.rb @@ -8,8 +8,6 @@ ParseError = ::JrJackson::ParseError def load(string, options={}) #:nodoc: - ...
Remove explicit stringio read call for JrJackson The bug was fixed https://github.com/guyboertje/jrjackson/issues/20 Closes #147
diff --git a/lib/customer_domains.rb b/lib/customer_domains.rb index abc1234..def5678 100644 --- a/lib/customer_domains.rb +++ b/lib/customer_domains.rb @@ -21,7 +21,7 @@ end def logged_in_as_current_customer? - current_customer && current_user && CustomerUser.linked?(current_customer, current_user) + curr...
Allow a site admin to see customers' data
diff --git a/lib/buzzerbeater/api.rb b/lib/buzzerbeater/api.rb index abc1234..def5678 100644 --- a/lib/buzzerbeater/api.rb +++ b/lib/buzzerbeater/api.rb @@ -10,18 +10,33 @@ base_uri 'bbapi.buzzerbeater.com' format :xml + # @!attribute session_id + # @return [String] the session ID used by this API object + ...
Correct constructor and instance variables for API
diff --git a/spec/classes/relationship__titles_spec.rb b/spec/classes/relationship__titles_spec.rb index abc1234..def5678 100644 --- a/spec/classes/relationship__titles_spec.rb +++ b/spec/classes/relationship__titles_spec.rb @@ -8,6 +8,7 @@ it { should contain_file('/etc/svc') } it { should contain_service('svc-...
Add spec that tests if resources can be found by their namevar as well as title
diff --git a/spec/controllers/pages_controller_spec.rb b/spec/controllers/pages_controller_spec.rb index abc1234..def5678 100644 --- a/spec/controllers/pages_controller_spec.rb +++ b/spec/controllers/pages_controller_spec.rb @@ -0,0 +1,14 @@+require 'spec_helper' + +describe HighVoltage::PagesController, '#show' do + ...
Add a spec for the pages controller
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index abc1234..def5678 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -0,0 +1,33 @@+# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Af...
Add spec for not overwriting the image_url on profile update
diff --git a/spec/unit/converters/convert_file_spec.rb b/spec/unit/converters/convert_file_spec.rb index abc1234..def5678 100644 --- a/spec/unit/converters/convert_file_spec.rb +++ b/spec/unit/converters/convert_file_spec.rb @@ -7,8 +7,9 @@ prompt.input << "test.txt" prompt.input.rewind + allow(::File).to...
Change to stub all dependent constants
diff --git a/lib/feed2email/email.rb b/lib/feed2email/email.rb index abc1234..def5678 100644 --- a/lib/feed2email/email.rb +++ b/lib/feed2email/email.rb @@ -1,5 +1,6 @@ require 'mail' require 'feed2email/core_ext' +require 'feed2email/version' module Feed2Email class Email
Add missing require for Feed2Email::VERSION
diff --git a/lib/happy/controller.rb b/lib/happy/controller.rb index abc1234..def5678 100644 --- a/lib/happy/controller.rb +++ b/lib/happy/controller.rb @@ -14,7 +14,7 @@ :render, :url_for, :to => :context - def initialize(env = nil, options = {}, &blk) + def initialize(env = {}, options = {}, &blk...
Initialize Controller with a default @env of {}
diff --git a/lib/model/prices_url.rb b/lib/model/prices_url.rb index abc1234..def5678 100644 --- a/lib/model/prices_url.rb +++ b/lib/model/prices_url.rb @@ -13,4 +13,4 @@ class InvalidURL < StandardError end -end+end
Add newline at end of file
diff --git a/lib/shoulda/whenever.rb b/lib/shoulda/whenever.rb index abc1234..def5678 100644 --- a/lib/shoulda/whenever.rb +++ b/lib/shoulda/whenever.rb @@ -1,3 +1,4 @@+require "shoulda/whenever/version" require "shoulda/whenever/schedule_matcher" module Shoulda
Include the version this time.
diff --git a/lib/storext/override.rb b/lib/storext/override.rb index abc1234..def5678 100644 --- a/lib/storext/override.rb +++ b/lib/storext/override.rb @@ -18,7 +18,7 @@ storext_definitions = association_class.storext_definitions storext_definitions.each do |attr, attr_definition| if attr_d...
Rename method to be more descriptive
diff --git a/lib/cli.rb b/lib/cli.rb index abc1234..def5678 100644 --- a/lib/cli.rb +++ b/lib/cli.rb @@ -4,9 +4,14 @@ class Cli < Thor - desc "hello", "say hello" + desc "hello", "Say hello" def hello puts "Well, I met a girl called Sandoz\nAnd she taught me many, many things\nGood things, very ...
Add a playful 'new' command.
diff --git a/config/initializers/garner.rb b/config/initializers/garner.rb index abc1234..def5678 100644 --- a/config/initializers/garner.rb +++ b/config/initializers/garner.rb @@ -1,8 +1,52 @@ require "garner" require "garner/mixins/mongoid" +require "garner/mixins/rack" module Mongoid module Document incl...
Allow headers to be cached along with the response Garner doesn't support this out of the box. I applied this monkey patch: https://github.com/artsy/garner/issues/54
diff --git a/install.rb b/install.rb index abc1234..def5678 100644 --- a/install.rb +++ b/install.rb @@ -2,4 +2,6 @@ s3_config = File.dirname(__FILE__) + '/../../../config/amazon_s3.yml' FileUtils.cp File.dirname(__FILE__) + '/amazon_s3.yml.tpl', s3_config unless File.exist?(s3_config) +cloudfiles_config = File.dirn...
Install the rackspace_cloudfiles.yml template if it doesn't exist.
diff --git a/app/drops/yoolk/liquid/instant_website/pages_drop.rb b/app/drops/yoolk/liquid/instant_website/pages_drop.rb index abc1234..def5678 100644 --- a/app/drops/yoolk/liquid/instant_website/pages_drop.rb +++ b/app/drops/yoolk/liquid/instant_website/pages_drop.rb @@ -1,19 +1,25 @@ module Yoolk module Liquid ...
enh(pages): Hide menu MORE if instant website pages is less than 6 items close #88
diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb index abc1234..def5678 100644 --- a/app/controllers/questions_controller.rb +++ b/app/controllers/questions_controller.rb @@ -29,5 +29,6 @@ @question = Question.find_by(id: params[:id]) @question.update_attributes(vi...
Add vote object to show action on questions controller
diff --git a/numbers.rb b/numbers.rb index abc1234..def5678 100644 --- a/numbers.rb +++ b/numbers.rb @@ -2,7 +2,7 @@ Succ = -> number { Cons[False][number] } Pred = -> number { Cdr[number] } -$zero = Cons[True][True] +$zero = Cons[True][Noop] $one = Succ[$zero] $two = Succ[$one] $three = Succ[$two]
Switch $zero's value to Noop, rather than True
diff --git a/chatops_deployer.gemspec b/chatops_deployer.gemspec index abc1234..def5678 100644 --- a/chatops_deployer.gemspec +++ b/chatops_deployer.gemspec @@ -11,7 +11,7 @@ spec.summary = %q{An opinionated Chatops backend} spec.description = %q{ChatopsDeployer deploys containerized services in isolated...
Fix homepage link in gemspec "chatops-deployer" with a hyphen gets redirected to https://github.com/code-mancers/flynn-deployer
diff --git a/mail.gemspec b/mail.gemspec index abc1234..def5678 100644 --- a/mail.gemspec +++ b/mail.gemspec @@ -16,7 +16,8 @@ s.add_dependency('activesupport', ">= 2.3.6") s.add_dependency('mime-types', "~> 1.16") s.add_dependency('treetop', '~> 1.4.8') - s.add_dependency('i18n', '>= 0.4.1') + s.add_dependen...
Fix merge conflict in gemspec
diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb index abc1234..def5678 100644 --- a/config/initializers/new_framework_defaults.rb +++ b/config/initializers/new_framework_defaults.rb @@ -14,7 +14,7 @@ # Make Ruby 2.4 preserve the timezone of the receiver when ...
Set ActiveSupport.to_time_preserves_timezone to 'true' because we use Ruby 2.4.0
diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb index abc1234..def5678 100644 --- a/config/initializers/new_framework_defaults.rb +++ b/config/initializers/new_framework_defaults.rb @@ -15,6 +15,3 @@ # Make Ruby 2.4 preserve the timezone of the receiver when ca...
Remove existing option that's been commented out
diff --git a/Library/Homebrew/test/test_hardware.rb b/Library/Homebrew/test/test_hardware.rb index abc1234..def5678 100644 --- a/Library/Homebrew/test/test_hardware.rb +++ b/Library/Homebrew/test/test_hardware.rb @@ -10,7 +10,8 @@ def test_hardware_intel_family if Hardware.cpu_type == :intel - assert [:co...
Fix test failure on ivybridge cpus. Closes #18371. Signed-off-by: Adam Vandenberg <34c2b6407fd5a10249a15d699d40f9ed1782e98c@gmail.com>
diff --git a/lib/carto/gcloud_user_settings.rb b/lib/carto/gcloud_user_settings.rb index abc1234..def5678 100644 --- a/lib/carto/gcloud_user_settings.rb +++ b/lib/carto/gcloud_user_settings.rb @@ -7,8 +7,9 @@ gcp_execution_project bq_project bq_dataset gcs_bucket).freeze - ...
Add ability to inject a redis connection
diff --git a/lib/quickbooks/service/reports.rb b/lib/quickbooks/service/reports.rb index abc1234..def5678 100644 --- a/lib/quickbooks/service/reports.rb +++ b/lib/quickbooks/service/reports.rb @@ -2,27 +2,37 @@ module Service class Reports < BaseService - def url_for_query(which_report = 'BalanceSheet', d...
Add options parsing for richer report gathering
diff --git a/lib/secretary/dirty/attributes.rb b/lib/secretary/dirty/attributes.rb index abc1234..def5678 100644 --- a/lib/secretary/dirty/attributes.rb +++ b/lib/secretary/dirty/attributes.rb @@ -26,6 +26,15 @@ end + if ActiveRecord::VERSION::STRING < "4.1.0" + def reload(*) + result = s...
Move reload into public API
diff --git a/envs/shell/lib/taskers/tasker/shell.rb b/envs/shell/lib/taskers/tasker/shell.rb index abc1234..def5678 100644 --- a/envs/shell/lib/taskers/tasker/shell.rb +++ b/envs/shell/lib/taskers/tasker/shell.rb @@ -1,7 +1,8 @@ class ShellTasker < Flor::BasicTasker - NATO = %w[ alpha bravo charly delta echo fox f...
Remove "echo" from flosh pre-NatoTasker routing
diff --git a/app/helpers/form_helper.rb b/app/helpers/form_helper.rb index abc1234..def5678 100644 --- a/app/helpers/form_helper.rb +++ b/app/helpers/form_helper.rb @@ -3,8 +3,8 @@ ops = {} if admin_in_read_only_mode? || (submission && !current_user.account_admin?) - ops[:disabled] = 'disabled' - o...
Use double quotes instead of singles
diff --git a/app/models/raw_time_row.rb b/app/models/raw_time_row.rb index abc1234..def5678 100644 --- a/app/models/raw_time_row.rb +++ b/app/models/raw_time_row.rb @@ -4,7 +4,7 @@ include ActiveModel::Serializers::JSON RAW_TIME_ATTRIBUTES = [:id, :absolute_time, :entered_time, :bib_number, :split_name, :sub_spl...
Add entered_lap to Raw Time Row serializer
diff --git a/app/models/store_mailer.rb b/app/models/store_mailer.rb index abc1234..def5678 100644 --- a/app/models/store_mailer.rb +++ b/app/models/store_mailer.rb @@ -25,7 +25,7 @@ subject = "#{APP_CONFIG['email_subject_prefix']} #{t("stizun.store_mailer.order_confirmation_subject")}" mail(:to => order...
Store mailer mails CC to from address instead of bcc.
diff --git a/files/graylog-ctl-commands/disable_mongodb.rb b/files/graylog-ctl-commands/disable_mongodb.rb index abc1234..def5678 100644 --- a/files/graylog-ctl-commands/disable_mongodb.rb +++ b/files/graylog-ctl-commands/disable_mongodb.rb @@ -0,0 +1,28 @@+add_command 'disable-mongodb', 'Disable MongoDB on this node',...
Add Disable MongoDB Command to graylog-ctl
diff --git a/opsworks-deploy.gemspec b/opsworks-deploy.gemspec index abc1234..def5678 100644 --- a/opsworks-deploy.gemspec +++ b/opsworks-deploy.gemspec @@ -24,6 +24,5 @@ spec.add_development_dependency "bundler", "~> 1.3" spec.add_development_dependency "rake" spec.add_development_dependency "rspec" - spec.ad...
Remove second dependency on json
diff --git a/lib/gooru.rb b/lib/gooru.rb index abc1234..def5678 100644 --- a/lib/gooru.rb +++ b/lib/gooru.rb @@ -1,5 +1,3 @@-ENV["GOORU_URL"] ||= "http://concept.goorulearning.org/" - require "stringio" require "weary"
Allow users of the gem to set GOORU_URL.
diff --git a/libcard.rb b/libcard.rb index abc1234..def5678 100644 --- a/libcard.rb +++ b/libcard.rb @@ -8,9 +8,8 @@ owen = Account.new('4356489X','19041972','owen.patel@gmail.com',warks) get '/go-go-owen-renew' do -# owen.getCurrentloans + owen.getCurrentloans # owen.renewLoans # owen.getCurrentloans ...
Call to current loans added back in - moment of truth
diff --git a/nori.gemspec b/nori.gemspec index abc1234..def5678 100644 --- a/nori.gemspec +++ b/nori.gemspec @@ -17,6 +17,7 @@ s.add_development_dependency "rake", "~> 10.0" s.add_development_dependency "nokogiri", ">= 1.4.0" s.add_development_dependency "rspec", "~> 2.12" + s.add_development_dependency...
Add transpec as a dev dependency
diff --git a/core/app/models/spree/base.rb b/core/app/models/spree/base.rb index abc1234..def5678 100644 --- a/core/app/models/spree/base.rb +++ b/core/app/models/spree/base.rb @@ -4,10 +4,19 @@ include Spree::RansackableAttributes - after_initialize do + def initialize_preference_defaults if has_attribute...
Optimize init on models without preferences This hook was run on initialization of every model (after_initialize is run both on .new, .find, etc), but is only necessary on models which have preferences. The hook is fairly quick, breaking out immediately after checking has_attribute?, but object initialization is so co...
diff --git a/textext-rails.gemspec b/textext-rails.gemspec index abc1234..def5678 100644 --- a/textext-rails.gemspec +++ b/textext-rails.gemspec @@ -8,8 +8,8 @@ s.authors = ["Jeff Pollard"] s.email = ["jeff.pollard@gmail.com"] s.homepage = "" - s.summary = %q{TODO: Write a gem summary} - s.de...
Add gem description to the gemspec readme.
diff --git a/app/controllers/articles_controller.rb b/app/controllers/articles_controller.rb index abc1234..def5678 100644 --- a/app/controllers/articles_controller.rb +++ b/app/controllers/articles_controller.rb @@ -1,4 +1,6 @@ class ArticlesController < ApplicationController + + before_filter :authenticate_user! ...
Add user authentification on controller 'articles'
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index abc1234..def5678 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -32,7 +32,7 @@ if params[:setup] Backend.build(@project) elsif params[:hipchat_room] - ...
Use the correct clojure function to notify about the hipchat plugin.
diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb index abc1234..def5678 100644 --- a/app/controllers/services_controller.rb +++ b/app/controllers/services_controller.rb @@ -9,11 +9,16 @@ def create service = Service.initialize_from_omniauth( omniauth_hash ) + serv...
Improve error messaging when trying to attach a service connected to another account
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index abc1234..def5678 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -7,18 +7,16 @@ user = User.find_by(name: session_params[:name]) if user && user.authenticate(se...
Refactor routes with rails helper url methods Use root_path in #create and #destroy actions in sessions controller
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index abc1234..def5678 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -17,7 +17,7 @@ def destroy session.clear - redirect_to login_path + redirect_to '/' en...
Change logout redirect to homepage
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb index abc1234..def5678 100644 --- a/app/controllers/snippets_controller.rb +++ b/app/controllers/snippets_controller.rb @@ -22,7 +22,7 @@ def update @snippet = Snippet.find(params["id"]) - if @snippet.update(content...
Remove flagged params from snippet
diff --git a/app/controllers/tutorial_controller.rb b/app/controllers/tutorial_controller.rb index abc1234..def5678 100644 --- a/app/controllers/tutorial_controller.rb +++ b/app/controllers/tutorial_controller.rb @@ -23,8 +23,14 @@ end def viewDidLoad - @one_button.when(UIControlEventTouchUpInside) {@sound1.play}...
Stop other sound from playing in tutorial
diff --git a/activerecord/test/models/cat.rb b/activerecord/test/models/cat.rb index abc1234..def5678 100644 --- a/activerecord/test/models/cat.rb +++ b/activerecord/test/models/cat.rb @@ -2,9 +2,6 @@ self.abstract_class = true enum gender: [:female, :male] - - scope :female, -> { where(gender: genders[:female]...
Fix `warning: method redefined; discarding old female` ``` $ ARCONN=mysql2 be ruby -w -Itest test/cases/scoping/default_scoping_test.rb Using mysql2 /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/scoping/named.rb:158: warning: method redefined; discarding old female /Users/kamipo/src/github.co...
diff --git a/nubis/tests/spec/services_spec.rb b/nubis/tests/spec/services_spec.rb index abc1234..def5678 100644 --- a/nubis/tests/spec/services_spec.rb +++ b/nubis/tests/spec/services_spec.rb @@ -5,7 +5,15 @@ it { should_not be_enabled } end +describe service('node_exporter') do + it { should_not be_enabled } +e...
Add 2 more service tests - sshd enabled - node_exporter disabled (enabled by confd)
diff --git a/lib/bmff/box.rb b/lib/bmff/box.rb index abc1234..def5678 100644 --- a/lib/bmff/box.rb +++ b/lib/bmff/box.rb @@ -15,6 +15,7 @@ require "bmff/box/progressive_download_info" require "bmff/box/movie" require "bmff/box/movie_header" +require "bmff/box/track" module BMFF::Box def self.get_box(io, parent)...
Add "require" for the Track Box class.
diff --git a/test/mobile/features/steps/unity_steps.rb b/test/mobile/features/steps/unity_steps.rb index abc1234..def5678 100644 --- a/test/mobile/features/steps/unity_steps.rb +++ b/test/mobile/features/steps/unity_steps.rb @@ -10,31 +10,38 @@ end When("I tap the {string} button") do |button| - # TODO: Better scre...
Use Appium to determine screen dimensions
diff --git a/VOKMockUrlProtocol.podspec b/VOKMockUrlProtocol.podspec index abc1234..def5678 100644 --- a/VOKMockUrlProtocol.podspec +++ b/VOKMockUrlProtocol.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "VOKMockUrlProtocol" - s.version = "2.0.1" + s.version = "2.0.2" s.summ...
Update podspec dependency for VOKBenkode and verison bump
diff --git a/core/db/migrate/20131118183431_add_line_item_id_to_spree_inventory_units.rb b/core/db/migrate/20131118183431_add_line_item_id_to_spree_inventory_units.rb index abc1234..def5678 100644 --- a/core/db/migrate/20131118183431_add_line_item_id_to_spree_inventory_units.rb +++ b/core/db/migrate/20131118183431_add_...
Make migration more tolerant of deleted Variants This migration bailed for me when it found an old order (before Spree used `acts_as_paranoid`) with a line_item referencing a Variant that no longer existed. Making the migration use `variant_id` instead of `variant.id` fixed this problem for me, and I suspect will mak...
diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb index abc1234..def5678 100644 --- a/app/controllers/questions_controller.rb +++ b/app/controllers/questions_controller.rb @@ -1,7 +1,9 @@ get '/questions/new' do - binding.pry @survey = Survey.find_by(id: params[:survey_i...
Implement separation of created and available surveys on surveys/index
diff --git a/app/controllers/activity_controller.rb b/app/controllers/activity_controller.rb index abc1234..def5678 100644 --- a/app/controllers/activity_controller.rb +++ b/app/controllers/activity_controller.rb @@ -0,0 +1,26 @@+class ActivityController < ApplicationController + + def show + # this gets called to ...
Add activity controller back in
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index abc1234..def5678 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -13,5 +13,13 @@ def respond_with_conflict(json_hash) render json: json_hash, status: :conflic...
Use logged in user (spree_current_user) for API authentication (current_api_user)
diff --git a/app/controllers/commutes_controller.rb b/app/controllers/commutes_controller.rb index abc1234..def5678 100644 --- a/app/controllers/commutes_controller.rb +++ b/app/controllers/commutes_controller.rb @@ -1,7 +1,13 @@ class CommutesController < ApplicationController def startcommute @commute = curre...
Improve error checking for duplicate 'start commute' requests