diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-28 22:52:44 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-28 22:52:44 -0800 |
| commit | 815e9aa283f113051268370908776c5517dab711 (patch) | |
| tree | 9beaa0dfa9aa5dee5e76581cc6d7f4b90b5c6d1a /Gemfile.lock | |
| parent | 792ced2f4190226c3335967a8e5a30d3b72bd4ae (diff) | |
| parent | 2149f8b52c8f0d8333707f7c798b0e6a8a892c1c (diff) | |
| download | gitlab-ce-815e9aa283f113051268370908776c5517dab711.tar.gz | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into haynes/gitlab-ce-commit_calendar
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 5c70541a735..4b5b718c87e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -491,7 +491,7 @@ GEM activesupport (>= 3.1, < 4.2) select2-rails (3.5.2) thor (~> 0.14) - semantic-ui-sass (0.16.1.0) + semantic-ui-sass (1.8.0.0) sass (~> 3.2) settingslogic (2.0.9) sexp_processor (4.4.0) @@ -717,7 +717,7 @@ DEPENDENCIES sdoc seed-fu select2-rails - semantic-ui-sass (~> 0.16.1.0) + semantic-ui-sass (~> 1.8.0) settingslogic shoulda-matchers (~> 2.1.0) sidekiq (~> 3.3) |