kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'fix-branch-title-trailing-space' into 'master'

Browse source 
Fix branch title trailing space on hover

## What does this MR do?
Removes the unnecessary encapsulation of the `<span>` inside of the `<a>` which was creating the trailing space on hover. 

## Are there points in the code the reviewer needs to double check?
Shouldn't be

## Why was this MR needed?
Makes the UI look more polished

## What are the relevant issue numbers?
Closes #20676 

## Screenshots (if relevant)
Before (When hovering on branch title):
![Screen_Shot_2016-08-05_at_2.54.43_PM](/uploads/1c90ae1ed69268a2fdcdafdede267028/Screen_Shot_2016-08-05_at_2.54.43_PM.png)

After (When hovering on branch title):
![Screen_Shot_2016-08-05_at_2.54.19_PM](/uploads/6eab261a343e7acb6223ed205443b644/Screen_Shot_2016-08-05_at_2.54.19_PM.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5688
This commit is contained in:
Jacob Schatz 2016-08-19 14:10:20 +00:00
commit e5840a4d9b
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -57,6 +57,7 @@ v 8.11.0 (unreleased)
- Enforce 2FA restrictions on API authentication endpoints !5820 - Enforce 2FA restrictions on API authentication endpoints !5820
- Limit git rev-list output count to one in forced push check - Limit git rev-list output count to one in forced push check
- Show deployment status on merge requests with external URLs - Show deployment status on merge requests with external URLs
- Fix branch title trailing space on hover (ClemMakesApps)
- Clean up unused routes (Josef Strzibny) - Clean up unused routes (Josef Strzibny)
- Fix issue on empty project to allow developers to only push to protected branches if given permission - Fix issue on empty project to allow developers to only push to protected branches if given permission
- API: Add enpoints for pipelines - API: Add enpoints for pipelines

4
app/views/projects/branches/_branch.html.haml
View file

@ -5,8 +5,8 @@
- number_commits_ahead = diverging_commit_counts[:ahead] - number_commits_ahead = diverging_commit_counts[:ahead]
%li(class="js-branch-#{branch.name}") %li(class="js-branch-#{branch.name}")
%div %div
= link_to namespace_project_tree_path(@project.namespace, @project, branch.name) do = link_to namespace_project_tree_path(@project.namespace, @project, branch.name), class: 'item-title str-truncated' do
%span.item-title.str-truncated= branch.name = branch.name
&nbsp; &nbsp;
- if branch.name == @repository.root_ref - if branch.name == @repository.root_ref
%span.label.label-primary default %span.label.label-primary default