summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-02-23 16:52:43 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2016-02-23 16:52:43 -0500
commitaf978cd5bcf54bece70a8bf2634172bb8133cc67 (patch)
tree0c2a1bca300acc5d1afd010815bafe02bd45e1d9 /Gemfile
parent0701b70c9c47e90a96100cefe5b93ec5954f9ec1 (diff)
parent9f80118e05e68743d95a83742a1d0a06bba3039c (diff)
downloadgitlab-ce-af978cd5bcf54bece70a8bf2634172bb8133cc67.tar.gz
Merge branch 'master' into avatar-cropping
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 87c150bd704..99bdc386567 100644
--- a/Gemfile
+++ b/Gemfile
@@ -50,7 +50,7 @@ gem "browser", '~> 1.0.0'
# Extracting information from a git repository
# Provide access to Gitlab::Git library
-gem "gitlab_git", '~> 8.1'
+gem "gitlab_git", '~> 8.2'
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
@@ -115,7 +115,7 @@ gem 'diffy', '~> 3.0.3'
# Application server
group :unicorn do
- gem "unicorn", '~> 4.8.2'
+ gem "unicorn", '~> 4.9.0'
gem 'unicorn-worker-killer', '~> 0.4.2'
end
@@ -207,7 +207,7 @@ gem 'jquery-turbolinks', '~> 2.1.0'
gem 'addressable', '~> 2.3.8'
gem 'bootstrap-sass', '~> 3.3.0'
gem 'font-awesome-rails', '~> 4.2'
-gem 'gitlab_emoji', '~> 0.2.0'
+gem 'gitlab_emoji', '~> 0.3.0'
gem 'gon', '~> 6.0.1'
gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'jquery-rails', '~> 4.0.0'
@@ -221,7 +221,7 @@ gem 'virtus', '~> 1.0.1'
gem 'net-ssh', '~> 3.0.1'
# Sentry integration
-gem 'sentry-raven'
+gem 'sentry-raven', '~> 0.15'
# Metrics
group :metrics do