diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2017-04-06 23:30:19 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2017-04-06 23:30:19 +0000 |
commit | 8a574030eadd1794294543639a5dd471741d8c6e (patch) | |
tree | 363b40823cc5e18334b2e21af9d810ed1fabed9b /app/views/projects/commits | |
parent | d2aea4cde0574b1dfbfc3d8d85ab80195fc29e3f (diff) | |
parent | 745058c0529b4eb719c730d3067594b681cb0694 (diff) | |
download | gitlab-ce-8a574030eadd1794294543639a5dd471741d8c6e.tar.gz |
Merge branch 'button-capitalization' into 'master'
Button capitalisation
Closes #18931
See merge request !10418
Diffstat (limited to 'app/views/projects/commits')
-rw-r--r-- | app/views/projects/commits/show.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml index 38dbf2ac10b..c1c2fb3d299 100644 --- a/app/views/projects/commits/show.html.haml +++ b/app/views/projects/commits/show.html.haml @@ -18,16 +18,16 @@ .block-controls.hidden-xs.hidden-sm - if @merge_request.present? .control - = link_to "View Open Merge Request", namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn' + = link_to "View open merge request", namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn' - elsif create_mr_button?(@repository.root_ref, @ref) .control - = link_to "Create Merge Request", create_mr_path(@repository.root_ref, @ref), class: 'btn btn-success' + = link_to "Create merge request", create_mr_path(@repository.root_ref, @ref), class: 'btn btn-success' .control = form_tag(namespace_project_commits_path(@project.namespace, @project, @id), method: :get, class: 'commits-search-form') do = search_field_tag :search, params[:search], { placeholder: 'Filter by commit message', id: 'commits-search', class: 'form-control search-text-input input-short', spellcheck: false } .control - = link_to namespace_project_commits_path(@project.namespace, @project, @ref, rss_url_options), title: "Commits Feed", class: 'btn' do + = link_to namespace_project_commits_path(@project.namespace, @project, @ref, rss_url_options), title: "Commits feed", class: 'btn' do = icon("rss") %div{ id: dom_id(@project) } |