diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-10-10 22:33:36 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-10 22:33:36 +0000 |
| commit | ae2d6e4757f8264559b5a2ad98b08280b8cd5af1 (patch) | |
| tree | a05353ad3e47a62d52a627f76ccd548d820a7bb6 | |
| parent | 8cec2f4beb7ea3e3442b053589d9702847339f84 (diff) | |
| parent | 42a6f5c1acb22f75c231a8f82019044e19235782 (diff) | |
| download | gitlab-ce-ae2d6e4757f8264559b5a2ad98b08280b8cd5af1.tar.gz | |
Merge branch '20356-network-commit-hash-input-placeholder-corrections' into 'master'
Changed network input placeholder to 'Git revision'
## What does this MR do?
Changes the commit SHA-1 input placeholder on the network page to `Git revision`. ([as defined here](https://git-scm.com/docs/gitrevisions))
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
Placeholder was too complex
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #20356
See merge request !6766
| -rw-r--r-- | app/views/projects/network/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml index b2ece44d966..29df1bab04e 100644 --- a/app/views/projects/network/show.html.haml +++ b/app/views/projects/network/show.html.haml @@ -8,7 +8,7 @@ .project-network .controls = form_tag namespace_project_network_path(@project.namespace, @project, @id), method: :get, class: 'form-inline network-form' do |f| - = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: 'search-input form-control input-mx-250 search-sha' + = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Git revision", class: 'search-input form-control input-mx-250 search-sha' = button_tag class: 'btn btn-success' do = icon('search') .inline.prepend-left-20 |