delta/gitlab/gitlab-ce.git, branch tutorials_git_tricks

First draft on Git tricks tutorial

2016-02-04T22:43:56+00:00

[ci skip]

Merge branch 'search-on-groups-is-ugly' into 'master'

2016-02-04T20:09:29+00:00


Change placeholder text to just 'search'

Fixes #13168 

![Screen_Shot_2016-02-04_at_12.30.16_PM](/uploads/ca3c5549abeedce99d693606135d7428/Screen_Shot_2016-02-04_at_12.30.16_PM.png)


See merge request !2711

Merge branch 'fuzzy-file-search-menu-shortcut-placement' into 'master'

2016-02-04T18:01:48+00:00


Puts shortcut key in the right place.

Fixes #13192

![Screen_Shot_2016-02-04_at_11.51.15_AM](/uploads/a10dc24b4a836199351ba98fca266695/Screen_Shot_2016-02-04_at_11.51.15_AM.png)


See merge request !2710

Merge branch 'feature/jschatz1/issuable-sidebar' into 'master'

2016-02-04T18:01:29+00:00


Implement new design for issue and merge request right sidebar

Fixes #3981 



See merge request !2645

Change placeholder text to just 'search'

2016-02-04T17:29:32+00:00

Puts shortcut key in the right place.

2016-02-04T16:49:46+00:00

Merge branch 'fix-test' into 'master'

2016-02-04T16:39:44+00:00


Fix broken tests

Signed-off-by: Dmitriy Zaporozhets 

cc @DouweM 

See merge request !2708

Merge branch 'doc_bug' into 'master'

2016-02-04T16:38:02+00:00


fix documentation bug / typo

Hey, noticed this a little bit ago.  Need to get the example matching up with the following explanation.

See merge request !2709

Merge branch 'fix/atom-url-issue' into 'master'

2016-02-04T16:12:47+00:00


Fix atom url issue on projects

This MR adds prevents a project to have a path ending in .atom that conflicts with the feed

and 

Adds a migration to migrate old .atom projects to a different path

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3699

See merge request !2651

Properly link to the right issue or merge request

2016-02-04T16:10:11+00:00