diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-10-16 04:33:23 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-10-16 04:33:23 +0000 |
| commit | a7e9490d122a9bf547f16ade1ec00765363f09b2 (patch) | |
| tree | d1ceb10ea89026384540d523770fb443282f976d | |
| parent | 4ea3e617f8527b05e506b3e85652f368531c6aa2 (diff) | |
| parent | fa25f61d474849a7a1ac893af9896b3227c33404 (diff) | |
| download | gitlab-ce-a7e9490d122a9bf547f16ade1ec00765363f09b2.tar.gz | |
Merge branch 'sh-fix-ruby-2-1' into 'master'
Fix Hash syntax to work for both Ruby 2.1 and 2.3
Ruby 2.1 specs were failing (e.g. https://gitlab.com/gitlab-org/gitlab-ce/builds/5149275) due the error:
```
SyntaxError: /builds/gitlab-org/gitlab-ce/app/views/devise/shared/_tabs_normal.html.haml:3: syntax error, unexpected ':', expecting =>
...'#login-pane', data: {'toggle':'tab'}, role: 'tab')).to_s));...
```
See merge request !6917
| -rw-r--r-- | app/views/devise/shared/_tabs_normal.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/devise/shared/_tabs_normal.html.haml b/app/views/devise/shared/_tabs_normal.html.haml index 48abd6519d6..79b1d447a92 100644 --- a/app/views/devise/shared/_tabs_normal.html.haml +++ b/app/views/devise/shared/_tabs_normal.html.haml @@ -1,5 +1,5 @@ %ul.nav-links.new-session-tabs.nav-tabs{ role: 'tablist'} %li.active{ role: 'presentation' } - %a{ href: '#login-pane', data: {'toggle':'tab'}, role: 'tab'} Sign in + %a{ href: '#login-pane', data: { toggle: 'tab' }, role: 'tab'} Sign in %li{ role: 'presentation'} - %a{ href: '#register-pane', data: {'toggle':'tab'}, role: 'tab'} Register + %a{ href: '#register-pane', data: { toggle: 'tab' }, role: 'tab'} Register |