Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-08 16:14:59 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-08 16:14:59 +0400
commitca52f848411efaa5ccfb364c2169b38a8e9644b4 (patch)
treef8569d2091ca880ab789a778af9ba334f6603071 /Gemfile.lock
parentf4978bc08ea9fa4468d70eefaa32fd1eeafce5a9 (diff)
Update chosen, improve ui, fix MR fork tests
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock18
1 files changed, 14 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index b4a2626149f..d0ee20f34e7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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
@@ -149,6 +158,7 @@ GEM
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)
@@ -548,7 +558,7 @@ DEPENDENCIES
bootstrap-sass
capybara
carrierwave
- chosen-rails (= 0.9.8)
+ chosen-rails (= 1.0.0)
coffee-rails
colored
coveralls