diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-02-22 07:55:30 -0700 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-02-22 07:55:30 -0700 |
| commit | 5a8d8b6f20ab795fddcf651a7298f61696c7e2ab (patch) | |
| tree | efad20db1967808cb278f903cda3f6d87d933d87 /Gemfile.lock | |
| parent | 64a7ecc9267f6f82d34b9e87a0271216c94cbbfd (diff) | |
| parent | 44dbbb76fc134826b80fa10aac60bf8c79ba01e7 (diff) | |
| download | gitlab-ce-5a8d8b6f20ab795fddcf651a7298f61696c7e2ab.tar.gz | |
Merge branch 'master' into rails-4.1.9
Conflicts:
app/views/dashboard/projects.html.haml
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 2e3dc252a09..34dd709d6b7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -511,8 +511,6 @@ GEM activesupport (>= 3.1, < 4.2) select2-rails (3.5.2) thor (~> 0.14) - semantic-ui-sass (1.8.0.0) - sass (~> 3.2) settingslogic (2.0.9) shoulda-matchers (2.7.0) activesupport (>= 3.0.0) @@ -735,7 +733,6 @@ DEPENDENCIES sdoc seed-fu select2-rails - semantic-ui-sass (~> 1.8.0) settingslogic shoulda-matchers (~> 2.7.0) sidekiq (~> 3.3) |