Configure the relative path only one time.

[wvm/gitlab.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 5d13837..d8fc5f4 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -49,7 +49,7 @@ GEM
     asciidoctor (0.1.3)
     awesome_print (1.1.0)
     backports (3.3.2)
-    bcrypt-ruby (3.0.1)
+    bcrypt-ruby (3.1.1)
     better_errors (0.9.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
@@ -72,9 +72,12 @@ GEM
     charlock_holmes (0.6.9.4)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
-    chosen-rails (0.9.8)
-      railties (~> 3.0)
-      thor (~> 0.14)
+    chosen-rails (1.0.0)
+      coffee-rails (>= 3.2)
+      compass-rails (>= 1.0)
+      railties (>= 3.0)
+      sass-rails (>= 3.2)
+    chunky_png (1.2.8)
     code_analyzer (0.3.2)
       sexp_processor
     coderay (1.0.9)
@@ -87,6 +90,12 @@ GEM
     coffee-script-source (1.6.2)
     colored (1.2)
     colorize (0.5.8)
+    compass (0.12.2)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
+    compass-rails (1.0.3)
+      compass (>= 0.12.2, < 0.14)
     connection_pool (1.1.0)
     coveralls (0.6.7)
       colorize
@@ -102,7 +111,7 @@ GEM
     database_cleaner (1.0.1)
     debug_inspector (0.0.2)
     descendants_tracker (0.0.1)
-    devise (2.2.4)
+    devise (2.2.5)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
@@ -143,12 +152,13 @@ GEM
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
-    font-awesome-rails (3.1.1.3)
+    font-awesome-rails (3.2.1.2)
       railties (>= 3.2, < 5.0)
     foreman (0.63.0)
       dotenv (>= 0.7)
       thor (>= 0.13.6)
     formatador (0.2.4)
+    fssm (0.2.10)
     gemoji (1.2.1)
     gherkin-ruby (0.3.0)
     github-linguist (2.3.4)
@@ -176,7 +186,7 @@ GEM
     gitlab-pygments.rb (0.3.2)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
-    gitlab_git (1.4.1)
+    gitlab_git (2.1.0)
       activesupport (~> 3.2.13)
       github-linguist (~> 2.3.4)
       gitlab-grit (~> 2.6.0)
@@ -275,7 +285,7 @@ GEM
     minitest (4.7.4)
     modernizr (2.6.2)
       sprockets (~> 2.0)
-    multi_json (1.7.7)
+    multi_json (1.7.9)
     multi_xml (0.5.4)
     multipart-post (1.2.0)
     mysql2 (0.3.11)
@@ -525,7 +535,7 @@ GEM
     virtus (0.5.5)
       backports (~> 3.3)
       descendants_tracker (~> 0.0.1)
-    warden (1.2.1)
+    warden (1.2.3)
       rack (>= 1.0)
     webmock (1.11.0)
       addressable (>= 2.2.7)
@@ -548,19 +558,19 @@ DEPENDENCIES
   bootstrap-sass
   capybara
   carrierwave
-  chosen-rails (= 0.9.8)
+  chosen-rails (= 1.0.0)
   coffee-rails
   colored
   coveralls
   d3_rails (~> 3.1.4)
   database_cleaner
-  devise
+  devise (~> 2.2)
   email_spec
   enumerize
   factory_girl_rails
   ffaker
   fog (~> 1.3.1)
-  font-awesome-rails (~> 3.1.1)
+  font-awesome-rails
   foreman
   gemoji (~> 1.2.1)
   github-linguist
@@ -568,7 +578,7 @@ DEPENDENCIES
   gitlab-gollum-lib (~> 1.0.1)
   gitlab-grack (~> 1.0.1)
   gitlab-pygments.rb (~> 0.3.2)
-  gitlab_git (~> 1.4.1)
+  gitlab_git (= 2.1.0)
   gitlab_meta (= 6.0)
   gitlab_omniauth-ldap (= 1.0.3)
   gon