diff options
| author | Nur Rony <pro.nmrony@gmail.com> | 2017-02-02 18:22:32 +0600 |
|---|---|---|
| committer | Nur Rony <pro.nmrony@gmail.com> | 2017-02-02 18:22:32 +0600 |
| commit | b329a4675ab3641e5b0526da40ed4f47d61b53d4 (patch) | |
| tree | 72b791f0c24a12d95b6bdead8e9d4540f8a45411 /app/views/projects | |
| parent | d4dd1fcf93d10b65b9e1b5ca392daacaf7c5138c (diff) | |
| download | gitlab-ce-b329a4675ab3641e5b0526da40ed4f47d61b53d4.tar.gz | |
removes old css class from everywhere27291-unify-mr-diff-file-buttons
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/_file_actions.html.haml | 2 |
1 files changed, 1 insertions, 1 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 2595ce74ac0..0839880713f 100644 --- a/app/views/projects/merge_requests/conflicts/_file_actions.html.haml +++ b/app/views/projects/merge_requests/conflicts/_file_actions.html.haml @@ -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{ ":href" => "file.blobPath" } View file @{{conflictsData.shortCommitSha}} |