diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-07 19:12:29 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-07 19:12:29 +0300 |
| commit | 5a9a8d03a798c8dfe154e5db4ddf6bcb7a14fa2c (patch) | |
| tree | de42e220cf35f130e2d2d3d6b2290e639d959d6d /app/helpers/selects_helper.rb | |
| parent | cbcb8dbe702c0b1532327aeb2dc53caffb6e8ed9 (diff) | |
| parent | bd5fb1b479f29df3c2150b6c375c1b7bffd28931 (diff) | |
Merge branch 'master' into ui/dashboard-new-issue
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 418120a3f73..05386d790ca 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 |