delta/gitlab/gitlab-ce.git/app/assets, branch bump_gitlab_shell

Merge branch 'add-license'

2015-08-03T09:05:19+00:00

Make `code` elements in links display as such

2015-07-31T21:44:16+00:00

Also adds some minor padding to inline `code` elements.

Show buttons to add license, changelog and contribution guide if they're missing.

2015-07-30T13:12:57+00:00

Make `hr`s more visible in note bodies

2015-07-27T21:32:56+00:00

Closes #2107

Fix live notes refresh in relative URL deployments

2015-07-26T16:54:53+00:00

Merge branch 'fix-reload-with-full-diff-url' into 'master'

2015-07-25T15:38:23+00:00

Fix the "Reload with full diff" URL button

On the first load, the merge request tabs would be requested in JSON format to render
the HTML. This would cause the "Reload with full diff" button to create a link to `diff.json`. Instead, generate the path in HTML mode.

Closes #2041

See merge request !1019

Merge branch 'master' of github.com:gitlabhq/gitlabhq

2015-07-24T21:39:04+00:00

Merge branch 'auth-icons-labels' into 'master'

2015-07-24T11:28:55+00:00


Allow custom label to be set for authentication providers.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2341

Beside the above, I've:
- Refactored `OauthHelper` to have clearer method names and behaviour
- Moved some of `OauthHelper` behaviour to `Gitlab::OAuth::Provider`
- Renamed `OauthHelper` to `AuthHelper` since LDAP, SAML, Kerberos aren't OAuth
- Updated the icons for GitHub and GitLab

In the examples below, "OurAuth" is a SAML provider with a custom label.

![Screen_Shot_2015-07-02_at_16.29.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7d425bde69dc34e1667ebd5375d0266d/Screen_Shot_2015-07-02_at_16.29.52.png)

![Screen_Shot_2015-07-02_at_16.31.40](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cbb273321ecdf4cab3d3ef0dc35553e7/Screen_Shot_2015-07-02_at_16.31.40.png)

![Screen_Shot_2015-07-02_at_16.32.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d8dd6e1d0dc45a788e869cdcdc99e178/Screen_Shot_2015-07-02_at_16.32.39.png)

![Screen_Shot_2015-07-02_at_16.33.18](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7dbfe8b0ae229c32a08d6c7442976d83/Screen_Shot_2015-07-02_at_16.33.18.png)


See merge request !927

Fix and style the "Changes suppressed" link.

2015-07-23T20:07:45+00:00

Fix the "Reload with full diff" URL button

2015-07-23T19:53:54+00:00

On the first load, the merge request tabs would be requested in JSON format to render
the HTML. This would cause the "Reload with full diff" button to create a link to diff.json.

Closes #2041