diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-08-12 17:00:16 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-08-12 17:00:16 +0000 |
| commit | 8d1c7c5dc9e3ba1904335fa6322d527506175f8b (patch) | |
| tree | e3a29b6a38904f9185135c0dd2c1d7643f3bdeb9 /app/helpers/avatars_helper.rb | |
| parent | ec73abcd782ba9be95db62ecede09db7fe783aab (diff) | |
| parent | f6c0c96b80b971ffaa7aa49553e13f6849f8ec4a (diff) | |
| download | gitlab-ce-8d1c7c5dc9e3ba1904335fa6322d527506175f8b.tar.gz | |
Merge branch '20059-environment-list' into 'master'
Resolve "Format branch, tag, and commit in environment list"
## What does this MR do?
Updates Environments page rows to match the new pipeline updates
## Are there points in the code the reviewer needs to double check?
I removed `private` from `avatars_helper.rb` so I could use `user_avatar`.
## What are the relevant issue numbers?
Closes #20059
## Screenshots (if relevant)
See merge request !5687
Diffstat (limited to 'app/helpers/avatars_helper.rb')
| -rw-r--r-- | app/helpers/avatars_helper.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/helpers/avatars_helper.rb b/app/helpers/avatars_helper.rb index 2160cf7a690..aa8acbe7567 100644 --- a/app/helpers/avatars_helper.rb +++ b/app/helpers/avatars_helper.rb @@ -7,8 +7,6 @@ module AvatarsHelper })) end - private - def user_avatar(options = {}) avatar_size = options[:size] || 16 user_name = options[:user].try(:name) || options[:user_name] |