diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-08 09:50:10 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-08 09:50:10 +0300 |
| commit | 6ace422c298eef2c592d64c08f59b3da3d8d8a6d (patch) | |
| tree | 9a1a43baeab7e73a4a97c9d4be18a2ddbe4f257c /Gemfile | |
| parent | 2882d16e7a244d6627d9f6d9436651a38bf11bad (diff) | |
| parent | 6f5f5e7ee32bbd693796571fa6fcb8575accc08a (diff) | |
| download | gitlab-ce-6ace422c298eef2c592d64c08f59b3da3d8d8a6d.tar.gz | |
Merge branch 'master' into 6-0-dev
Conflicts:
Gemfile
Gemfile.lock
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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.3.1' +gem "puma", '~> 2.3.1', group: :puma +gem "unicorn", '~> 4.6.3', group: :unicorn # State machine gem "state_machine" |