diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-02-24 16:54:32 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-02-24 16:54:39 +0300 |
commit | 0283fff5914f74d9435ab2097b2770dfdf635941 (patch) | |
tree | 8bcf91cb5639d3d06a15cabb1d08e408b4ba9d43 /Gemfile | |
parent | aba12515942d588f1a0aa0b32cc16837e5d04fef (diff) | |
parent | 7561b1c2a486ae57e9fbebadadbe1269bfdba6a0 (diff) |
Merge branch 'master' into extend_markdown_upload
# Conflicts:
# app/views/projects/issues/_form.html.haml
# app/views/projects/merge_requests/_form.html.haml
# app/views/projects/merge_requests/_new_submit.html.haml
# app/views/projects/milestones/_form.html.haml
# app/views/projects/notes/_form.html.haml
# app/views/projects/wikis/_form.html.haml
# config/routes.rb
# spec/controllers/projects_controller_spec.rb
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -176,9 +176,6 @@ gem 'ace-rails-ap' # Keyboard shortcuts gem 'mousetrap-rails' -# Semantic UI Sass for Sidebar -gem 'semantic-ui-sass', '~> 1.8.0' - gem "sass-rails", '~> 4.0.2' gem "coffee-rails" gem "uglifier" @@ -251,8 +248,8 @@ group :development, :test do gem 'jasmine', '2.0.2' - gem "spring", '1.1.3' - gem "spring-commands-rspec", '1.0.1' + gem "spring", '1.3.1' + gem "spring-commands-rspec", '1.0.4' gem "spring-commands-spinach", '1.0.0' end |