diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index abc1234..def5678 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -7,7 +7,7 @@ require 'simplecov' SimpleCov.start do - add_group "API", "lib/evertrue/api" + add_group 'API', 'lib/evertrue/api' end VCR.configure do |c|
Add api group to SimpleCov
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,8 +1,9 @@ require 'dm-transactions' -require 'dm-core/spec/lib/counter_adapter' +require 'dm-core/spec/lib/spec_helper' require 'dm-core/spec/lib/pending_helpers' require 'd...
Use global model cleanup code from dm-core. All green now!
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,5 +1,5 @@ $:.unshift File.expand_path('../../lib', __FILE__) -require 'chef/knife/cloud/exceptions' +require 'chef/exceptions' require 'json' class App
Fix require path for Chef::Exceptions
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 @@ -5,6 +5,16 @@ add_filter '/gem/' end SimpleCov.minimum_coverage 100 + +# Minimal auto-load for quicker specs. This avoids loading the whole of Rails +# solely for dependency re...
Facilitate running specs without Rails By implementing the bare bones of autoload and loading a few libraries, we can avoid having to require rails_helper - and thus the whole of Rails - which takes a significant time.
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,6 +2,7 @@ require 'chefspec' require 'chefspec/berkshelf' +ChefSpec::Coverage.start! require 'chef/application' @@ -14,10 +15,6 @@ # Omit warnings from output con...
Reposition ChefSpec::Coverage as per ChefSpec docs
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,7 +2,7 @@ ENGINE_RAILS_ROOT = File.join(File.dirname(__FILE__), '../') if ENV['CODECLIMATE_REPO_TOKEN'] - require "codeclimate-test-reporter" + require 'codeclimate-test-re...
Allow VCR to post to codeclimate
diff --git a/discover_oids.rb b/discover_oids.rb index abc1234..def5678 100644 --- a/discover_oids.rb +++ b/discover_oids.rb @@ -1,8 +1,14 @@ require 'config/initialize.rb' +pool_size = 10 +executorPool = Executors.newFixedThreadPool(10) +# partitions = Java::JavaUtil::ArrayList.new + # TODO move into discoverer class...
Use Executor and ThreadPool to look up oids by device. Request timeouts will no longer kill main thread.
diff --git a/spec/features/nav_spec.rb b/spec/features/nav_spec.rb index abc1234..def5678 100644 --- a/spec/features/nav_spec.rb +++ b/spec/features/nav_spec.rb @@ -3,11 +3,9 @@ RSpec.describe "nav", :js => true, :type => :feature do include Capybara::Angular::DSL - before do + it "contains links to top-level pa...
Add test for nav bar link highlighting
diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb index abc1234..def5678 100644 --- a/spec/models/event_spec.rb +++ b/spec/models/event_spec.rb @@ -0,0 +1,68 @@+require 'spec_helper' + +describe Event do + describe '.create_from_lastfm' do + let(:data) { + { + lastfm_uuid: "3...
Add specs for Event import from Lastfm
diff --git a/0_code_wars/alternating_case.rb b/0_code_wars/alternating_case.rb index abc1234..def5678 100644 --- a/0_code_wars/alternating_case.rb +++ b/0_code_wars/alternating_case.rb @@ -0,0 +1,14 @@+# http://www.codewars.com/kata/56efc695740d30f963000557/ +# --- iteration 1 --- +class String + def to_alternating_ca...
Add code wars (8) - alternating case
diff --git a/dynosaur.gemspec b/dynosaur.gemspec index abc1234..def5678 100644 --- a/dynosaur.gemspec +++ b/dynosaur.gemspec @@ -20,7 +20,7 @@ spec.add_runtime_dependency 'platform-api', '>= 2.0', '< 2.3' spec.add_runtime_dependency 'sys-proctable', '>= 0.9', '< 2.0' - spec.add_development_dependency 'bundler',...
Update bundler requirement from ~> 1.8 to ~> 2.0 Updates the requirements on [bundler](https://github.com/bundler/bundler) to permit the latest version. - [Release notes](https://github.com/bundler/bundler/releases) - [Changelog](https://github.com/bundler/bundler/blob/master/CHANGELOG.md) - [Commits](https://github.c...
diff --git a/test/cookbooks/test/recipes/source.rb b/test/cookbooks/test/recipes/source.rb index abc1234..def5678 100644 --- a/test/cookbooks/test/recipes/source.rb +++ b/test/cookbooks/test/recipes/source.rb @@ -2,5 +2,6 @@ node.default['php']['install_method'] = 'source' node.default['php']['pear'] = '/usr/local/b...
Use a different mirror in testing since GH Actions is blocked Signed-off-by: Tim Smith <764ef62106582a09ed09dfa0b6bff7c05fd7d1e4@chef.io>
diff --git a/lib/alavetelitheme.rb b/lib/alavetelitheme.rb index abc1234..def5678 100644 --- a/lib/alavetelitheme.rb +++ b/lib/alavetelitheme.rb @@ -1,7 +1,11 @@ class ActionController::Base - before_filter :set_view_paths - - def set_view_paths + # The following prepends the path of the current theme...
Create and use a dynamically-named filter path for the theme, so we can ensure multiple themes don't overwrite each other.
diff --git a/lib/enum_help/i18n.rb b/lib/enum_help/i18n.rb index abc1234..def5678 100644 --- a/lib/enum_help/i18n.rb +++ b/lib/enum_help/i18n.rb @@ -1,24 +1,15 @@ module EnumHelp + module I18n # overwrite the enum method def enum( definitions ) - klass = self super( definitions ) - defin...
Create a dynamic method to translate enum collections For a field named "status" we now have a "Foo.statuses_i18n" method, which is similar to the existing "foo_instance.status_i18n". Refactored the code to keep everything understandable with the new changes. It now uses "instance_eval" and "class_eval" with string a...
diff --git a/cats.gemspec b/cats.gemspec index abc1234..def5678 100644 --- a/cats.gemspec +++ b/cats.gemspec @@ -1,7 +1,7 @@ # coding: utf-8 lib = File.expand_path('../lib', __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) -require 'cats/version' +require 'cats' Gem::Specification.new do |spec| ...
Fix getting Cats::VERSION from the gemspec
diff --git a/lib/money_accessor.rb b/lib/money_accessor.rb index abc1234..def5678 100644 --- a/lib/money_accessor.rb +++ b/lib/money_accessor.rb @@ -7,21 +7,39 @@ def money_accessor(*columns) Array(columns).flatten.each do |name| define_method(name) do - value = instance_variable_get("@#{na...
Use struct accessor instead of instance variable set/get
diff --git a/firebase.gemspec b/firebase.gemspec index abc1234..def5678 100644 --- a/firebase.gemspec +++ b/firebase.gemspec @@ -21,7 +21,7 @@ s.licenses = ["MIT"] s.summary = "Firebase wrapper for Ruby" - s.add_runtime_dependency 'httpclient' + s.add_runtime_dependency 'httpclient', '>= 2.5.3' s.add_runtim...
Update required version of httpclient to ensure :default_header works Closes https://github.com/oscardelben/firebase-ruby/issues/75
diff --git a/lib/protest/runner.rb b/lib/protest/runner.rb index abc1234..def5678 100644 --- a/lib/protest/runner.rb +++ b/lib/protest/runner.rb @@ -16,6 +16,9 @@ test_case.run(self) fire_event :exit, test_case end + rescue Interrupt + $stderr.puts "Interrupted!" + ensure fire_...
Stop test suite when ^C
diff --git a/lib/rom/repository.rb b/lib/rom/repository.rb index abc1234..def5678 100644 --- a/lib/rom/repository.rb +++ b/lib/rom/repository.rb @@ -1,6 +1,5 @@ module ROM - # Repository exposes native database connection and schema when it's - # supported by the adapter + # Repository exposes schema if supported by...
Remove unused `connection` from Repository
diff --git a/lib/hash_easy/bottomless_hash.rb b/lib/hash_easy/bottomless_hash.rb index abc1234..def5678 100644 --- a/lib/hash_easy/bottomless_hash.rb +++ b/lib/hash_easy/bottomless_hash.rb @@ -1,15 +1,17 @@-class BottomlessHash < Hash - def initialize - super &-> h, k { h[k] = self.class.new } +module HashEasy + c...
Fix bottomless hash add module
diff --git a/lib/ids_please/grabbers/vimeo.rb b/lib/ids_please/grabbers/vimeo.rb index abc1234..def5678 100644 --- a/lib/ids_please/grabbers/vimeo.rb +++ b/lib/ids_please/grabbers/vimeo.rb @@ -3,10 +3,10 @@ class Vimeo < IdsPlease::Grabbers::Base def grab_link - @network_id = find_network_id + ...
Comment out network id and username for now
diff --git a/lib/support/string.rb b/lib/support/string.rb index abc1234..def5678 100644 --- a/lib/support/string.rb +++ b/lib/support/string.rb @@ -30,7 +30,7 @@ "create" when "index", "show" "read" - when "edit", "update", "position", "toggle", "relate", "unrelate", "detach" + when "edit", "up...
Detach was removed a few commits ago
diff --git a/lib/tasks/deploy.rake b/lib/tasks/deploy.rake index abc1234..def5678 100644 --- a/lib/tasks/deploy.rake +++ b/lib/tasks/deploy.rake @@ -0,0 +1,16 @@+namespace :load do + task :defaults do + set :owned_by_user, 'app' + set :owned_by_group, 'deploy' + end +end + +namespace :deploy do + task :set_app...
Add ability to change user / group permissions in release directory
diff --git a/consumer.rb b/consumer.rb index abc1234..def5678 100644 --- a/consumer.rb +++ b/consumer.rb @@ -17,12 +17,13 @@ def do_work_that_blocks_the_event_loop(arg) p arg Vertx.exit if arg >= 500 - sleep(0.1) end -Vertx.set_timer(1_000) do - sub = eventstore.new_catchup_subscription(stream, -1) - sub.on...
Remove sleep, restructure a bit
diff --git a/cogy.gemspec b/cogy.gemspec index abc1234..def5678 100644 --- a/cogy.gemspec +++ b/cogy.gemspec @@ -13,7 +13,7 @@ "and deploying commands from your application is a breeze." s.license = "MIT" - s.files = Dir["{app,config,lib}/**/*", "LICENSE", "Rakefile", "README.md"] + s.files = Dir["{app,c...
Include CHANGELOG.md in gem files
diff --git a/config/software/libmysql.rb b/config/software/libmysql.rb index abc1234..def5678 100644 --- a/config/software/libmysql.rb +++ b/config/software/libmysql.rb @@ -14,10 +14,10 @@ # limitations under the License. # name "libmysql" -version "6.1.0" +version "6.1.3" source :url => "http://mirror.cogentc...
Update mysql-connector source url and md5sum The previous version (6.1.0) of mysql-connector is no longer available at cogentco.com. Update this to the latest version, 6.1.3.
diff --git a/immortal.gemspec b/immortal.gemspec index abc1234..def5678 100644 --- a/immortal.gemspec +++ b/immortal.gemspec @@ -10,13 +10,13 @@ s.summary = %q{Replacement for acts_as_paranoid for Rails 3} s.description = %q{Typical paranoid gem built for Rails 3 and with the minimum code needed to satisfy act...
Set activerecord to ~> 3.2.0 version
diff --git a/http-commands.gemspec b/http-commands.gemspec index abc1234..def5678 100644 --- a/http-commands.gemspec +++ b/http-commands.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = 'http-commands' - s.version = '0.0.2.5' + s.version = '0.0.2.6' s.summary = 'Convenience abstractions for common...
Package version is increased from 0.0.2.5 to 0.0.2.6
diff --git a/db/seeds.rb b/db/seeds.rb index abc1234..def5678 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -2,3 +2,19 @@ Role.create!(:name => Role::ADMIN, :kind => Role::KIND_ADMIN) Role.create!(:name => Role::MEMBER, :kind => Role::KIND_MEMBER) end + +unless User.count > 0 + hostname = ENV["GITORIOUS_HOSTNAME...
Create admin user when seeding the database
diff --git a/db/seeds.rb b/db/seeds.rb index abc1234..def5678 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,25 @@-# This file should contain all the record creation needed to seed the database with its default values. -# The data can then be loaded with the rake db:seed (or created alongside the db with db:setu...
Add fake data in seed file.
diff --git a/ws-test.rb b/ws-test.rb index abc1234..def5678 100644 --- a/ws-test.rb +++ b/ws-test.rb @@ -0,0 +1,22 @@+require 'faye/websocket' +require 'eventmachine' + +EM.run do + ws = Faye::WebSocket::Client.new('ws://127.0.0.1:6601/') + + ws.on :open do |_| + p [:open] + Thread.new do + loop { ws.send(...
Make a script to test websocket connections
diff --git a/commands.rb b/commands.rb index abc1234..def5678 100644 --- a/commands.rb +++ b/commands.rb @@ -1,5 +1,5 @@ GitHub.register :open do - if remote = `git config -l`.split("\n").detect { |line| line =~ /remote.origin.url/ } + if remote = `git config --get remote.origin.url`.chomp exec "open http://git...
Use git config --get for obtaining the single config value
diff --git a/core/lib/generators/refinery/engine/templates/spec/models/refinery/singular_name_spec.rb b/core/lib/generators/refinery/engine/templates/spec/models/refinery/singular_name_spec.rb index abc1234..def5678 100644 --- a/core/lib/generators/refinery/engine/templates/spec/models/refinery/singular_name_spec.rb ++...
Simplify engine generator model spec template.
diff --git a/db/migrate/20090218111119_rename_participations_to_committers_and_make_it_polymorphic.rb b/db/migrate/20090218111119_rename_participations_to_committers_and_make_it_polymorphic.rb index abc1234..def5678 100644 --- a/db/migrate/20090218111119_rename_participations_to_committers_and_make_it_polymorphic.rb ++...
Fix spelling error in migrate script (reload_column_information) Signed-off-by: Tor Arne Vestbø <e15670bde49f42788b511fae93b8512474990c44@gmail.com>
diff --git a/lib/emcee/railtie.rb b/lib/emcee/railtie.rb index abc1234..def5678 100644 --- a/lib/emcee/railtie.rb +++ b/lib/emcee/railtie.rb @@ -6,6 +6,12 @@ initializer :add_html_processor do |app| app.assets.register_mime_type "text/html", ".html" app.assets.register_preprocessor "text/html", HtmlPr...
Add html compressor as shorthand bundle processor
diff --git a/lib/hestia/railtie.rb b/lib/hestia/railtie.rb index abc1234..def5678 100644 --- a/lib/hestia/railtie.rb +++ b/lib/hestia/railtie.rb @@ -10,7 +10,7 @@ extension = case ActionPack::VERSION::MAJOR when 3 Hestia::SignedCookieJarExtension::ActionPack3 - when 4 + else if ...
Use Hestia::SignedCookieJarExtension::ActionPack4 when actionpack version is >= 4
diff --git a/lib/lifx/utilities.rb b/lib/lifx/utilities.rb index abc1234..def5678 100644 --- a/lib/lifx/utilities.rb +++ b/lib/lifx/utilities.rb @@ -2,18 +2,23 @@ module Utilities def try_until(condition_proc, timeout_exception: Timeout::Error, timeout: 3, - ...
Split out condition_interval and action_interval to prevent early signal triggers from causing action_block to be called more than necessary
diff --git a/lib/punchblock/dsl.rb b/lib/punchblock/dsl.rb index abc1234..def5678 100644 --- a/lib/punchblock/dsl.rb +++ b/lib/punchblock/dsl.rb @@ -28,6 +28,10 @@ write @protocol.class::Command::Redirect.new(:to => dest) end + def record(options = {}) + write @protocol.class::Command::Record.new(o...
Add recording to the DSL
diff --git a/lib/raygun/railtie.rb b/lib/raygun/railtie.rb index abc1234..def5678 100644 --- a/lib/raygun/railtie.rb +++ b/lib/raygun/railtie.rb @@ -1,29 +1,28 @@ class Raygun::Railtie < Rails::Railtie initializer "raygun.configure_rails_initialization" do |app| - if Raygun.configured? - # Thanks Airbrake: S...
Reset Railtie back to master code, approach does not seem to be working
diff --git a/lib/pwnbox/crypto.rb b/lib/pwnbox/crypto.rb index abc1234..def5678 100644 --- a/lib/pwnbox/crypto.rb +++ b/lib/pwnbox/crypto.rb @@ -7,8 +7,8 @@ last_remainder, remainder = [a, b].map(&:abs) numbers = [0, 1, 1, 0] while remainder != 0 - last_remainder, (quotient, remainder) \ - ...
Use backslash only for string concatenation
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 @@ -4,8 +4,8 @@ @latest_exercises = Exercise.last(5).reverse @hottest_exercises = Exercise.order(:submissions_coun...
Fix to elements order in home
diff --git a/app/operations/story_operations.rb b/app/operations/story_operations.rb index abc1234..def5678 100644 --- a/app/operations/story_operations.rb +++ b/app/operations/story_operations.rb @@ -26,7 +26,10 @@ def after_save new_documents = model.documents_attributes if new_documents != model.do...
Fix how to set `changed_attributes` in Rails 4.2.x
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb index abc1234..def5678 100644 --- a/app/serializers/user_serializer.rb +++ b/app/serializers/user_serializer.rb @@ -2,4 +2,9 @@ attributes :id, :name, :email, :gender, :birthday, :picture has_many :subjects + has_one :picture, ...
Add serialization of pictures in user serializer
diff --git a/lib/street_lights.rb b/lib/street_lights.rb index abc1234..def5678 100644 --- a/lib/street_lights.rb +++ b/lib/street_lights.rb @@ -9,6 +9,7 @@ unless File.exists?(@street_lights_dir) FileUtils.mkdir_p(@street_lights_dir) end + at_exit { File.rm "#{@street_lights_dir}/#{Process.pid}" } ...
Delete pid when application quits.
diff --git a/lib/tasks/users.rake b/lib/tasks/users.rake index abc1234..def5678 100644 --- a/lib/tasks/users.rake +++ b/lib/tasks/users.rake @@ -13,5 +13,6 @@ raise StandardError, "Could not generate token" end Transferatu::User.create(name: args.name, password: password, token: token) + puts "Create...
Print password after user creation, since its plaintext is not stored anywhere.
diff --git a/app/cells/plugins/core/user_cell.rb b/app/cells/plugins/core/user_cell.rb index abc1234..def5678 100644 --- a/app/cells/plugins/core/user_cell.rb +++ b/app/cells/plugins/core/user_cell.rb @@ -16,7 +16,7 @@ end def user_data_for_select - @options[:user_data].map{ |user| [user.fullname,...
Include email in UserFieldType picker, so content creators can discern between users with the same fullname
diff --git a/Rakefile.rb b/Rakefile.rb index abc1234..def5678 100644 --- a/Rakefile.rb +++ b/Rakefile.rb @@ -1,50 +1 @@-$:.unshift(File.join(File.dirname(__FILE__), 'lib')) - -require 'rubygems' -require 'rake/gempackagetask' -require 'rake/rdoctask' -require 'risky/version' -require 'find' - -# Don't include resource...
Use rake tasks from bundler
diff --git a/app/controllers/ideas_controller.rb b/app/controllers/ideas_controller.rb index abc1234..def5678 100644 --- a/app/controllers/ideas_controller.rb +++ b/app/controllers/ideas_controller.rb @@ -30,7 +30,7 @@ def update @idea = Idea.find(params[:id]) - @idea.update_attributes(params[:idea]) - re...
Fix two examples, spec still does not test if update method is working, break update method to test spec.
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,7 +1,7 @@ class StatsController < ApplicationController def show @url = request.url - ...
Fix wrong dojo count in Stats controller
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 @@ -5,7 +5,7 @@ respond_to :js, only: :index def index - @users = User.order('pull_requests_count desc').incl...
Order users by pull_request_count and nickname
diff --git a/app/decorators/payment_decorator.rb b/app/decorators/payment_decorator.rb index abc1234..def5678 100644 --- a/app/decorators/payment_decorator.rb +++ b/app/decorators/payment_decorator.rb @@ -3,6 +3,7 @@ has_one :adjustment, :as => :source, :dependent => :destroy after_save :ensure_correct_adjustm...
Create the surcharge as soon as the payment gets created.
diff --git a/app/mailers/notifications_mailer.rb b/app/mailers/notifications_mailer.rb index abc1234..def5678 100644 --- a/app/mailers/notifications_mailer.rb +++ b/app/mailers/notifications_mailer.rb @@ -14,7 +14,7 @@ def email_peek(peek) recipients = User.all.pluck(:email) build_header(recipients) - at...
Add pdf ending to mailer attachment
diff --git a/app/models/spree/price_decorator.rb b/app/models/spree/price_decorator.rb index abc1234..def5678 100644 --- a/app/models/spree/price_decorator.rb +++ b/app/models/spree/price_decorator.rb @@ -4,6 +4,12 @@ private + def check_price + if currency.nil? + self.currency = Spree::Config[:c...
Remove orphan price check from price model This is a quick fix. This check is breaking product deletion in some situations and orphan Prices are not really a problem in the DB
diff --git a/definitions/puma_web_app.rb b/definitions/puma_web_app.rb index abc1234..def5678 100644 --- a/definitions/puma_web_app.rb +++ b/definitions/puma_web_app.rb @@ -18,7 +18,7 @@ application deploy end - service "#{application}-puma" do + service application do action :restart end end
Fix servie name to match the new init.d script name
diff --git a/lib/micky/uri.rb b/lib/micky/uri.rb index abc1234..def5678 100644 --- a/lib/micky/uri.rb +++ b/lib/micky/uri.rb @@ -1,15 +1,13 @@ require 'uri' module Micky - HTTP_URI_REGEX = %r{\Ahttps?://?} - SINGLE_SLASH_HTTP_URI_REGEX = %r{\Ahttps?:/[^/]} + HTTP_URI_REGEX = %r{\Ahttps?:/+} def self.URI(uri)...
Replace any number of slashes following https: by two
diff --git a/lib/templater.rb b/lib/templater.rb index abc1234..def5678 100644 --- a/lib/templater.rb +++ b/lib/templater.rb @@ -1,4 +1,11 @@ module Templater + # Replaces templates in a string with the values. + # + # @note templates in a string are supposed to be like `{{temp}}` + # + # @param str [String] the s...
Add documentation to replace method
diff --git a/spec/ttt_spec.rb b/spec/ttt_spec.rb index abc1234..def5678 100644 --- a/spec/ttt_spec.rb +++ b/spec/ttt_spec.rb @@ -17,8 +17,13 @@ cell.content.should == '.' end - it 'should take a players update' do - cell.players_move(TestPlayer.new) - cell.content.should == 'X' + context 'when player m...
Add spec for players move.
diff --git a/app/helpers/auths_helper.rb b/app/helpers/auths_helper.rb index abc1234..def5678 100644 --- a/app/helpers/auths_helper.rb +++ b/app/helpers/auths_helper.rb @@ -1,7 +1,7 @@ module AuthsHelper def current_user - if session[:user_id] - @current_user ||= User.find_by_id(session[:user_id]) + if se...
Fix session user id param.
diff --git a/app/helpers/items_helper.rb b/app/helpers/items_helper.rb index abc1234..def5678 100644 --- a/app/helpers/items_helper.rb +++ b/app/helpers/items_helper.rb @@ -24,7 +24,7 @@ # Channel-specific html case item.channel_type when 'youtube' - "<iframe width=\"640\" height=\"390\" src=\"...
Fix bug where rails tag helper tried to make iFrame self-closing
diff --git a/app/presenters/dashboard.rb b/app/presenters/dashboard.rb index abc1234..def5678 100644 --- a/app/presenters/dashboard.rb +++ b/app/presenters/dashboard.rb @@ -19,7 +19,7 @@ end def notifications - @notifications ||= user.notifications.unread.personal.reject {|note| note.item.nil? || ...
Fix bad reference on notifications
diff --git a/org-converge.gemspec b/org-converge.gemspec index abc1234..def5678 100644 --- a/org-converge.gemspec +++ b/org-converge.gemspec @@ -15,7 +15,7 @@ gem.require_paths = ["lib"] gem.version = OrgConverge::VERSION gem.add_runtime_dependency('docopt', '~> 0.5.0') - gem.add_runtime_dependency('or...
Update dependencies of Org Ruby
diff --git a/lib/aasm.rb b/lib/aasm.rb index abc1234..def5678 100644 --- a/lib/aasm.rb +++ b/lib/aasm.rb @@ -1,5 +1,3 @@-require 'ostruct' - require 'aasm/version' require 'aasm/errors' require 'aasm/configuration'
Remove needless require ostruct statement ostruct is no longer required since v4.0.0 ref. 55f1eed4fa2e01a95ca35be0231ad5181939deb6
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index abc1234..def5678 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -1,2 +1,7 @@ module UsersHelper + def render_common_form(submit_value = 'submit') + form_for :user do |f| + f.submit(submit_value) + end...
Create common form render helper
diff --git a/app/models/business_days.rb b/app/models/business_days.rb index abc1234..def5678 100644 --- a/app/models/business_days.rb +++ b/app/models/business_days.rb @@ -1,22 +1,26 @@ class BusinessDays - # This can't happen in an initializer because: - # https://github.com/zendesk/biz/issues/18 - Biz.configure d...
Fix biz crashing on POST appointment_attempts/:id/appointments
diff --git a/app/models/learn_session.rb b/app/models/learn_session.rb index abc1234..def5678 100644 --- a/app/models/learn_session.rb +++ b/app/models/learn_session.rb @@ -1,3 +1,25 @@ class LearnSession include Mongoid::Document + include Mongoid::Timestamps::Created + include Mongoid::Timestamps::Updated + + + ...
Add attributes and comment to learnSession model
diff --git a/db/seeds.rb b/db/seeds.rb index abc1234..def5678 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,4 @@ # # cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }]) # Mayor.create(name: 'Emanuel', city: cities.first) +User.create :email => 'admin@example.com', :password => 'password'
Add first user to seed
diff --git a/db/seeds.rb b/db/seeds.rb index abc1234..def5678 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -7,6 +7,7 @@ User.create(name: Faker::Name.name, age: rand(1..100), gender: ["male","female"].sample, + orientation: ["Lesbian","Gay","Bisexual","Pansexual", "Straight...
Add data for sexual orientation.
diff --git a/lib/dragonfly/config/r_magick_images.rb b/lib/dragonfly/config/r_magick_images.rb index abc1234..def5678 100644 --- a/lib/dragonfly/config/r_magick_images.rb +++ b/lib/dragonfly/config/r_magick_images.rb @@ -15,17 +15,17 @@ c.register_analyser(Analysis::RMagickAnalyser) c.register_proc...
Comment out breaking config for now
diff --git a/lib/duck_puncher/ducks/active_record.rb b/lib/duck_puncher/ducks/active_record.rb index abc1234..def5678 100644 --- a/lib/duck_puncher/ducks/active_record.rb +++ b/lib/duck_puncher/ducks/active_record.rb @@ -10,12 +10,13 @@ end def associations - reflections.select { |key, reflection|...
Fix associations for Rails 4
diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb index abc1234..def5678 100644 --- a/app/controllers/users/registrations_controller.rb +++ b/app/controllers/users/registrations_controller.rb @@ -1,60 +1,61 @@+# Controller for user registrations class Us...
Fix rubocop offense and uncomment most of registrationscontroller
diff --git a/lib/git_compound/worker/pretty_print.rb b/lib/git_compound/worker/pretty_print.rb index abc1234..def5678 100644 --- a/lib/git_compound/worker/pretty_print.rb +++ b/lib/git_compound/worker/pretty_print.rb @@ -11,8 +11,7 @@ def print_component(component) Logger.inline ' ' * component.ancest...
Fix TODO in pretty print visitor (refactoring, LoD)
diff --git a/lib/icapps/translations/import/react.rb b/lib/icapps/translations/import/react.rb index abc1234..def5678 100644 --- a/lib/icapps/translations/import/react.rb +++ b/lib/icapps/translations/import/react.rb @@ -11,6 +11,14 @@ def fetch_language_file(language) short_name = language['shor...
Make sure we right it correct
diff --git a/accept_values_for.gemspec b/accept_values_for.gemspec index abc1234..def5678 100644 --- a/accept_values_for.gemspec +++ b/accept_values_for.gemspec @@ -0,0 +1,53 @@+# Generated by jeweler +# DO NOT EDIT THIS FILE DIRECTLY +# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command +# -*- encod...
Add gemspec file to repository
diff --git a/borealis.gemspec b/borealis.gemspec index abc1234..def5678 100644 --- a/borealis.gemspec +++ b/borealis.gemspec @@ -16,6 +16,8 @@ gem.test_files = gem.files.grep("spec") gem.require_paths = ["lib"] + gem.requirements << 'ImageMagick' + gem.add_development_dependency 'rspec' gem.add_depen...
Add ImageMagick requirement to gemspec
diff --git a/example/send-get-request.rb b/example/send-get-request.rb index abc1234..def5678 100644 --- a/example/send-get-request.rb +++ b/example/send-get-request.rb @@ -0,0 +1,36 @@+#!/usr/bin/env ruby + +# Simple get request example. + +$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib') +require 'ru...
Add a small example script to send get requests.
diff --git a/railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb b/railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb index abc1234..def5678 100644 --- a/railties/lib/rails/generators/rails/app/templates/app/controllers/application_control...
Add default respond_to formats to ApplicationController.
diff --git a/app/lib/services.rb b/app/lib/services.rb index abc1234..def5678 100644 --- a/app/lib/services.rb +++ b/app/lib/services.rb @@ -18,7 +18,7 @@ end end - def self.search + def self.rummager @search ||= GdsApi::Rummager.new( Plek.new.find('rummager'), )
Rename search service to rummager As this is clearer.
diff --git a/acceptance/setup/pre_suite/80_add_dev_repo.rb b/acceptance/setup/pre_suite/80_add_dev_repo.rb index abc1234..def5678 100644 --- a/acceptance/setup/pre_suite/80_add_dev_repo.rb +++ b/acceptance/setup/pre_suite/80_add_dev_repo.rb @@ -14,13 +14,15 @@ on database, "curl #{apt_url}/pubkey.gpg |apt-key add...
Add logging to show the yum repo definition We're getting some test failures due to not being able to access the puppetlabs development yum repo (s3?). This commit simply adds logging to show the repo configuration, which should help us to troubleshoot this kind of error going forward.
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb index abc1234..def5678 100644 --- a/app/controllers/admin/dashboard_controller.rb +++ b/app/controllers/admin/dashboard_controller.rb @@ -12,6 +12,7 @@ private def require_admin - current_user.admin? + ...
Fix Admin before action checking Admin user status If a user is not an admin, redirect them back to the home page. Optionally, we can flash a message stating that they do not have the proper authorization to access the interface, but that may be revealing too much information.
diff --git a/app/controllers/admin/snapshots_controller.rb b/app/controllers/admin/snapshots_controller.rb index abc1234..def5678 100644 --- a/app/controllers/admin/snapshots_controller.rb +++ b/app/controllers/admin/snapshots_controller.rb @@ -17,12 +17,11 @@ attributes = filter_header(parsed) sna...
Change input parsing to one character at a time Another reason for the horrendous memory consumption was the fact that I read the complete file before starting to process it. For now, I solved this by reading one character at at time. This again, the absolute trade-off between memory and speed, is too slow again. I f...
diff --git a/app/serializers/task_definition_serializer.rb b/app/serializers/task_definition_serializer.rb index abc1234..def5678 100644 --- a/app/serializers/task_definition_serializer.rb +++ b/app/serializers/task_definition_serializer.rb @@ -1,13 +1,13 @@ class TaskDefinitionSerializer < ActiveModel::Serializer - a...
ENHANCE: Add is_graded to task definition serializer
diff --git a/test/models/cart_item_test.rb b/test/models/cart_item_test.rb index abc1234..def5678 100644 --- a/test/models/cart_item_test.rb +++ b/test/models/cart_item_test.rb @@ -1,7 +1,7 @@ require 'test_helper' class CartItemTest < ActiveSupport::TestCase - test "CartItem Weight should match" do + test "CartIt...
Fix typo in CartItem test name
diff --git a/test/unit/spec/spec_helper.rb b/test/unit/spec/spec_helper.rb index abc1234..def5678 100644 --- a/test/unit/spec/spec_helper.rb +++ b/test/unit/spec/spec_helper.rb @@ -17,7 +17,6 @@ log_level: ::LOG_LEVEL }.freeze -def stub_resources -end +def stub_resources; end at_exit { ChefSpec::Coverage.report...
C: Put empty method definitions on a single line.
diff --git a/spec/features/teacher/progress_reports/standards/standards_by_student_progress_report_spec.rb b/spec/features/teacher/progress_reports/standards/standards_by_student_progress_report_spec.rb index abc1234..def5678 100644 --- a/spec/features/teacher/progress_reports/standards/standards_by_student_progress_re...
Fix standards by student feature spec
diff --git a/db/fixtures/development/02_source_code.rb b/db/fixtures/development/02_source_code.rb index abc1234..def5678 100644 --- a/db/fixtures/development/02_source_code.rb +++ b/db/fixtures/development/02_source_code.rb @@ -1,4 +1,4 @@-root = Gitlab.config.gitolite.repos_path +root = Gitlab.config.gitlab_shell.rep...
Fix development fixture for gitlab_shell
diff --git a/app/controllers/users.rb b/app/controllers/users.rb index abc1234..def5678 100644 --- a/app/controllers/users.rb +++ b/app/controllers/users.rb @@ -4,6 +4,11 @@ get '/login' do erb :'users/login' +end + +get '/logout' do + session.clear + redirect '/' end post '/login' do
Add ability for user to logout. Added get '/logout' route to the users.rb controller. A request to that route will simply clear the session and redirect to the root url.
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -11,7 +11,6 @@ depends 'apt', '>= 2.0' depends 'runit', '>= 1.7' depends 'yum', '>= 3.0' -depends 'yum', '~> 3.0' source_url 'https://github.com/chef-cookbooks/jenkins' issues_url 'https://github.com/...
Remove the double yum dep Signed-off-by: Tim Smith <764ef62106582a09ed09dfa0b6bff7c05fd7d1e4@chef.io>
diff --git a/app/models/poll/shift.rb b/app/models/poll/shift.rb index abc1234..def5678 100644 --- a/app/models/poll/shift.rb +++ b/app/models/poll/shift.rb @@ -26,4 +26,4 @@ end end - end+end
Correct end at file ending
diff --git a/cmu.gemspec b/cmu.gemspec index abc1234..def5678 100644 --- a/cmu.gemspec +++ b/cmu.gemspec @@ -16,5 +16,5 @@ s.add_development_dependency 'rake' s.add_development_dependency 'rspec' - s.add_runtime_dependency 'net-ldap2' + s.add_runtime_dependency 'net-ldap' end
Change net-ldap dependency to original gem
diff --git a/app/models/article.rb b/app/models/article.rb index abc1234..def5678 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -1,4 +1,6 @@-# News Articles +# Article +# Simple model used for news about MO, e.g., new releases +# New articles are added to the Acitivity feed # # == Attributes #
Add description of Article model to documentation
diff --git a/app/models/contact.rb b/app/models/contact.rb index abc1234..def5678 100644 --- a/app/models/contact.rb +++ b/app/models/contact.rb @@ -14,7 +14,7 @@ def headers { subject: "Neue Anmeldung für '#{course}'", - to: "nmauchle@gmail.com", # barbara.schumacher@bluewin.ch + to: "barbara.s...
Add email correct email address
diff --git a/db/seeds.rb b/db/seeds.rb index abc1234..def5678 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -16,4 +16,18 @@ user.approved = true end end + + class WorkFactory + def actor_create(attributes:, work_class: Vdc::Resource) + user = User.find_by(email: 'admin@example.com') + abi...
Introduce a seed for a test `Vdc::Resource` Creates a test `Vdc::Resource` when `rake db:seeds` is run.
diff --git a/db/seeds.rb b/db/seeds.rb index abc1234..def5678 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,9 +1,14 @@ require 'csv' +require 'faraday' School.delete_all -csv_text = File.read('db/cfe-money-new-data-feb15.csv') -csv = CSV.parse(csv_text, :headers => true) -csv.each do |row| - School.create!...
Update seed file to use endpoint link in location table item
diff --git a/db/seeds.rb b/db/seeds.rb index abc1234..def5678 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -8,7 +8,7 @@ # require 'webmock' WebMock.allow_net_connect! -url = 'http://student.ugent.be/hydra/api/1.1/Associations.json' +url = 'https://raw.githubusercontent.com/ZeusWPI/hydra/master/iOS/Resources/Associat...
Use github URL instead of hydra API on the DSA server
diff --git a/core/app/views/notifications/activity.rb b/core/app/views/notifications/activity.rb index abc1234..def5678 100644 --- a/core/app/views/notifications/activity.rb +++ b/core/app/views/notifications/activity.rb @@ -2,7 +2,7 @@ class Activity < Mustache::Railstache def unread - self[:activity].cr...
Revert "change the offset of the Mongoid time back to 0700" This reverts commit 748ae6f6f1ec2912f46e71405049248b26485515.
diff --git a/plugins/github.rb b/plugins/github.rb index abc1234..def5678 100644 --- a/plugins/github.rb +++ b/plugins/github.rb @@ -5,16 +5,17 @@ match /ghpull (.+) (.+)/, method: :ghissue def ghissue(m, repo, issuenum) - issuenum = issuenum.to_i - if issuenum < 1 - m.reply 'Invalid Issue count!' - ...
Add latest issue to gh-issue
diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb index abc1234..def5678 100644 --- a/config/initializers/cors.rb +++ b/config/initializers/cors.rb @@ -1,6 +1,8 @@ Rails.application.config.middleware.use Rack::Cors do allow do - origins 'localhost:8181', 'bibliaolvaso.dev', 'bibliaolvaso.hu' ...
Allow CORS from xip.io and CloudFront host
diff --git a/attributes/bash_it.rb b/attributes/bash_it.rb index abc1234..def5678 100644 --- a/attributes/bash_it.rb +++ b/attributes/bash_it.rb @@ -8,7 +8,6 @@ "pivotal_workstation" => %w[ bash_it/custom/disable_ctrl-s_output_control.bash bash_it/custom/enable_ctrl-o_history_execution.bash - ...
Remove history_settings which does not have a template.
diff --git a/attributes/default.rb b/attributes/default.rb index abc1234..def5678 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -27,8 +27,6 @@ iotop tmux keychain - rar - unrar wakeonlan whois tcpdump
Revert "Install rar and unrar" (multiverse should be optional) This reverts commit dd31e5575fc173d476bec7e9fe65233014e0afd8. Conflicts: attributes/default.rb
diff --git a/lib/alephant/models/queue.rb b/lib/alephant/models/queue.rb index abc1234..def5678 100644 --- a/lib/alephant/models/queue.rb +++ b/lib/alephant/models/queue.rb @@ -15,5 +15,8 @@ sleep 1 until @q.exists? end + def poll(*args, &block) + @q.poll(*args, &block) + end end end
Add missing poll method which delegates to real Queue poll method