delta/gitlab/gitlab-ce.git/app, branch 43446-new-cluster-page-tabs

Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs

2018-06-21T08:48:25+00:00

Merge branch 'bvl-finder-methods-cop' into 'master'

2018-06-21T08:31:12+00:00

Add a cop for `FinderMethods`

Closes #42705

See merge request gitlab-org/gitlab-ce!19951

Merge branch 'sh-fallback-to-first-tab-signin' into 'master'

2018-06-20T21:49:03+00:00

Fall back to the first sign-in tab if the local storage value is bad

See merge request gitlab-org/gitlab-ce!20050

Fall back to the first sign-in tab if the local storage value is bad

2018-06-20T21:18:45+00:00

If `current_signin_tab` is `#crowd`, then no tab will be active. Fix
this by using the first available tab.

Relates to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20049#note_82996324

Merge branch 'jr-48133-web-ide-commit-ellipsis' into 'master'

2018-06-20T20:16:15+00:00

Resolve "Web IDE "Commit" button should indicate when there's a subsequent step"

Closes #48133

See merge request gitlab-org/gitlab-ce!20030

fix a couple oopsies

2018-06-20T20:11:57+00:00

Merge branch '47488-remove-unmergeable-notification-for-no-commits' into 'master'

2018-06-20T19:13:28+00:00

Notify only merge request unmergeable due to conflict

See merge request gitlab-org/gitlab-ce!19548

Merge branch '47964-custom-logo-rendering-improperly-on-sign-in-page-2' into 'master'

2018-06-20T16:43:55+00:00

Resolve "Custom logo rendering improperly on sign-in page"

Closes #47964

See merge request gitlab-org/gitlab-ce!20037

Backport code from gitlab-ee!6182

2018-06-20T16:38:42+00:00

Add a cop for `FinderMethods`

2018-06-20T16:13:13+00:00

This notifies developers when calling `find(_by!)` chained on
`execute`. And suggests using the methods from `FinderMethods`. These
will perform the correct authorization checks on the resource when it
is found.