diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-06-17 12:38:49 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-06-17 14:29:11 -0300 |
| commit | e5aa902860fcc2380fd25a6a4f0736dae159eba3 (patch) | |
| tree | ba3c678a476bc7153490da412ebd64223c155c1c /app/helpers/blob_helper.rb | |
| parent | ab236c76247d83c190b148acbffa48f244414553 (diff) | |
| parent | ae4491b42181f7195199fd6ac9273891d6e48263 (diff) | |
| download | gitlab-ce-issue_12758.tar.gz | |
Merge master into issue_12758issue_12758
Diffstat (limited to 'app/helpers/blob_helper.rb')
| -rw-r--r-- | app/helpers/blob_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index 85559fbc5f5..5b54b34070c 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -180,8 +180,8 @@ module BlobHelper licenses = Licensee::License.all @licenses_for_select = { - Popular: licenses.select(&:featured).map { |license| [license.name, license.key] }, - Other: licenses.reject(&:featured).map { |license| [license.name, license.key] } + Popular: licenses.select(&:featured).map { |license| { name: license.name, id: license.key } }, + Other: licenses.reject(&:featured).map { |license| { name: license.name, id: license.key } } } end |