delta/gitlab/gitlab-ce.git, branch tree-file-title

Added title attribute to enties in tree view

2016-06-16T12:58:00+00:00

Closes #18353

Merge branch 'fix_migration_style_guide' into 'master'

2016-06-16T08:02:36+00:00


Update migration_style_guide.md with new details

See merge request !4693

Merge branch 'hide-todo-collapsed-sidebar' into 'master'

2016-06-16T02:32:37+00:00


Hide the Todo button in the collapsed issuable sidebar.

## What does this MR do?

Fixes a bug where the "Add Todo" button was displayed in the collapsed sidebar.

## Are there points in the code the reviewer needs to double check?

This shouldn't remove any other elements from the collapsed sidebar.

## What are the relevant issue numbers?

None

## Screenshots (if relevant)

Before:

![Screen_Shot_2016-06-15_at_11.41.46_AM](/uploads/27a1ace58cf8c44ad96accd3d0b32f11/Screen_Shot_2016-06-15_at_11.41.46_AM.png)

After:

![Screen_Shot_2016-06-15_at_11.40.53_AM](/uploads/91a8585680fc482682d0efafdba4d599/Screen_Shot_2016-06-15_at_11.40.53_AM.png)

See merge request !4686

Merge branch 'long-commit-message-scroll-fix' into 'master'

2016-06-16T00:32:24+00:00


Fix long commit message scroll issue.

Fixes horizontal scrollbar for long commit description.

## Before
![before_](/uploads/d261e26044d8ab451bc7768b16316253/before_.png)

## After
![after](/uploads/f27227a77d25d80b797e3ffc916d1957/after.png)

See merge request !4643

Merge branch 'category-search-dropdown' into 'master'

2016-06-16T00:30:56+00:00


Show categorised search queries in the search autocomplete

Fixes #5885 

It works in 3 categories, Dashboard, Groups and Project.

## Dashboard context
![for-dashboard](/uploads/3a59f6ec008a972495597c8f2691c385/for-dashboard.png)

## Group context
![for-group](/uploads/f7aa413d56330a1d9b2e5562f95badf7/for-group.png)

## Project context
![for-project](/uploads/dabe04cf8758a056cf7b03da001ffd91/for-project.png)


## Screencast
![category-search-dropdown](/uploads/4d9513dcd6ccb6e24adefdf65f9bc778/category-search-dropdown.gif)



See merge request !4499

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into long-commit-message-scroll-fix

2016-06-15T23:24:19+00:00

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown

2016-06-15T23:04:09+00:00

# Conflicts:
#	app/assets/javascripts/lib/common_utils.js.coffee

Merge branch 'toggle-whitespace-button-for-compare-page' into 'master'

2016-06-15T22:48:39+00:00


Toggle whitespace button for compare page

## What does this MR do?

Adds whitespace button to compare branches page.

## Are there points in the code the reviewer needs to double check?

Ruby code.

## Why was this MR needed?

Compare branches UX

## What are the relevant issue numbers?

Closes #17881.

## Screenshots (if relevant)

![Screen_Shot_2016-06-09_at_18.39.48](/uploads/8995a7bc8bea7fa3ff19446ebe49fb88/Screen_Shot_2016-06-09_at_18.39.48.png)

## Does this MR meet the acceptance criteria?

- [x] [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
- [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 !4569

Merge branch 'award-emoji-fix' into 'master'

2016-06-15T22:39:32+00:00


Fix emoji block selector.

Fixes #18465 and #18577

See merge request !4604

Merge branch 'update-changelog' into 'master'

2016-06-15T22:21:57+00:00


Update CHANGELOG

[ci skip]

See merge request !4695