summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-06 17:04:50 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-10 12:11:27 +0200
commitacbac26a5a847f7e5aadeae0a67219d651fb8913 (patch)
tree5f4f950b136159466578e809520fdec359f1702d /Gemfile
parentede272406a36d8263ababd7aab86ece5d9a9b9b5 (diff)
downloadgitlab-ce-acbac26a5a847f7e5aadeae0a67219d651fb8913.tar.gz
Use gems that works with rails 4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile38
1 files changed, 18 insertions, 20 deletions
diff --git a/Gemfile b/Gemfile
index cc8f45f3a70..3061464e1af 100644
--- a/Gemfile
+++ b/Gemfile
@@ -134,26 +134,24 @@ gem "sanitize"
# Protect against bruteforcing
gem "rack-attack"
-group :assets do
- gem "sass-rails"
- gem "coffee-rails"
- gem "uglifier"
- gem "therubyracer"
- gem 'turbolinks'
- gem 'jquery-turbolinks'
-
- gem 'chosen-rails', "1.0.1"
- gem 'select2-rails'
- gem 'jquery-atwho-rails', "0.3.0"
- gem "jquery-rails", "2.1.3"
- gem "jquery-ui-rails", "2.0.2"
- gem "modernizr", "2.6.2"
- gem "raphael-rails", "~> 2.1.2"
- gem 'bootstrap-sass', '~> 2.3'
- gem "font-awesome-rails", '~> 3.2'
- gem "gemoji", "~> 1.3.0"
- gem "gon"
-end
+gem "sass-rails"
+gem "coffee-rails"
+gem "uglifier"
+gem "therubyracer"
+gem 'turbolinks'
+gem 'jquery-turbolinks'
+
+gem 'chosen-rails', "1.0.1"
+gem 'select2-rails'
+gem 'jquery-atwho-rails', "~> 0.4.1"
+gem "jquery-rails", "2.1.3"
+gem "jquery-ui-rails", "2.0.2"
+gem "modernizr", "2.6.2"
+gem "raphael-rails", "~> 2.1.2"
+gem 'bootstrap-sass', '~> 2.3'
+gem "font-awesome-rails", '~> 3.2'
+gem "gemoji", "~> 1.3.0"
+gem "gon", git: "https://github.com/gitlabhq/gon.git", ref: '58ca8e17273051cb370182cabd3602d1da6783ab'
group :development do
gem "annotate", "~> 2.6.0.beta2"