aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile25
-rw-r--r--Gemfile.lock105
2 files changed, 68 insertions, 62 deletions
diff --git a/Gemfile b/Gemfile
index 7fec1d72d8..a3cbb69c74 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,10 @@
source "https://rubygems.org"
+git_source(:github) do |repo_name|
+ repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+ "https://github.com/#{repo_name}.git"
+end
+
gemspec
# We need a newish Rake since Active Job sets its test tasks' descriptions.
@@ -25,10 +30,10 @@ gem "bcrypt", "~> 3.1.11", require: false
gem "uglifier", ">= 1.3.0", require: false
# Track stable branch of sass because it doesn't have circular require warnings.
-gem "sass", git: "https://github.com/sass/sass", branch: "stable", require: false
+gem "sass", github: "sass/sass", branch: "stable", require: false
# FIXME: Remove this fork after https://github.com/nex3/rb-inotify/pull/49 is fixed.
-gem "rb-inotify", git: "https://github.com/matthewd/rb-inotify", branch: "close-handling", require: false
+gem "rb-inotify", github: "matthewd/rb-inotify", branch: "close-handling", require: false
group :doc do
gem "sdoc", "~> 0.4.0"
@@ -43,19 +48,19 @@ gem "listen", "~> 3.0.5", require: false
# Active Job.
group :job do
- gem "resque", git: "https://github.com/resque/resque", require: false
+ gem "resque", github: "resque/resque", require: false
gem "resque-scheduler", require: false
gem "sidekiq", require: false
gem "sucker_punch", require: false
- gem "delayed_job", require: false, git: "https://github.com/collectiveidea/delayed_job"
- gem "queue_classic", git: "https://github.com/QueueClassic/queue_classic", branch: "master", require: false, platforms: :ruby
+ gem "delayed_job", require: false, github: "collectiveidea/delayed_job"
+ gem "queue_classic", github: "QueueClassic/queue_classic", branch: "master", require: false, platforms: :ruby
gem "sneakers", require: false
gem "que", require: false
gem "backburner", require: false
#TODO: add qu after it support Rails 5.1
# gem 'qu-rails', github: "bkeepers/qu", branch: "master", require: false
gem "qu-redis", require: false
- gem "delayed_job_active_record", require: false, git: "https://github.com/collectiveidea/delayed_job_active_record"
+ gem "delayed_job_active_record", require: false, github: "collectiveidea/delayed_job_active_record"
gem "sequel", require: false
end
@@ -109,10 +114,10 @@ end
platforms :jruby do
if ENV["AR_JDBC"]
- gem "activerecord-jdbcsqlite3-adapter", git: "https://github.com/jruby/activerecord-jdbc-adapter", branch: "master"
+ gem "activerecord-jdbcsqlite3-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "master"
group :db do
- gem "activerecord-jdbcmysql-adapter", git: "https://github.com/jruby/activerecord-jdbc-adapter", branch: "master"
- gem "activerecord-jdbcpostgresql-adapter", git: "https://github.com/jruby/activerecord-jdbc-adapter", branch: "master"
+ gem "activerecord-jdbcmysql-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "master"
+ gem "activerecord-jdbcpostgresql-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "master"
end
else
gem "activerecord-jdbcsqlite3-adapter", ">= 1.3.0"
@@ -134,7 +139,7 @@ if ENV["ORACLE_ENHANCED"]
platforms :ruby do
gem "ruby-oci8", "~> 2.2"
end
- gem "activerecord-oracle_enhanced-adapter", git: "https://github.com/rsim/oracle-enhanced", branch: "master"
+ gem "activerecord-oracle_enhanced-adapter", github: "rsim/oracle-enhanced", branch: "master"
end
# A gem necessary for Active Record tests with IBM DB.
diff --git a/Gemfile.lock b/Gemfile.lock
index c42815d915..9e4c989edd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,28 +1,28 @@
GIT
- remote: https://github.com/QueueClassic/queue_classic
- revision: c26f2c9f6f6133b946fbcdd7b7ec905a4aca9f94
+ remote: https://github.com/QueueClassic/queue_classic.git
+ revision: 1ef197b9db8149a895e59077badcb5b94d4c8b44
branch: master
specs:
queue_classic (3.2.0.RC1)
pg (>= 0.17, < 0.19)
GIT
- remote: https://github.com/collectiveidea/delayed_job
- revision: 71f1d5faf934d3057abca942f0d410327bc69087
+ remote: https://github.com/collectiveidea/delayed_job.git
+ revision: e3772d4f0c8470d0fcba00c86ca3bc4f5e876830
specs:
- delayed_job (4.1.1)
+ delayed_job (4.1.2)
activesupport (>= 3.0, < 5.1)
GIT
- remote: https://github.com/collectiveidea/delayed_job_active_record
- revision: 61e688e03b2ef4004b08de6d1e0a123fda8fffad
+ remote: https://github.com/collectiveidea/delayed_job_active_record.git
+ revision: 36f434c4fd660e8f11ce932be117e9c71dde7212
specs:
- delayed_job_active_record (4.1.0)
+ delayed_job_active_record (4.1.1)
activerecord (>= 3.0, < 5.1)
delayed_job (>= 3.0, < 5)
GIT
- remote: https://github.com/matthewd/rb-inotify
+ remote: https://github.com/matthewd/rb-inotify.git
revision: 90553518d1fb79aedc98a3036c59bd2b6731ac40
branch: close-handling
specs:
@@ -30,8 +30,8 @@ GIT
ffi (>= 0.5.0)
GIT
- remote: https://github.com/resque/resque
- revision: 06036388ec61e573c761ac5a25a2ef3c76537ec7
+ remote: https://github.com/resque/resque.git
+ revision: a3a66389618b830de0e6acf862b0dc9fde05cf49
specs:
resque (1.27.0)
mono_logger (~> 1.0)
@@ -41,8 +41,8 @@ GIT
vegas (~> 0.1.2)
GIT
- remote: https://github.com/sass/sass
- revision: 3fda1cbe70d615e7ef96e28db4fd1f8a3ebb5505
+ remote: https://github.com/sass/sass.git
+ revision: 7716e67f3507c6f65878c69aa49ec358ebf675c7
branch: stable
specs:
sass (3.4.22)
@@ -111,7 +111,7 @@ GEM
specs:
addressable (2.4.0)
amq-protocol (2.0.1)
- arel (7.1.1)
+ arel (7.1.2)
backburner (1.3.0)
beaneater (~> 1.0)
dante (> 0.1.5)
@@ -119,7 +119,7 @@ GEM
bcrypt (3.1.11-x64-mingw32)
bcrypt (3.1.11-x86-mingw32)
beaneater (1.0.0)
- benchmark-ips (2.6.1)
+ benchmark-ips (2.7.2)
blade (0.5.6)
activesupport (>= 3.0.0)
blade-qunit_adapter (~> 1.20.0)
@@ -134,14 +134,14 @@ GEM
thor (~> 0.19.1)
useragent (~> 0.16.7)
blade-qunit_adapter (1.20.0)
- blade-sauce_labs_plugin (0.5.2)
+ blade-sauce_labs_plugin (0.5.3)
childprocess
faraday
selenium-webdriver
builder (3.2.2)
bunny (2.2.2)
amq-protocol (>= 2.0.1)
- byebug (8.2.5)
+ byebug (9.0.5)
childprocess (0.5.9)
ffi (~> 1.0, >= 1.0.11)
coffee-rails (4.2.1)
@@ -153,17 +153,17 @@ GEM
coffee-script-source (1.10.0)
concurrent-ruby (1.0.2)
connection_pool (2.2.0)
- cookiejar (0.3.0)
+ cookiejar (0.3.3)
curses (1.0.2)
- daemons (1.2.3)
+ daemons (1.2.4)
dalli (2.7.6)
dante (0.2.0)
em-hiredis (0.3.1)
eventmachine (~> 1.0)
hiredis (~> 0.6.0)
- em-http-request (1.1.3)
+ em-http-request (1.1.5)
addressable (>= 2.3.4)
- cookiejar (<= 0.3.0)
+ cookiejar (!= 0.3.1)
em-socksify (>= 0.3)
eventmachine (>= 1.0.3)
http_parser.rb (>= 0.6.0)
@@ -187,15 +187,13 @@ GEM
faye-websocket (0.10.4)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
- ffi (1.9.10)
- ffi (1.9.10-x64-mingw32)
- ffi (1.9.10-x86-mingw32)
- globalid (0.3.6)
+ ffi (1.9.14)
+ globalid (0.3.7)
activesupport (>= 4.1.0)
hiredis (0.6.1)
http_parser.rb (0.6.0)
i18n (0.7.0)
- jquery-rails (4.1.1)
+ jquery-rails (4.2.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
@@ -203,18 +201,18 @@ GEM
kindlerb (0.1.1)
mustache
nokogiri
- listen (3.0.7)
- rb-fsevent (>= 0.9.3)
- rb-inotify (>= 0.9.7)
+ listen (3.0.8)
+ rb-fsevent (~> 0.9, >= 0.9.4)
+ rb-inotify (~> 0.9, >= 0.9.7)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
metaclass (0.0.4)
method_source (0.8.2)
- mime-types (3.0)
+ mime-types (3.1)
mime-types-data (~> 3.2015)
- mime-types-data (3.2016.0221)
+ mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.3.3)
mocha (0.14.0)
@@ -240,42 +238,44 @@ GEM
pg (0.18.4-x64-mingw32)
pg (0.18.4-x86-mingw32)
pkg-config (1.1.7)
- psych (2.1.0)
- puma (3.4.0)
+ psych (2.1.1)
+ puma (3.6.0)
qu (0.2.0)
multi_json
qu-redis (0.2.0)
qu (= 0.2.0)
redis-namespace
simple_uuid
- que (0.11.4)
+ que (0.12.0)
racc (1.4.14)
rack (2.0.1)
rack-cache (1.6.1)
rack (>= 0.4)
+ rack-protection (1.5.3)
+ rack
rack-test (0.6.3)
rack (>= 1.0)
- rails-dom-testing (2.0.0)
+ rails-dom-testing (2.0.1)
activesupport (>= 4.2.0, < 6.0)
nokogiri (~> 1.6.0)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
- rake (11.1.2)
+ rake (11.2.2)
rb-fsevent (0.9.7)
rdoc (4.2.2)
json (~> 1.4)
redcarpet (3.2.3)
- redis (3.3.0)
+ redis (3.3.1)
redis-namespace (1.5.2)
redis (~> 3.0, >= 3.0.4)
- resque-scheduler (4.2.0)
+ resque-scheduler (4.3.0)
mono_logger (~> 1.0)
- redis (~> 3.0)
- resque (~> 1.25)
+ redis (~> 3.3)
+ resque (~> 1.26)
rufus-scheduler (~> 3.2)
rubyzip (1.2.0)
- rufus-scheduler (3.2.1)
- sass-rails (5.0.5)
+ rufus-scheduler (3.2.2)
+ sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
@@ -284,16 +284,17 @@ GEM
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
- selenium-webdriver (2.53.0)
+ selenium-webdriver (2.53.4)
childprocess (~> 0.5)
rubyzip (~> 1.0)
websocket (~> 1.0)
- sequel (4.34.0)
+ sequel (4.38.0)
serverengine (1.5.11)
sigdump (~> 0.2.2)
- sidekiq (4.1.2)
+ sidekiq (4.2.0)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
+ rack-protection (~> 1.5)
redis (~> 3.2, >= 3.2.1)
sigdump (0.2.4)
simple_uuid (0.4.0)
@@ -304,11 +305,11 @@ GEM
serverengine (~> 1.5.11)
thor
thread (~> 0.1.7)
- sprockets (3.6.1)
+ sprockets (3.7.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-export (0.9.1)
- sprockets-rails (3.1.1)
+ sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
@@ -326,16 +327,16 @@ GEM
thread (0.1.7)
thread_safe (0.3.5)
tilt (2.0.5)
- turbolinks (5.0.0)
+ turbolinks (5.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
- tzinfo-data (1.2016.4)
+ tzinfo-data (1.2016.6)
tzinfo (>= 1.0.0)
- uglifier (3.0.0)
+ uglifier (3.0.2)
execjs (>= 0.3.0, < 3)
- useragent (0.16.7)
+ useragent (0.16.8)
vegas (0.1.11)
rack (>= 1.0.0)
w3c_validators (1.2)
@@ -408,4 +409,4 @@ DEPENDENCIES
wdm (>= 0.1.0)
BUNDLED WITH
- 1.12.5
+ 1.13.1