diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-29 18:20:21 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-29 18:20:21 +0300 |
| commit | 9654cbb5924c968cdefcb83732b313c54fe292d1 (patch) | |
| tree | ab5b6eee9d06310b94c0d38643dbedebaa9b1e39 /Gemfile | |
| parent | 804b25956e47f190d4abc4ae925ce732c7b47dc5 (diff) | |
| parent | e1f6fa6f18afa8461cd82a56250222c2972c7785 (diff) | |
| download | gitlab-ce-9654cbb5924c968cdefcb83732b313c54fe292d1.tar.gz | |
Merge branch 'backup-uploader'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -70,8 +70,8 @@ gem "carrierwave" gem 'dropzonejs-rails' # for aws storage -gem "fog", "~> 1.14", group: :aws -gem "unf", group: :aws +gem "fog", "~> 1.14" +gem "unf" # Authorization gem "six" |