summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-07-08 09:47:31 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-07-08 09:47:31 +0300
commit6f5f5e7ee32bbd693796571fa6fcb8575accc08a (patch)
tree6e68470aaeaae5d57bcf162ce0085641ab95dbbd /Gemfile
parentcefd8fe2fac3e8056f48073529ffc52d1e0af678 (diff)
downloadgitlab-ce-6f5f5e7ee32bbd693796571fa6fcb8575accc08a.tar.gz
Add suppoort of unicorn and fog gems
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 0150ffb94ea..089646e110c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -59,8 +59,9 @@ gem "haml-rails"
# Files attachments
gem "carrierwave"
+
# for aws storage
-# gem "fog", "~> 1.3.1"
+gem "fog", "~> 1.3.1", group: :aws
# Authorization
gem "six"
@@ -76,7 +77,8 @@ gem "github-markup", "~> 0.7.4", require: 'github/markup'
gem "asciidoctor"
# Servers
-gem "puma", '~> 2.0.1'
+gem "puma", '~> 2.3.1', group: :puma
+gem "unicorn", '~> 4.6.3', group: :unicorn
# State machine
gem "state_machine"