diff options
| author | Alex Denisov <1101.debian@gmail.com> | 2012-09-10 09:19:15 +0300 |
|---|---|---|
| committer | Alex Denisov <1101.debian@gmail.com> | 2012-09-10 09:19:15 +0300 |
| commit | 77bfc591bf5836892be26059d92411f9fbf04be9 (patch) | |
| tree | 27b334a35a3ed82cf1f99dec237364718cdde878 /Gemfile.lock | |
| parent | 85db51f660c4d861c9adf97ed114d4bd4d14ff7d (diff) | |
| parent | b565f33472d960e37ed41a8a0c09fbbc3ea65f1e (diff) | |
| download | gitlab-ce-77bfc591bf5836892be26059d92411f9fbf04be9.tar.gz | |
Merge 'master' branch
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 235c49a6c00..671e8e6cdc6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -108,7 +108,7 @@ GEM bcrypt-ruby (3.0.1) blankslate (2.1.2.4) bootstrap-sass (2.0.4.0) - builder (3.0.0) + builder (3.0.2) capybara (1.1.2) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -125,7 +125,7 @@ GEM charlock_holmes (0.6.8) childprocess (0.3.2) ffi (~> 1.0.6) - chosen-rails (0.9.8) + chosen-rails (0.9.8.3) railties (~> 3.0) thor (~> 0.14) coderay (1.0.6) @@ -178,6 +178,7 @@ GEM gherkin (2.11.0) json (>= 1.4.6) git (1.2.5) + github-markup (0.7.4) gitlab_meta (2.9) grape (0.2.1) hashie (~> 1.2) @@ -397,6 +398,7 @@ DEPENDENCIES ffaker foreman git + github-markup (~> 0.7.4) gitlab_meta (= 2.9) gitolite! grack! |