diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/lib/torque/postgresql/adapter/quoting.rb b/lib/torque/postgresql/adapter/quoting.rb index abc1234..def5678 100644 --- a/lib/torque/postgresql/adapter/quoting.rb +++ b/lib/torque/postgresql/adapter/quoting.rb @@ -31,6 +31,7 @@ lookup_cast_type_from_column(column) end + ...
Debug error in Circle CI
diff --git a/lib/similarweb/client.rb b/lib/similarweb/client.rb index abc1234..def5678 100644 --- a/lib/similarweb/client.rb +++ b/lib/similarweb/client.rb @@ -33,7 +33,7 @@ private def make_http_client! - base_url = "http://api.similarweb.com/Site/" + base_url = "https://api.similarweb.com/Site/" ...
Fix to make https request
diff --git a/lib/sponges/commander.rb b/lib/sponges/commander.rb index abc1234..def5678 100644 --- a/lib/sponges/commander.rb +++ b/lib/sponges/commander.rb @@ -14,7 +14,15 @@ if pid = @redis[:worker][@name][:supervisor].get begin Process.kill gracefully? ? :HUP : :QUIT, pid.to_i - Pr...
Remove Process.waitpid in rest action. See comments in this commit for more explanations. Signed-off-by: chatgris <f9469d12bf3d131e7aae80be27ccfe58aa9db1f1@af83.com>
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 @@ -22,14 +22,14 @@ it "can subscribe to a comic" do expect { user.subscribe!(comic) - }.to change { user.subscriptions.count }.by(1) + ...
Update syntax of expect in User spec - This is a better way of formatting the change expectation
diff --git a/spec/toy/plugins_spec.rb b/spec/toy/plugins_spec.rb index abc1234..def5678 100644 --- a/spec/toy/plugins_spec.rb +++ b/spec/toy/plugins_spec.rb @@ -12,16 +12,18 @@ @mod = Module.new { extend ActiveSupport::Concern - module ClassMethods - def foo - 'foo' - ...
Fix tests for ruby 1.8
diff --git a/activejob/test/helper.rb b/activejob/test/helper.rb index abc1234..def5678 100644 --- a/activejob/test/helper.rb +++ b/activejob/test/helper.rb @@ -13,6 +13,7 @@ else ActiveJob::Base.logger = Logger.new(nil) ActiveJob::Base.skip_after_callbacks_if_terminated = true + ActiveJob::Base.return_false_on_...
Set AJ `return_false_on_aborted_enqueue` true in the test suite: - Since this is going to be the default in 6.1, let's set it in the test suite to avoid deprecation warning. Otherwise one has to do `AS::Deprecation.silence { }` everytime we add a new test. Fix #38107
diff --git a/acts_as_paranoid.gemspec b/acts_as_paranoid.gemspec index abc1234..def5678 100644 --- a/acts_as_paranoid.gemspec +++ b/acts_as_paranoid.gemspec @@ -6,7 +6,7 @@ Gem::Specification.new do |spec| spec.name = "acts_as_paranoid" spec.version = ActsAsParanoid::VERSION - spec.authors = ["Zac...
Fix typo in gemspec authors
diff --git a/db/seeds.rb b/db/seeds.rb index abc1234..def5678 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,3 +1,2 @@-User.create!(username: "michael", password: "foobar") -User.create!(username: "lee", password: "asdfasdf") -User.create!(username: "nick", password: "fdsafdsa")+User.create!(username: "alice",...
Switch to Alice & Bob
diff --git a/db/seeds.rb b/db/seeds.rb index abc1234..def5678 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,14 +1,4 @@-puts 'Seeding initial configuration' -puts '-- creating roles' -Role.create([ - { :name => 'admin' }, - { :name => 'user' }, - { :name => 'superadmin'} -], :without_protection => true) -puts "Def...
Bugfix: Remove buggy role creation in seed script. + Additional roles without name are created by this code. + The method "add_role" already creates a role instance.
diff --git a/app.rb b/app.rb index abc1234..def5678 100644 --- a/app.rb +++ b/app.rb @@ -7,6 +7,18 @@ db = SQLite3::Database.new 'db/leprosorium.db' db.results_as_hash = true return db +end + +configure do + db = init_db + db.execute 'CREATE TABLE IF NOT EXISTS + "Posts" + ( + "Id" INTEGER PRIMARY KEY AUTOINCRE...
Create table 'Posts' in db file
diff --git a/app.rb b/app.rb index abc1234..def5678 100644 --- a/app.rb +++ b/app.rb @@ -58,4 +58,11 @@ @row = result[0] erb :post +end + +post '/post/:post_id' do + post_id = params[:post_id] + content = params[:content] + + erb "You typed: #{content} for #{post_id}" end
Add simple /post/ ... post handler
diff --git a/XYFSnowAnimation.podspec b/XYFSnowAnimation.podspec index abc1234..def5678 100644 --- a/XYFSnowAnimation.podspec +++ b/XYFSnowAnimation.podspec @@ -1,18 +1,20 @@ Pod::Spec.new do |s| + s.name = "XYFSnowAnimation" -s.version = "1.1.1" -s.summary = "A category of NSTimer for showing snow a...
Update cocoaPods depository to version 2.0.0
diff --git a/sync.gemspec b/sync.gemspec index abc1234..def5678 100644 --- a/sync.gemspec +++ b/sync.gemspec @@ -6,7 +6,7 @@ s.homepage = "http://github.com/chrismccord/sync" s.summary = "Realtime Rails Partials" s.description = "Sync turns your Rails partials realtime with automatic updates through Faye...
Include config directory when building gem.
diff --git a/core/db/migrate/20120228154434_lowercase_usernames.rb b/core/db/migrate/20120228154434_lowercase_usernames.rb index abc1234..def5678 100644 --- a/core/db/migrate/20120228154434_lowercase_usernames.rb +++ b/core/db/migrate/20120228154434_lowercase_usernames.rb @@ -0,0 +1,13 @@+class LowercaseUsernames < Mon...
Add migration to lowercase usernames
diff --git a/spec/factories/images.rb b/spec/factories/images.rb index abc1234..def5678 100644 --- a/spec/factories/images.rb +++ b/spec/factories/images.rb @@ -1,8 +1,7 @@ FactoryBot.define do factory :image do - attachment { StringIO.new(File.open("./spec/fixture.jpg").read) } - meta {({x: 1, y: 2, z: 3})}...
Upgrade complete, test coverage needs increase
diff --git a/spec/models/card_spec.rb b/spec/models/card_spec.rb index abc1234..def5678 100644 --- a/spec/models/card_spec.rb +++ b/spec/models/card_spec.rb @@ -14,8 +14,53 @@ }} describe 'Creating a new card' do + let(:inputs) { valid_inputs } + it 'can create a new card with all the required fields' do...
Add tests for Card creation
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 @@ -5,9 +5,9 @@ describe ".promptable" do it "returns promptable users for the current hour" do Timecop.freeze(Time.utc(2014, 1, 1, 11)) do # 11AM UT...
Remove unused variables to appease @houndci
diff --git a/app/models/manageiq/providers/redhat/infra_manager/vm.rb b/app/models/manageiq/providers/redhat/infra_manager/vm.rb index abc1234..def5678 100644 --- a/app/models/manageiq/providers/redhat/infra_manager/vm.rb +++ b/app/models/manageiq/providers/redhat/infra_manager/vm.rb @@ -37,4 +37,8 @@ else ...
Remove Migrate button for SCVMM VMs - Added new model methods, changed code to use is_available? method to determine availability of "migrate" task for VMs similar to power buttons for VMs - Added "validate_migrate" method to VM subclasses and have it return false for Redhat & SCVMM VMs, to hide Migrate button on appr...
diff --git a/db/migrate/20170201224715_add_category_id_to_items.rb b/db/migrate/20170201224715_add_category_id_to_items.rb index abc1234..def5678 100644 --- a/db/migrate/20170201224715_add_category_id_to_items.rb +++ b/db/migrate/20170201224715_add_category_id_to_items.rb @@ -1,5 +1,5 @@ class AddCategoryIdToItems < Ac...
Update migration and include .to_yaml after []
diff --git a/lib/group_smarts/attach/sources/file.rb b/lib/group_smarts/attach/sources/file.rb index abc1234..def5678 100644 --- a/lib/group_smarts/attach/sources/file.rb +++ b/lib/group_smarts/attach/sources/file.rb @@ -10,6 +10,8 @@ def store(source) @metadata = source.metadata + ...
Create the attachment directory if it does not exist
diff --git a/spec/models/good_spec.rb b/spec/models/good_spec.rb index abc1234..def5678 100644 --- a/spec/models/good_spec.rb +++ b/spec/models/good_spec.rb @@ -1,4 +1,4 @@-require "spec_helper" +require "rails_helper" describe Good, :type => :model do before :each do
Use rails_helper instead of spec_helper
diff --git a/spec/models/raid_spec.rb b/spec/models/raid_spec.rb index abc1234..def5678 100644 --- a/spec/models/raid_spec.rb +++ b/spec/models/raid_spec.rb @@ -3,6 +3,7 @@ describe Raid do before(:each) do @valid_attributes = { + :date => Time.now.to_s(:db) } end
Add date to Raid's valid_attributes
diff --git a/spec/commands/collect_all_cards_spec.rb b/spec/commands/collect_all_cards_spec.rb index abc1234..def5678 100644 --- a/spec/commands/collect_all_cards_spec.rb +++ b/spec/commands/collect_all_cards_spec.rb @@ -0,0 +1,21 @@+require 'rails_helper' + +RSpec.describe CollectAllCards do + describe "#call" do + ...
Add unit test for CollectAllCards
diff --git a/spec/models/file_not_found_page_spec.rb b/spec/models/file_not_found_page_spec.rb index abc1234..def5678 100644 --- a/spec/models/file_not_found_page_spec.rb +++ b/spec/models/file_not_found_page_spec.rb @@ -4,7 +4,7 @@ #dataset :file_not_found test_helper :render - let(:file_not_found){ pages(:fil...
Use FactoryGirl i.o. dataset in FileNotFoundPageSpec
diff --git a/act.gemspec b/act.gemspec index abc1234..def5678 100644 --- a/act.gemspec +++ b/act.gemspec @@ -8,7 +8,7 @@ spec.version = Act::VERSION spec.authors = ["Fabio Pelosin"] spec.email = ["fabiopelosin@gmail.com"] - spec.summary = %q{Act the command line tool to act on files.}...
[Gemspec] Make the summer flow better
diff --git a/lib/bubble-wrap.rb b/lib/bubble-wrap.rb index abc1234..def5678 100644 --- a/lib/bubble-wrap.rb +++ b/lib/bubble-wrap.rb @@ -29,7 +29,7 @@ Motion::Project::App.setup do |app| wrapper_files = [] - Dir.glob(File.join(File.dirname(__FILE__), 'bubble-wrap/*.rb')).each do |file| + Dir.glob(File.join(File....
Include files from BubbleWrap sub-directories when compiling.
diff --git a/app/models/profile.rb b/app/models/profile.rb index abc1234..def5678 100644 --- a/app/models/profile.rb +++ b/app/models/profile.rb @@ -10,7 +10,7 @@ named_scope :public, :conditions => { :exclusive => false } named_scope :public_plus, lambda { |*profilename| - {:conditions => "exclusive = false ...
Change condition syntax to make sure ActiveRecord gets to handle the implementation details of "false". Unbreaks sqlite3 in development mode.
diff --git a/spec/dm-tags/tag_spec.rb b/spec/dm-tags/tag_spec.rb index abc1234..def5678 100644 --- a/spec/dm-tags/tag_spec.rb +++ b/spec/dm-tags/tag_spec.rb @@ -6,7 +6,7 @@ end it "should have many Taggings" do - Tag.relationships.should have_key(:taggings) + Tag.relationships.named?(:taggings).should be(t...
Use the new RelationshipSet API
diff --git a/spec/support/matchers.rb b/spec/support/matchers.rb index abc1234..def5678 100644 --- a/spec/support/matchers.rb +++ b/spec/support/matchers.rb @@ -1,5 +1,3 @@-require 'rspec-expectations' - RSpec::Matchers.define :include_method do |expected| match do |actual| actual.map { |m| m.to_s }.include?(e...
Stop requiring a file that doens't exist anymore
diff --git a/spec/unit/spec_helper.rb b/spec/unit/spec_helper.rb index abc1234..def5678 100644 --- a/spec/unit/spec_helper.rb +++ b/spec/unit/spec_helper.rb @@ -4,9 +4,7 @@ RSpec.configure do |config| config.platform = 'mac_os_x' - config.version = '10.8.2' # FIXME: system ruby and fauxhai don't play nice - ...
Set fauxohai to latest OSX (El Capitan)
diff --git a/lib/redis-store.rb b/lib/redis-store.rb index abc1234..def5678 100644 --- a/lib/redis-store.rb +++ b/lib/redis-store.rb @@ -27,13 +27,9 @@ end end +# ActionDispatch::Session if ::Redis::Store.rails3? - # ActionDispatch::Session require "action_controller/session/redis_session_store" -elsif define...
Revert "Force ActiveSupport cache loading for Rails 2" This reverts commit d07c3099b0163781d1836e126bc5ded12643809b.
diff --git a/lib/round_robin.rb b/lib/round_robin.rb index abc1234..def5678 100644 --- a/lib/round_robin.rb +++ b/lib/round_robin.rb @@ -3,7 +3,8 @@ module RoundRobin def self.add(klass, *args) - + json = {:class => klass, :args => args}.to_json + RoundRobin::Job.create(:handler => json) end def self...
Make tests pass by adding functionality to RoundRobin.add
diff --git a/lib/sfn/command.rb b/lib/sfn/command.rb index abc1234..def5678 100644 --- a/lib/sfn/command.rb +++ b/lib/sfn/command.rb @@ -16,5 +16,30 @@ autoload :Update, 'sfn/command/update' autoload :Validate, 'sfn/command/validate' + # Override to provide config file searching + def initialize(opts, ...
Include helper to traverse FS for .sfn file discovery
diff --git a/lib/sfn/planner.rb b/lib/sfn/planner.rb index abc1234..def5678 100644 --- a/lib/sfn/planner.rb +++ b/lib/sfn/planner.rb @@ -5,6 +5,9 @@ class Planner autoload :Aws, 'sfn/planner/aws' + + # Value to flag runtime modification + RUNTIME_MODIFIED = '__MODIFIED_REFERENCE_VALUE__' # @return...
Define modified resource flag as a constant
diff --git a/activerecord/test/models/admin/user.rb b/activerecord/test/models/admin/user.rb index abc1234..def5678 100644 --- a/activerecord/test/models/admin/user.rb +++ b/activerecord/test/models/admin/user.rb @@ -1,10 +1,24 @@ class Admin::User < ActiveRecord::Base + class Coder + def initialize(default = {}) +...
Remove warning by using a custom coder The native JSON library bypasses the `to_json` overrides in active_support/core_ext/object/to_json.rb by calling its native implementation directly. However `ActiveRecord::Store` uses a HWIA so `JSON.dump` will call our `to_json` instead with a `State` object for options rather t...
diff --git a/Library/Homebrew/cask/lib/hbc/scopes.rb b/Library/Homebrew/cask/lib/hbc/scopes.rb index abc1234..def5678 100644 --- a/Library/Homebrew/cask/lib/hbc/scopes.rb +++ b/Library/Homebrew/cask/lib/hbc/scopes.rb @@ -6,8 +6,7 @@ module ClassMethods def all - @all_casks ||= {} - all_tokens...
Fix `brew cask audit` not working without argument.
diff --git a/Casks/opera-developer.rb b/Casks/opera-developer.rb index abc1234..def5678 100644 --- a/Casks/opera-developer.rb +++ b/Casks/opera-developer.rb @@ -1,6 +1,6 @@ cask :v1 => 'opera-developer' do - version '30.0.1820.0' - sha256 'ea0adb5c2e4c215ccdd784222b0432546137649eec3bc7c829d76662bd2326c8' + version '...
Upgrade Opera Developer.app to v30.0.1833.0
diff --git a/app/models/team_fight.rb b/app/models/team_fight.rb index abc1234..def5678 100644 --- a/app/models/team_fight.rb +++ b/app/models/team_fight.rb @@ -1,4 +1,7 @@ class TeamFight < ActiveRecord::Base belongs_to :shiro_team, class_name: "Team", foreign_key: "shiro_team_id" belongs_to :aka_team, class_nam...
Add aka and shiro members assoc to TeamFight
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index abc1234..def5678 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -22,6 +22,7 @@ params[:type] = 'all' end end + @people = @people - [current_...
Remove me from search results
diff --git a/app/uploaders/base_image_uploader.rb b/app/uploaders/base_image_uploader.rb index abc1234..def5678 100644 --- a/app/uploaders/base_image_uploader.rb +++ b/app/uploaders/base_image_uploader.rb @@ -37,7 +37,7 @@ # def grayscale() # manipulate! do |img| - # img.combine_options { |c| c.colorspace...
Optimize grayscale method of base image uploader
diff --git a/app/uploaders/image_uploader_base.rb b/app/uploaders/image_uploader_base.rb index abc1234..def5678 100644 --- a/app/uploaders/image_uploader_base.rb +++ b/app/uploaders/image_uploader_base.rb @@ -22,6 +22,11 @@ end process(:store) do |io, _context| + unless io.original_filename + ext = MIME:...
Set filename if original filename is unknown
diff --git a/gigasecond/gigasecond.rb b/gigasecond/gigasecond.rb index abc1234..def5678 100644 --- a/gigasecond/gigasecond.rb +++ b/gigasecond/gigasecond.rb @@ -1,9 +1,9 @@ class Gigasecond - def self.from time - time + 10**9 - end + def self.from time + time + 10**9 + end end module BookKeeping - VERSION = 6...
Fix style: tab-size (This time it will work)
diff --git a/Library/Formula/sshfs.rb b/Library/Formula/sshfs.rb index abc1234..def5678 100644 --- a/Library/Formula/sshfs.rb +++ b/Library/Formula/sshfs.rb @@ -12,7 +12,9 @@ def install ENV['ACLOCAL'] = "/usr/bin/aclocal -I/usr/share/aclocal -I#{HOMEBREW_PREFIX}/share/aclocal" - system "autoreconf", "--for...
SSHFS: Use paths to OS X supplied autotools
diff --git a/lib/sprinkle/installers/rake.rb b/lib/sprinkle/installers/rake.rb index abc1234..def5678 100644 --- a/lib/sprinkle/installers/rake.rb +++ b/lib/sprinkle/installers/rake.rb @@ -5,14 +5,12 @@ super parent, &block @commands = commands end - + protected - + d...
Remove unnecessary if test, @commands is set to an empty array by default
diff --git a/app/controllers/feedback_landing_controller.rb b/app/controllers/feedback_landing_controller.rb index abc1234..def5678 100644 --- a/app/controllers/feedback_landing_controller.rb +++ b/app/controllers/feedback_landing_controller.rb @@ -6,13 +6,13 @@ def index flash['feedback_referer'] = request.refe...
Tidy up some whitespace to keep Codacy happy Remove white space inside parentheses
diff --git a/lib/acts_as_notifiable/couriers/email.rb b/lib/acts_as_notifiable/couriers/email.rb index abc1234..def5678 100644 --- a/lib/acts_as_notifiable/couriers/email.rb +++ b/lib/acts_as_notifiable/couriers/email.rb @@ -13,7 +13,7 @@ end def mailer - if @notification.type == 'Notificati...
Fix notifiable based mailer check
diff --git a/lib/blockscore/error/blockscore_error.rb b/lib/blockscore/error/blockscore_error.rb index abc1234..def5678 100644 --- a/lib/blockscore/error/blockscore_error.rb +++ b/lib/blockscore/error/blockscore_error.rb @@ -6,10 +6,11 @@ attr_reader :http_status attr_reader :json_body - def initialize(me...
Allow BlockscoreError to initialize when json_body passed in is empty
diff --git a/lib/dynflow/executors/parallel/worker.rb b/lib/dynflow/executors/parallel/worker.rb index abc1234..def5678 100644 --- a/lib/dynflow/executors/parallel/worker.rb +++ b/lib/dynflow/executors/parallel/worker.rb @@ -9,17 +9,18 @@ end def on_message(work_item) - ok = false + ...
Enhance fix for termination with running action Previously, we would not respond to the pool in case of any exception coming from the `work_item.execute`. Even though I don't think we expect any other exceptions other than PeristenceError, it didn't feel right not to respond on any exception that might occur. When I ...
diff --git a/lib/rack-cas-rails/rails_application_additions.rb b/lib/rack-cas-rails/rails_application_additions.rb index abc1234..def5678 100644 --- a/lib/rack-cas-rails/rails_application_additions.rb +++ b/lib/rack-cas-rails/rails_application_additions.rb @@ -1,7 +1,7 @@ ## # Augments the Rails::Application class. ...
Use class_eval to extend Rails::Application also, just in case.
diff --git a/lib/smartdown/parser/flow_interpreter.rb b/lib/smartdown/parser/flow_interpreter.rb index abc1234..def5678 100644 --- a/lib/smartdown/parser/flow_interpreter.rb +++ b/lib/smartdown/parser/flow_interpreter.rb @@ -44,7 +44,7 @@ def interpret_node(input_data) Smartdown::Parser::NodeInterpreter....
Use input data filename rather for ParseError message
diff --git a/lib/dotjs_sprockets/engine.rb b/lib/dotjs_sprockets/engine.rb index abc1234..def5678 100644 --- a/lib/dotjs_sprockets/engine.rb +++ b/lib/dotjs_sprockets/engine.rb @@ -0,0 +1,58 @@+require "execjs" + +module DotjsSprockets + + # The engine class is in charge to handle the template compilation + # via Exe...
Add the Engine class ( in charge of template compilation ) This class is simply a wrapper of the execjs library, providing a clean interface for the TiltDot class
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index abc1234..def5678 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -1,6 +1,10 @@ class HomeController < ApplicationController - caches_action :index, :expires_in => 1.hour, :unless => ...
Put ab_variant into cache key for start page.
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index abc1234..def5678 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -0,0 +1,30 @@+class TagsController < ApplicationController + before_filter :authenticate_user! + + def index + pa...
Revert "TagsController to social stream" This reverts commit a52b5b3ea8f5b4bcc93d0f0dfb2cae3f0151ea23.
diff --git a/bedtools.rb b/bedtools.rb index abc1234..def5678 100644 --- a/bedtools.rb +++ b/bedtools.rb @@ -4,7 +4,7 @@ url 'http://bedtools.googlecode.com/files/BEDTools.v2.12.0.tar.gz' homepage 'http://code.google.com/p/bedtools/' md5 'cc7839a96a7537a810bb645381a2ba8a' - head 'git://github.com/arq5x/bedtool...
Use https for github repos.
diff --git a/lib/i18n_feature_additions.rb b/lib/i18n_feature_additions.rb index abc1234..def5678 100644 --- a/lib/i18n_feature_additions.rb +++ b/lib/i18n_feature_additions.rb @@ -1,20 +1,9 @@ module I18n class << self def has_feature?(feature) - #at the moment, only us countries can use these features -...
[SCR-673] Update perform feature so that features are specified in locales Previously, we allowed a feature only if it was for the USA. Now, we check the locale file for that country for the feature.feature_name. Unless the feature is set and equal to true, the feature cannot be run. Default truevalues can be set in t...
diff --git a/lib/identity/heroku_cookie.rb b/lib/identity/heroku_cookie.rb index abc1234..def5678 100644 --- a/lib/identity/heroku_cookie.rb +++ b/lib/identity/heroku_cookie.rb @@ -22,9 +22,8 @@ set_cookie(headers, "heroku_session", "1") set_cookie(headers, "heroku_session_nonce", env[@key]["nonce"]) ...
Make this code more symmetrical
diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb index abc1234..def5678 100644 --- a/app/controllers/admin/base_controller.rb +++ b/app/controllers/admin/base_controller.rb @@ -18,7 +18,24 @@ authorise_user!(User::Permissions::IMPORT) end + def can?(action, subj...
Add enforcer to admin controllers Provide enforce_permission! that renders a 403 when the current_user doesn't have permission to perform the requested action on the supplied subject. Also can? that doe the same check but returns true or false and is exposed as a helper method for use in views.
diff --git a/rails/app/models/user.rb b/rails/app/models/user.rb index abc1234..def5678 100644 --- a/rails/app/models/user.rb +++ b/rails/app/models/user.rb @@ -11,11 +11,16 @@ User.find_by(token: token) || begin remote = Octokit::Client.new access_token: token user = User.create token: token, usernam...
Set owner on repo creation
diff --git a/Casks/emacs.rb b/Casks/emacs.rb index abc1234..def5678 100644 --- a/Casks/emacs.rb +++ b/Casks/emacs.rb @@ -8,4 +8,9 @@ license :oss app 'Emacs.app' + binary 'Emacs.app/Contents/MacOS/bin/emacsclient' + binary 'Emacs.app/Contents/MacOS/bin/ctags' + binary 'Emacs.app/Contents/MacOS/bin/grep-change...
Install Additional Emacs Utility Binaries
diff --git a/Casks/ipaql.rb b/Casks/ipaql.rb index abc1234..def5678 100644 --- a/Casks/ipaql.rb +++ b/Casks/ipaql.rb @@ -0,0 +1,7 @@+class Ipaql < Cask + url 'http://ipaql.com/site/assets/files/1006/ipaql_1-3-0.zip' + homepage 'http://ipaql.com/' + version '1.3.0' + sha1 'a870da34839b42945cf2334c7a27c2574d41ffcd' +...
Add CocoaDeveloper Quicklook Plugin v1.3.0
diff --git a/app/jobs/gend_image_process_job.rb b/app/jobs/gend_image_process_job.rb index abc1234..def5678 100644 --- a/app/jobs/gend_image_process_job.rb +++ b/app/jobs/gend_image_process_job.rb @@ -14,16 +14,20 @@ gend_image.src_image.image, gend_image.captions.map(&:text_pos)).to_blob - thumb_img ...
Move thumbnail generation into separate method.
diff --git a/bench/bench_buffer.rb b/bench/bench_buffer.rb index abc1234..def5678 100644 --- a/bench/bench_buffer.rb +++ b/bench/bench_buffer.rb @@ -0,0 +1,45 @@+require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper")) + +require 'benchmark' +require 'ffi' +iter = 100_000 + +module BufferBench + ext...
Add benchmarks for MemoryPointer vs Buffer vs 0.chr * size
diff --git a/bench/bench_enum_i.rb b/bench/bench_enum_i.rb index abc1234..def5678 100644 --- a/bench/bench_enum_i.rb +++ b/bench/bench_enum_i.rb @@ -0,0 +1,17 @@+require File.expand_path(File.join(File.dirname(__FILE__), "bench_helper")) + +module LibTest + extend FFI::Library + ffi_lib LIBTEST_PATH + enum :foo, [ :...
Add enum bench for :int parameter types
diff --git a/Casks/skype.rb b/Casks/skype.rb index abc1234..def5678 100644 --- a/Casks/skype.rb +++ b/Casks/skype.rb @@ -16,5 +16,11 @@ app 'Skype.app' - zap :delete => '~/Library/Application Support/Skype' + zap :delete => [ + '~/Library/Application Support/Skype', + '~/Librar...
Add missing zap stanza for Skype
diff --git a/Casks/zulip.rb b/Casks/zulip.rb index abc1234..def5678 100644 --- a/Casks/zulip.rb +++ b/Casks/zulip.rb @@ -2,6 +2,7 @@ version :latest sha256 :no_check + # zulip.com was verified as official when first introduced to the cask url 'https://zulip.com/dist/apps/mac/Zulip-latest.dmg' name 'Zulip'...
Fix `url` stanza comment for Zulip.
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 @@ -1,4 +1,13 @@ class UsersController < ApplicationController + def activate + if (@user = User.load_from_activati...
Add Activate Method Action To Activated User
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 @@ -1,6 +1,4 @@ class UsersController < ApplicationController -<<<<<<< HEAD - def create user = User.new(user_p...
Add users show, eliminate empty routes in users controller
diff --git a/app/controllers/archives_controller.rb b/app/controllers/archives_controller.rb index abc1234..def5678 100644 --- a/app/controllers/archives_controller.rb +++ b/app/controllers/archives_controller.rb @@ -12,7 +12,7 @@ #TODO: check if archive belong to user @archive.transition_to :generating C...
Fix redirection after archive generation to respect previous params (and bring back to original page)
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb index abc1234..def5678 100644 --- a/app/controllers/profiles_controller.rb +++ b/app/controllers/profiles_controller.rb @@ -8,7 +8,7 @@ def update respond_to do |format| if @profile.update(profile_params) - ...
Add ability to upload new profile photos
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb index abc1234..def5678 100644 --- a/app/controllers/profiles_controller.rb +++ b/app/controllers/profiles_controller.rb @@ -20,7 +20,7 @@ def student if @classroom = current_user.classroom - @units = @classroom.cl...
Fix one N+1 query found via bullet
diff --git a/app/controllers/resource_controller.rb b/app/controllers/resource_controller.rb index abc1234..def5678 100644 --- a/app/controllers/resource_controller.rb +++ b/app/controllers/resource_controller.rb @@ -1,6 +1,6 @@ class ResourceController < ApplicationController - before_filter(:only => [:index, :sh...
Change filter name as per new version of alternate_rails
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 @@ -8,7 +8,9 @@ def destroy_and_redirect sign_out current_user - if params[:project_id] + if...
Add redirect_to parameter to not-my-account route Signed-off-by: Vinicius Andrade <16687ac525c18d05db54be8266913435a820383c@gmail.com>
diff --git a/app/cyclid/plugins/action/cobertura.rb b/app/cyclid/plugins/action/cobertura.rb index abc1234..def5678 100644 --- a/app/cyclid/plugins/action/cobertura.rb +++ b/app/cyclid/plugins/action/cobertura.rb @@ -0,0 +1,71 @@+# frozen_string_literal: true +# Copyright 2016, 2017 Liqwyd Ltd. +# +# Licensed under the...
Add a Cobertura coverage plugin The Cobertura plugin reads a Cobertura XML coverage report and adds the test coverage metrics to the job context as a percentage under "cobertura_line_rate" and "cobertura_branch_rate"
diff --git a/bible-passage.gemspec b/bible-passage.gemspec index abc1234..def5678 100644 --- a/bible-passage.gemspec +++ b/bible-passage.gemspec @@ -5,7 +5,7 @@ s.authors = ["Si Wilkins"] s.email = 'si.wilkins@gmail.com' s.homepage = 'https://github.com/siwilkins/bible-passage' - readmes = D...
Fix gemspec to not include gem files
diff --git a/app/models/registerable_redirect.rb b/app/models/registerable_redirect.rb index abc1234..def5678 100644 --- a/app/models/registerable_redirect.rb +++ b/app/models/registerable_redirect.rb @@ -1,9 +1,6 @@-class RegisterableRedirect < OpenStruct - include ActiveModel::Validations +class RegisterableRedirect...
Refactor RegisterableRedirect to avoid duplication. It shares all the validations of RegisterableRoute, so it makes sense for it to inherit from it.
diff --git a/lib/polisher/targets/bodhi.rb b/lib/polisher/targets/bodhi.rb index abc1234..def5678 100644 --- a/lib/polisher/targets/bodhi.rb +++ b/lib/polisher/targets/bodhi.rb @@ -5,6 +5,11 @@ # XXX issue w/ retreiving packages from pkgwat causing sporadic issues: # https://github.com/fedora-infra/fedora-packages/i...
Handle Bodhi err where html anchor is being returned for version
diff --git a/app/models/untrained_students_alert.rb b/app/models/untrained_students_alert.rb index abc1234..def5678 100644 --- a/app/models/untrained_students_alert.rb +++ b/app/models/untrained_students_alert.rb @@ -39,6 +39,6 @@ end def reply_to - from_user.email + from_user&.email end end
Handle non-existent user for UntrainedStudentsAlert emails
diff --git a/app/parameters/live_time_parameters.rb b/app/parameters/live_time_parameters.rb index abc1234..def5678 100644 --- a/app/parameters/live_time_parameters.rb +++ b/app/parameters/live_time_parameters.rb @@ -1,7 +1,7 @@ class LiveTimeParameters < BaseParameters def self.permitted - [:id, :event_id, :la...
Add :military_time to LiveTimeParameters.permitted (was inadvertently deleted in a merge).
diff --git a/app/services/never_logged_in_notifier.rb b/app/services/never_logged_in_notifier.rb index abc1234..def5678 100644 --- a/app/services/never_logged_in_notifier.rb +++ b/app/services/never_logged_in_notifier.rb @@ -5,12 +5,19 @@ Person.never_logged_in.each do |person| person.with_lock do # use db...
Move send reminder step into a private method
diff --git a/app/presenters/field/text_presenter.rb b/app/presenters/field/text_presenter.rb index abc1234..def5678 100644 --- a/app/presenters/field/text_presenter.rb +++ b/app/presenters/field/text_presenter.rb @@ -19,6 +19,7 @@ end def render_markdown(t) + t ||= '' v = Redcarpet::Markdown.new( ...
Handle empty text for formatted text field
diff --git a/lib/rubocop/cop/style/send.rb b/lib/rubocop/cop/style/send.rb index abc1234..def5678 100644 --- a/lib/rubocop/cop/style/send.rb +++ b/lib/rubocop/cop/style/send.rb @@ -8,10 +8,13 @@ MSG = 'Prefer `Object#__send__` or `Object#public_send` to ' \ '`send`.'.freeze + def_node_ma...
Modify Style/Send to use NodePattern
diff --git a/cookbook/recipes/build.rb b/cookbook/recipes/build.rb index abc1234..def5678 100644 --- a/cookbook/recipes/build.rb +++ b/cookbook/recipes/build.rb @@ -25,6 +25,5 @@ repository 'https://github.com/HubSpot/Baragon.git' reference node[:baragon][:git_ref] user node[:baragon][:user] - action ...
Use sync action for git instead of export
diff --git a/app/services/nomis/offender/details.rb b/app/services/nomis/offender/details.rb index abc1234..def5678 100644 --- a/app/services/nomis/offender/details.rb +++ b/app/services/nomis/offender/details.rb @@ -6,16 +6,11 @@ attribute :given_name, :string attribute :surname, :string attribute ...
Revert "Add missing API fields" This reverts commit a936673458370cfe0e81b428a6952d6823a21708.
diff --git a/lib/soapforce/query_result.rb b/lib/soapforce/query_result.rb index abc1234..def5678 100644 --- a/lib/soapforce/query_result.rb +++ b/lib/soapforce/query_result.rb @@ -19,14 +19,6 @@ @result_records.each(&block) end - def first - @result_records.first - end - - def last - @r...
Switch to method_missing in QueryResult to delegate calls to the internal array.
diff --git a/lib/tasks/data_extractor.rake b/lib/tasks/data_extractor.rake index abc1234..def5678 100644 --- a/lib/tasks/data_extractor.rake +++ b/lib/tasks/data_extractor.rake @@ -0,0 +1,29 @@+namespace :data_extractor do + desc "Creates a CSV with with the links data of all the Whitehall items" + namespace :list_ta...
Add rake task to extract links data We are aiming at having topics tagging Whitehall in sync with publishing-api. The output of this rake task will allow us to validate our changes. Ticket: https://trello.com/c/mtYIToz9/527-whitehall-migration-send-topics-to-publishing-api-as-links-m
diff --git a/BHCDatabase/app/grids/enrolments_grid.rb b/BHCDatabase/app/grids/enrolments_grid.rb index abc1234..def5678 100644 --- a/BHCDatabase/app/grids/enrolments_grid.rb +++ b/BHCDatabase/app/grids/enrolments_grid.rb @@ -36,5 +36,19 @@ link_to init.name, init end end + column(:created_at, :header => ...
Add basic date information to enrolments grid.
diff --git a/app/controllers/api/v1/api_controller.rb b/app/controllers/api/v1/api_controller.rb index abc1234..def5678 100644 --- a/app/controllers/api/v1/api_controller.rb +++ b/app/controllers/api/v1/api_controller.rb @@ -5,6 +5,7 @@ class ApiController < ApplicationController protect_from_forgery with: :...
Remove devise cookie storage in api
diff --git a/rspecs/model/nodes/pool_spec.rb b/rspecs/model/nodes/pool_spec.rb index abc1234..def5678 100644 --- a/rspecs/model/nodes/pool_spec.rb +++ b/rspecs/model/nodes/pool_spec.rb @@ -1,4 +1,5 @@ require 'rspec' +require_relative '../../../domain/diagram' describe Pool do
Add require to load classes (in case this file gets run on its own).
diff --git a/ruboty-leveldb.gemspec b/ruboty-leveldb.gemspec index abc1234..def5678 100644 --- a/ruboty-leveldb.gemspec +++ b/ruboty-leveldb.gemspec @@ -21,5 +21,5 @@ spec.add_dependency "leveldb" spec.add_development_dependency "bundler", "~> 1.7" - spec.add_development_dependency "rake", "~> 10.0" + spec.add...
Update rake requirement from ~> 10.0 to ~> 13.0 Updates the requirements on [rake](https://github.com/ruby/rake) to permit the latest version. - [Release notes](https://github.com/ruby/rake/releases) - [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc) - [Commits](https://github.com/ruby/rake/compare/r...
diff --git a/spec/unit/veritas/logic/predicate/enumerable/class_methods/compare_method_spec.rb b/spec/unit/veritas/logic/predicate/enumerable/class_methods/compare_method_spec.rb index abc1234..def5678 100644 --- a/spec/unit/veritas/logic/predicate/enumerable/class_methods/compare_method_spec.rb +++ b/spec/unit/veritas...
Change nested describe blocks into context blocks
diff --git a/lib/london_bike_hire_cli/basic_renderer.rb b/lib/london_bike_hire_cli/basic_renderer.rb index abc1234..def5678 100644 --- a/lib/london_bike_hire_cli/basic_renderer.rb +++ b/lib/london_bike_hire_cli/basic_renderer.rb @@ -5,22 +5,22 @@ end def render(context) - output.print ">>>>>>>>>>>>>>>>>...
Add basic colouring to terminal using ansi colours Think this should be good on osx and linux; screw windows :|
diff --git a/app/controllers/main_chat_controller.rb b/app/controllers/main_chat_controller.rb index abc1234..def5678 100644 --- a/app/controllers/main_chat_controller.rb +++ b/app/controllers/main_chat_controller.rb @@ -2,6 +2,6 @@ respond_to :html, :json def index - respond_with Message.last_five_main_chat_...
Move MainChatController to use refactored last_five_chat_messages method
diff --git a/app/controllers/users/pbs_controller.rb b/app/controllers/users/pbs_controller.rb index abc1234..def5678 100644 --- a/app/controllers/users/pbs_controller.rb +++ b/app/controllers/users/pbs_controller.rb @@ -6,7 +6,7 @@ def show if @user.patron?(tier: 3) if params[:trailing_path].nil? - ...
Fix a permalink redirector 500
diff --git a/app/controllers/validator_controller.rb b/app/controllers/validator_controller.rb index abc1234..def5678 100644 --- a/app/controllers/validator_controller.rb +++ b/app/controllers/validator_controller.rb @@ -1,3 +1,6 @@+require 'resolv' +require 'net/smtp' + class ValidatorController < ApplicationControll...
Add dns and smtp validations
diff --git a/app/helpers/puddy/application_helper.rb b/app/helpers/puddy/application_helper.rb index abc1234..def5678 100644 --- a/app/helpers/puddy/application_helper.rb +++ b/app/helpers/puddy/application_helper.rb @@ -1,4 +1,9 @@ module Puddy module ApplicationHelper + def method_missing(method, *args, &block)...
Send missing helper methods to main app
diff --git a/spec/controllers/user_spec.rb b/spec/controllers/user_spec.rb index abc1234..def5678 100644 --- a/spec/controllers/user_spec.rb +++ b/spec/controllers/user_spec.rb @@ -17,16 +17,24 @@ before :each do allow(klass).to receive(:get).and_return(user) + + cfg = instance_double(Cyclid::UI::Config) + ...
Make the redirect test slightly more robust
diff --git a/lib/alf/lang/literals.rb b/lib/alf/lang/literals.rb index abc1234..def5678 100644 --- a/lib/alf/lang/literals.rb +++ b/lib/alf/lang/literals.rb @@ -15,12 +15,7 @@ # Coerces `args` to a valid relation. def Relation(first, *args) if args.empty? - case first - when ::Sy...
Fix Relation literal to behave the same in Ruby and in Lispy.
diff --git a/spec/views/users/_edittable_user.html.erb_spec.rb b/spec/views/users/_edittable_user.html.erb_spec.rb index abc1234..def5678 100644 --- a/spec/views/users/_edittable_user.html.erb_spec.rb +++ b/spec/views/users/_edittable_user.html.erb_spec.rb @@ -1,28 +1,28 @@ require 'spec_helper' -permission_regex = /<i...
Fix scope of permission regex
diff --git a/rb/lib/selenium/webdriver/common/zipper.rb b/rb/lib/selenium/webdriver/common/zipper.rb index abc1234..def5678 100644 --- a/rb/lib/selenium/webdriver/common/zipper.rb +++ b/rb/lib/selenium/webdriver/common/zipper.rb @@ -36,7 +36,7 @@ entry = file.sub("#{path}/", '') zos.put_next_...
JariBakken: Make sure we properly zip binary files on Windows. git-svn-id: 4179480af2c2519a5eb5e1e9b541cbdf5cf27696@11358 07704840-8298-11de-bf8c-fd130f914ac9
diff --git a/spec/models/manageiq/providers/cloud_manager/orchestration_template_runner_spec.rb b/spec/models/manageiq/providers/cloud_manager/orchestration_template_runner_spec.rb index abc1234..def5678 100644 --- a/spec/models/manageiq/providers/cloud_manager/orchestration_template_runner_spec.rb +++ b/spec/models/ma...
Fix expected instance id, fix zone handling.