diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-10 10:14:22 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-10 10:14:22 +0000 |
| commit | bce9f31cdbfc7c25407ace445b0bc504c3f4e2c8 (patch) | |
| tree | c35670ea5c97f41fd0f4397d98a32cb58c5f8089 /app/views/projects/diffs/_file_header.html.haml | |
| parent | 5d0c5663a0368545653be3992c364eea74830062 (diff) | |
| parent | 57d5a5499cc4248176e3740c3aae3fa99be00752 (diff) | |
| download | gitlab-ce-bce9f31cdbfc7c25407ace445b0bc504c3f4e2c8.tar.gz | |
Merge branch 'master' into 27932-merge-request-pipelines-displays-json
* master: (32 commits)
Fix contribution activity alignment
Adds a null check to build notifications
Add a spec for our custom GemFetcher cop
add CHANGELOG.md entry for !9078
approve new dependencies
update karma deps to work with webpack 2
upgrade to webpack 2.2.x
add CHANGELOG.md entry for !9072
approve MIT license for wordwrap submodule
fix failing karma test
upgrade babel to v6
exclude node_modules from imports-loader wrapper
Allow copying a created branch name to the clipboard.
Uses shared vue resource interceptor
Refactored diff notes Vue app
Fix expand_collapse_diffs specs
Update the rspec_profiling gem to 0.0.5
Fix menu link in CONTRIBUTING
adds max-width only for new filter dropdown
adds changelog
...
Diffstat (limited to 'app/views/projects/diffs/_file_header.html.haml')
| -rw-r--r-- | app/views/projects/diffs/_file_header.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/diffs/_file_header.html.haml b/app/views/projects/diffs/_file_header.html.haml index ddec775b789..5b09b6907ab 100644 --- a/app/views/projects/diffs/_file_header.html.haml +++ b/app/views/projects/diffs/_file_header.html.haml @@ -10,13 +10,13 @@ - if diff_file.renamed_file - old_path, new_path = mark_inline_diffs(diff_file.old_path, diff_file.new_path) - %strong + %strong.file-title-name.has-tooltip{ data: { title: old_path } } = old_path → - %strong + %strong.file-title-name.has-tooltip{ data: { title: new_path } } = new_path - else - %strong + %strong.file-title-name.has-tooltip{ data: { title: diff_file.new_path } } = diff_file.new_path - if diff_file.deleted_file deleted |