Commit 45384ccd authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch '214039-display-filter-commit-in-mobile' into 'master'

Display commits search in mobile & adjust text

Closes #214039

See merge request gitlab-org/gitlab!35702
parents 0d2fd48e d2fc1ed1
......@@ -117,3 +117,8 @@
.gl-border-b-2 {
border-bottom-width: $gl-border-size-2;
}
// Remove once this MR has been merged in GitLab UI > https://gitlab.com/gitlab-org/gitlab-ui/-/merge_requests/1539
.gl-min-w-full {
min-width: 100%;
}
......@@ -14,18 +14,18 @@
%ul.breadcrumb.repo-breadcrumb
= commits_breadcrumbs
#js-author-dropdown{ data: { 'commits_path': project_commits_path(@project), 'project_id': @project.id } }
.tree-controls.d-none.d-sm-none.d-md-block
.tree-controls
- if @merge_request.present?
.control
.control.d-none.d-md-block
= link_to _("View open merge request"), project_merge_request_path(@project, @merge_request), class: 'btn'
- elsif create_mr_button?(@repository.root_ref, @ref)
.control
.control.d-none.d-md-block
= link_to _("Create merge request"), create_mr_path(@repository.root_ref, @ref), class: 'btn btn-success'
.control
= form_tag(project_commits_path(@project, @id), method: :get, class: 'commits-search-form js-signature-container', data: { 'signatures-path' => namespace_project_signatures_path }) 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
= search_field_tag :search, params[:search], { placeholder: _('Search by message'), id: 'commits-search', class: 'form-control search-text-input input-short gl-mt-3 mt-sm-0 gl-min-w-full', spellcheck: false }
.control.d-none.d-md-block
= link_to project_commits_path(@project, @ref, rss_url_options), title: _("Commits feed"), class: 'btn' do
= icon("rss")
......
---
title: Display commits search in mobile & adjust text
merge_request: 35702
author:
type: changed
......@@ -10042,9 +10042,6 @@ msgstr ""
msgid "Filter by Git revision"
msgstr ""
msgid "Filter by commit message"
msgstr ""
msgid "Filter by issues that are currently closed."
msgstr ""
......@@ -19926,6 +19923,9 @@ msgstr ""
msgid "Search by author"
msgstr ""
msgid "Search by message"
msgstr ""
msgid "Search by name"
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment