diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-08-08 10:14:21 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-08-08 10:14:21 +0200 |
| commit | 8ae222092dc63d672dc505358d7bdfbb8478c774 (patch) | |
| tree | 44082b65f583923ff48fd1315e0ccf44c2293b6e /app/views/projects/commit/show.html.haml | |
| parent | 1b5e2303debf00784603d6bd9d87d613de3c8091 (diff) | |
| parent | 91030230545a199a86c2742600a7a2e68ef75c98 (diff) | |
| download | gitlab-ce-8ae222092dc63d672dc505358d7bdfbb8478c774.tar.gz | |
Merge branch 'master' into feature/svg-badge-template
* master: (363 commits)
Added changelog item for issuable form dropdowns
Add 'run tests' docs from GDK
Bump gitlab_git to lazy load compare commits
Add examples to repository files API (!5465)
Ignore URLs starting with // (!5677)
Add failing test for #7032
Update timeago to shorter representation
Add missing DOWNTIME constant to the AddTimestampsToMembersAgain migration
Added guide about migrations and downtime
Update CHANGELOG for 8.10.4
Add a data migration to fix some missing timestamps in the members table (again)
Move abilities by subject class to a dedicated method
Remove unnecessary empty line after css var
Set consistency in list text height css
Add description to text/plain emails
Fix Rename `add_users_into_project` and `projects_ids`
fix spec
Underscore variable to camelCase
using shared path for project import uploads and refactored gitlab remove export worker
Structure the development documentation
...
Diffstat (limited to 'app/views/projects/commit/show.html.haml')
| -rw-r--r-- | app/views/projects/commit/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/commit/show.html.haml b/app/views/projects/commit/show.html.haml index d0da2606587..ed44d86a687 100644 --- a/app/views/projects/commit/show.html.haml +++ b/app/views/projects/commit/show.html.haml @@ -7,7 +7,7 @@ = render "ci_menu" - else %div.block-connector -= render "projects/diffs/diffs", diffs: @diffs, project: @project, diff_refs: @commit.diff_refs += render "projects/diffs/diffs", diffs: @diffs = render "projects/notes/notes_with_form" - if can_collaborate_with_project? - %w(revert cherry-pick).each do |type| |