diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-07 10:06:07 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-07 10:06:07 +0100 |
| commit | 0e96d6eb10f92f14d9c06e1728b1a3597a856d2a (patch) | |
| tree | e003ee5ba773743fb856f9899b2a2c311139f048 /app/helpers/selects_helper.rb | |
| parent | 46278ec7ba7c618acaf7381ad466742ce84e33db (diff) | |
| parent | 234f4bf20fb338f2164976fd39203fbc671afd29 (diff) | |
| download | gitlab-ce-0e96d6eb10f92f14d9c06e1728b1a3597a856d2a.tar.gz | |
Merge branch 'master' into merge-if-green
Diffstat (limited to 'app/helpers/selects_helper.rb')
| -rw-r--r-- | app/helpers/selects_helper.rb | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/app/helpers/selects_helper.rb b/app/helpers/selects_helper.rb index 7e54d4d1b5b..7e175d0de8a 100644 --- a/app/helpers/selects_helper.rb +++ b/app/helpers/selects_helper.rb @@ -15,12 +15,14 @@ module SelectsHelper html = { class: css_class, - 'data-placeholder' => placeholder, - 'data-null-user' => null_user, - 'data-any-user' => any_user, - 'data-email-user' => email_user, - 'data-first-user' => first_user, - 'data-current-user' => current_user + data: { + placeholder: placeholder, + null_user: null_user, + any_user: any_user, + email_user: email_user, + first_user: first_user, + current_user: current_user + } } unless opts[:scope] == :all |