diff options
author | Rémy Coutable <remy@rymai.me> | 2016-03-15 13:20:54 +0100 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-03-15 14:55:40 +0100 |
commit | 1714883107b7b8b8f2ef8c2836acc2866362738e (patch) | |
tree | 4c79d81c52b932c20d0ddfb467175f39e281faf3 /Gemfile.lock | |
parent | ea7d062fa60e3e622288237fc66a815348bbcf36 (diff) | |
download | gitlab-ce-1714883107b7b8b8f2ef8c2836acc2866362738e.tar.gz |
Revert "Merge branch 'avatar-cropping' into 'master'
"revert-avatar-cropping
This reverts commit 01160fc06182de89c400af174861f6545ad6ceb8, reversing
changes made to 4bff9daf8b6d85e9c78565e21cfaa3f6d36f0282.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 9772e7fdd38..14b03bab5dd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -469,7 +469,6 @@ GEM method_source (0.8.2) mime-types (1.25.1) mimemagic (0.3.0) - mini_magick (4.4.0) mini_portile2 (2.0.0) minitest (5.7.0) mousetrap-rails (1.4.6) @@ -957,7 +956,6 @@ DEPENDENCIES loofah (~> 2.0.3) mail_room (~> 0.6.1) method_source (~> 0.8) - mini_magick (~> 4.4.0) minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) mysql2 (~> 0.3.16) |