delta/gitlab/gitlab-ce.git/features, branch coffeescript_syntax_error

Merge branch 'rs-crowd-form-view-spec' into 'master'

2016-02-26T11:27:27+00:00


Move "I should see Crowd login form" feature to a view spec

We were doing all kinds of code gymnastics to "enable" Crowd in the
feature spec and this would sometimes cause a transient failure.

Really what it's testing is if the Crowd login form shows when Crowd's
enabled, so this is much better suited to a view spec.

See merge request !2963

Merge remote-tracking branch 'origin/Baertierchen/gitlab-ce-showTestCoverage'

2016-02-25T18:02:57+00:00

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

2016-02-24T23:09:29+00:00


Sidebar overlaps content when screen is below 1200px.

When screen is below 1200px, the sidebar overlaps.
When screen is above 1200px, the sidebar pushes content out.
z-index change to make sure hamburger stays on top.
Fixes #12717 
![screensize](/uploads/9a21fa06d583a49d6ebbf1ada34c6792/screensize.gif)

![screensize-small](/uploads/7c25f46e962248a40840562a01c83f8f/screensize-small.gif)

Also sorry I couldn't get the collapse button in the screen cap. It's there. 


See merge request !2620

Move "I should see Crowd login form" feature to a view spec

2016-02-24T22:38:13+00:00

We were doing all kinds of code gymnastics to "enable" Crowd in the
feature spec and this would sometimes cause a transient failure.

Really what it's testing is if the Crowd login form shows when Crowd's
enabled, so this is much better suited to a view spec.

fixed tests

2016-02-24T08:28:33+00:00

Merge branch 'issue_13301_emoji-menu' into 'master'

2016-02-24T02:50:45+00:00


Load award emoji picker with ajax request

Fixes #13301.

See merge request !2888

Update award_emoji test

2016-02-24T01:37:15+00:00

Initialize navigation shortcuts on project's files page

2016-02-24T01:04:20+00:00

Fix failing spec

2016-02-23T20:59:10+00:00

Set window_size to 1366*768

2016-02-23T20:29:55+00:00