summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-06-16 15:01:27 +0200
committerJames Lopez <james@jameslopez.es>2016-06-16 15:01:27 +0200
commitb3a0a1c3155702e2deddade0fea3e79087b40da4 (patch)
tree096bf8b46f1d9dc4be16cf29551a27d8fd6c8d7b /Gemfile
parent8ac52f49c024775311a0736ddad964e85c8f6ed2 (diff)
parent2a747d386dbdc05453fce6b8be3f483e8cd9e796 (diff)
downloadgitlab-ce-b3a0a1c3155702e2deddade0fea3e79087b40da4.tar.gz
fixed merge conflicts on UI branch
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index d5634bcaa62..2b508cf528d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -210,6 +210,9 @@ gem 'mousetrap-rails', '~> 1.4.6'
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.3'
+# Parse duration
+gem 'chronic_duration', '~> 0.10.6'
+
gem "sass-rails", '~> 5.0.0'
gem "coffee-rails", '~> 4.1.0'
gem "uglifier", '~> 2.7.2'
@@ -224,7 +227,6 @@ gem 'gon', '~> 6.0.1'
gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'jquery-rails', '~> 4.1.0'
gem 'jquery-ui-rails', '~> 5.0.0'
-gem 'raphael-rails', '~> 2.1.2'
gem 'request_store', '~> 1.3.0'
gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1'
@@ -245,7 +247,7 @@ end
group :development do
gem "foreman"
- gem 'brakeman', '~> 3.2.0', require: false
+ gem 'brakeman', '~> 3.3.0', require: false
gem 'letter_opener_web', '~> 1.3.0'
gem 'quiet_assets', '~> 1.0.2'