Commit fb71426c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'improve/gems_update' of /home/git/repositories/gitlab/gitlabhq

parents 726fa6c7 bfb607a0
...@@ -41,15 +41,15 @@ GEM ...@@ -41,15 +41,15 @@ GEM
addressable (2.3.4) addressable (2.3.4)
arel (3.0.2) arel (3.0.2)
asciidoctor (0.1.3) asciidoctor (0.1.3)
awesome_print (1.1.0) awesome_print (1.2.0)
backports (3.3.2) backports (3.3.2)
bcrypt-ruby (3.1.1) bcrypt-ruby (3.1.1)
better_errors (0.9.0) better_errors (1.0.1)
coderay (>= 1.0.0) coderay (>= 1.0.0)
erubis (>= 2.6.6) erubis (>= 2.6.6)
binding_of_caller (0.7.2) binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
bootstrap-sass (2.3.2.0) bootstrap-sass (2.3.2.2)
sass (~> 3.2) sass (~> 3.2)
builder (3.0.4) builder (3.0.4)
capybara (2.1.0) capybara (2.1.0)
...@@ -73,7 +73,7 @@ GEM ...@@ -73,7 +73,7 @@ GEM
sass-rails (>= 3.2) sass-rails (>= 3.2)
chunky_png (1.2.8) chunky_png (1.2.8)
cliver (0.2.1) cliver (0.2.1)
code_analyzer (0.3.2) code_analyzer (0.4.3)
sexp_processor sexp_processor
coderay (1.0.9) coderay (1.0.9)
coffee-rails (3.2.2) coffee-rails (3.2.2)
...@@ -92,11 +92,11 @@ GEM ...@@ -92,11 +92,11 @@ GEM
compass-rails (1.0.3) compass-rails (1.0.3)
compass (>= 0.12.2, < 0.14) compass (>= 0.12.2, < 0.14)
connection_pool (1.1.0) connection_pool (1.1.0)
coveralls (0.6.7) coveralls (0.7.0)
colorize
multi_json (~> 1.3) multi_json (~> 1.3)
rest-client rest-client
simplecov (>= 0.7) simplecov (>= 0.7)
term-ansicolor
thor thor
crack (0.4.0) crack (0.4.0)
safe_yaml (~> 0.9.0) safe_yaml (~> 0.9.0)
...@@ -133,7 +133,7 @@ GEM ...@@ -133,7 +133,7 @@ GEM
multipart-post (~> 1.1) multipart-post (~> 1.1)
faraday_middleware (0.9.0) faraday_middleware (0.9.0)
faraday (>= 0.7.4, < 0.9) faraday (>= 0.7.4, < 0.9)
ffaker (1.16.1) ffaker (1.18.0)
ffi (1.9.0) ffi (1.9.0)
fog (1.3.1) fog (1.3.1)
builder builder
...@@ -145,7 +145,7 @@ GEM ...@@ -145,7 +145,7 @@ GEM
net-ssh (>= 2.1.3) net-ssh (>= 2.1.3)
nokogiri (~> 1.5.0) nokogiri (~> 1.5.0)
ruby-hmac ruby-hmac
font-awesome-rails (3.2.1.2) font-awesome-rails (3.2.1.3)
railties (>= 3.2, < 5.0) railties (>= 3.2, < 5.0)
foreman (0.63.0) foreman (0.63.0)
dotenv (>= 0.7) dotenv (>= 0.7)
...@@ -278,7 +278,7 @@ GEM ...@@ -278,7 +278,7 @@ GEM
minitest (4.7.4) minitest (4.7.4)
modernizr (2.6.2) modernizr (2.6.2)
sprockets (~> 2.0) sprockets (~> 2.0)
multi_json (1.7.9) multi_json (1.8.0)
multi_xml (0.5.4) multi_xml (0.5.4)
multipart-post (1.2.0) multipart-post (1.2.0)
mysql2 (0.3.11) mysql2 (0.3.11)
...@@ -336,7 +336,7 @@ GEM ...@@ -336,7 +336,7 @@ GEM
rack (>= 0.4) rack (>= 0.4)
rack-cache (1.2) rack-cache (1.2)
rack (>= 0.4) rack (>= 0.4)
rack-mini-profiler (0.1.26) rack-mini-profiler (0.1.31)
rack (>= 1.1.3) rack (>= 1.1.3)
rack-mount (0.8.3) rack-mount (0.8.3)
rack (>= 1.0.0) rack (>= 1.0.0)
...@@ -357,13 +357,14 @@ GEM ...@@ -357,13 +357,14 @@ GEM
rails-dev-tweaks (0.6.1) rails-dev-tweaks (0.6.1)
actionpack (~> 3.1) actionpack (~> 3.1)
railties (~> 3.1) railties (~> 3.1)
rails_best_practices (1.13.8) rails_best_practices (1.14.4)
activesupport activesupport
awesome_print awesome_print
code_analyzer code_analyzer (>= 0.4.3)
colored colored
erubis erubis
i18n i18n
require_all
ruby-progressbar ruby-progressbar
railties (3.2.13) railties (3.2.13)
actionpack (= 3.2.13) actionpack (= 3.2.13)
...@@ -403,6 +404,7 @@ GEM ...@@ -403,6 +404,7 @@ GEM
redis-store (1.1.4) redis-store (1.1.4)
redis (>= 2.2) redis (>= 2.2)
ref (1.0.5) ref (1.0.5)
require_all (1.3.1)
rest-client (1.6.7) rest-client (1.6.7)
mime-types (>= 1.16) mime-types (>= 1.16)
rspec (2.13.0) rspec (2.13.0)
...@@ -427,7 +429,7 @@ GEM ...@@ -427,7 +429,7 @@ GEM
safe_yaml (0.9.3) safe_yaml (0.9.3)
sanitize (2.0.3) sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6) nokogiri (>= 1.4.4, < 1.6)
sass (3.2.9) sass (3.2.11)
sass-rails (3.2.6) sass-rails (3.2.6)
railties (~> 3.2.0) railties (~> 3.2.0)
sass (>= 3.1.10) sass (>= 3.1.10)
...@@ -447,7 +449,7 @@ GEM ...@@ -447,7 +449,7 @@ GEM
rubyzip rubyzip
websocket (~> 1.0.4) websocket (~> 1.0.4)
settingslogic (2.0.9) settingslogic (2.0.9)
sexp_processor (4.2.1) sexp_processor (4.3.0)
shoulda-matchers (2.1.0) shoulda-matchers (2.1.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
sidekiq (2.14.0) sidekiq (2.14.0)
...@@ -487,7 +489,9 @@ GEM ...@@ -487,7 +489,9 @@ GEM
state_machine (1.2.0) state_machine (1.2.0)
stringex (1.5.1) stringex (1.5.1)
temple (0.6.5) temple (0.6.5)
test_after_commit (0.2.0) term-ansicolor (1.2.2)
tins (~> 0.8)
test_after_commit (0.2.1)
therubyracer (0.11.4) therubyracer (0.11.4)
libv8 (~> 3.11.8.12) libv8 (~> 3.11.8.12)
ref ref
...@@ -507,6 +511,7 @@ GEM ...@@ -507,6 +511,7 @@ GEM
mime-types (~> 1.19) mime-types (~> 1.19)
multi_json (~> 1.5) multi_json (~> 1.5)
twitter-stream (~> 0.1) twitter-stream (~> 0.1)
tins (0.11.0)
treetop (1.4.14) treetop (1.4.14)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment