diff options
| author | Hiroyuki Sato <sathiroyuki@gmail.com> | 2017-07-23 21:26:02 +0900 |
|---|---|---|
| committer | Hiroyuki Sato <sathiroyuki@gmail.com> | 2017-07-23 21:26:02 +0900 |
| commit | 9b25bbc45d4e6602452e230506601ff0ed8ba84a (patch) | |
| tree | 95f7326e4162a325a5e7c7304c33f18194b52cbe /app/views/projects/protected_branches/_matching_branch.html.haml | |
| parent | 839018d2d4e3e899b1fa06a43d093a0fdceced42 (diff) | |
| parent | b92d5135d8522e1370636799d74b51f9a37d0b2f (diff) | |
| download | gitlab-ce-9b25bbc45d4e6602452e230506601ff0ed8ba84a.tar.gz | |
Merge branch 'master' into 1827-prevent-concurrent-editing-wiki
Conflicts:
app/controllers/projects/wikis_controller.rb
app/views/projects/wikis/edit.html.haml
spec/features/projects/wiki/user_updates_wiki_page_spec.rb
Diffstat (limited to 'app/views/projects/protected_branches/_matching_branch.html.haml')
| -rw-r--r-- | app/views/projects/protected_branches/_matching_branch.html.haml | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/app/views/projects/protected_branches/_matching_branch.html.haml b/app/views/projects/protected_branches/_matching_branch.html.haml deleted file mode 100644 index 8a5332ca5bb..00000000000 --- a/app/views/projects/protected_branches/_matching_branch.html.haml +++ /dev/null @@ -1,9 +0,0 @@ -%tr - %td - = link_to matching_branch.name, namespace_project_tree_path(@project.namespace, @project, matching_branch.name) - - if @project.root_ref?(matching_branch.name) - %span.label.label-info.prepend-left-5 default - %td - - commit = @project.commit(matching_branch.name) - = link_to(commit.short_id, namespace_project_commit_path(@project.namespace, @project, commit.id), class: 'commit_short_id') - = time_ago_with_tooltip(commit.committed_date) |