diff options
| author | Kushal Pandya <kushal@gitlab.com> | 2016-12-26 13:47:16 +0300 |
|---|---|---|
| committer | Kushal Pandya <kushal@gitlab.com> | 2016-12-31 09:28:36 +0300 |
| commit | fb3e365412954b5d23a048518d70c15894cb9686 (patch) | |
| tree | 966c9a9f515f2cd64ef7b00593777675c1c66ff5 /app/views/projects/merge_requests/conflicts/_file_actions.html.haml | |
| parent | 8e2a76d2dee86ed05bc5ed144424a33b45f92da7 (diff) | |
HAMLLint: Fix `SpaceInsideHashAttributes` offences
Diffstat (limited to 'app/views/projects/merge_requests/conflicts/_file_actions.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/_file_actions.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/conflicts/_file_actions.html.haml b/app/views/projects/merge_requests/conflicts/_file_actions.html.haml index 05af57acf03..2595ce74ac0 100644 --- a/app/views/projects/merge_requests/conflicts/_file_actions.html.haml +++ b/app/views/projects/merge_requests/conflicts/_file_actions.html.haml @@ -1,5 +1,5 @@ .file-actions - .btn-group{"v-if" => "file.type === 'text'"} + .btn-group{ "v-if" => "file.type === 'text'" } %button.btn{ ":class" => "{ 'active': file.resolveMode == 'interactive' }", '@click' => "onClickResolveModeButton(file, 'interactive')", type: 'button' } @@ -8,5 +8,5 @@ '@click' => "onClickResolveModeButton(file, 'edit')", type: 'button' } Edit inline - %a.btn.view-file.btn-file-option{":href" => "file.blobPath"} + %a.btn.view-file.btn-file-option{ ":href" => "file.blobPath" } View file @{{conflictsData.shortCommitSha}} |