delta/gitlab/gitlab-ce.git/spec/controllers, branch refactor-diff-notes gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'health-check-route' 2016-05-12T21:39:03+00:00 Douwe Maan douwe@selenight.nl 2016-05-12T21:39:03+00:00 7fc51d1908a1ce7b0a09f273881c08102efd1dae # Conflicts: # db/schema.rb 
# Conflicts:
#	db/schema.rb
Support token header for health check token, and general cleanup of the health_check feature. 2016-05-12T00:27:08+00:00 DJ Mountney david@twkie.net 2016-05-12T00:27:08+00:00 c8f23bd2edc19f968446b149120df1f7798eb4b1 






Add tests for the health check feature
2016-05-10T23:19:16+00:00

DJ Mountney
david@twkie.net

2016-05-10T23:19:16+00:00

0e0caf4d17c28b6b0f3488b25efa265ce2804cc4












Add specs for user routing and update spec for user controller
2016-05-08T15:06:19+00:00

Long Nguyen
long.polyglot@gmail.com

2016-05-08T15:06:19+00:00

6781c1b4ba8bb1a7da0a4bf637d7a311abf281f0












Merge remote-tracking branch 'dev/master' into 'master'
2016-05-02T23:58:54+00:00

Robert Speicher
rspeicher@gmail.com

2016-05-02T23:58:54+00:00

c9bc3d20efba26f9259eac36c2ee8eed1a12ec59












Handle issue move access instead of raising error
2016-04-30T19:28:40+00:00

Grzegorz Bizon
grzesiek.bizon@gmail.com

2016-04-30T19:14:40+00:00

c9577711cee5f9eec699711d39196480f400a746

Closes #15533





Closes #15533







Backport GitHub Enterprise import support from EE
2016-04-27T04:00:55+00:00

Stan Hu
stanhu@gmail.com

2016-04-22T19:43:10+00:00

eede0323453190440a8d738b5eab0723f54dee65

These changes were pulled from GitLab EE to support configuring
an alternative API URL than the default https://api.github.com.
In addition, the `verify_ssl` flag allows users to disable SSL cert
checking.

One modification: add a default `args` option if it does not exist
to avoid breaking existing configurations.





These changes were pulled from GitLab EE to support configuring
an alternative API URL than the default https://api.github.com.
In addition, the `verify_ssl` flag allows users to disable SSL cert
checking.

One modification: add a default `args` option if it does not exist
to avoid breaking existing configurations.







Fix typo
2016-04-22T21:46:47+00:00

Douwe Maan
douwe@gitlab.com

2016-04-22T21:46:47+00:00

b992e2520cc93b3161f6e7c46dde66f10fe13a12












Fix issue with impersonation
2016-04-22T21:21:56+00:00

Douwe Maan
douwe@selenight.nl

2016-04-22T21:19:55+00:00

d3462e711c0b3cc17ef47e1ffffa6f40f98b5e98












Merge branch 'rs-diff_view' into 'master'

2016-04-22T07:49:46+00:00

Rémy Coutable
remy@rymai.me

2016-04-22T07:49:46+00:00

5a8873f362557c4002858fe323d5c346a89c91b3


Always read diff_view setting from the cookie

Prior, when the user had their view set to "parallel" and then visited a
merge request's changes tab _without_ passing the `view` parameter via
query string, the view would be parallel but the `Notes` class was
always instantiated with the default value from `diff_view` ("inline"),
resulting in broken markup when the form to add a line note was
dynamically inserted.

The cookie is set whenever the view is changed, so this value should
always be up-to-date.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557 and https://gitlab.com/gitlab-org/gitlab-ce/issues/15285

See merge request !3732





Always read diff_view setting from the cookie

Prior, when the user had their view set to "parallel" and then visited a
merge request's changes tab _without_ passing the `view` parameter via
query string, the view would be parallel but the `Notes` class was
always instantiated with the default value from `diff_view` ("inline"),
resulting in broken markup when the form to add a line note was
dynamically inserted.

The cookie is set whenever the view is changed, so this value should
always be up-to-date.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557 and https://gitlab.com/gitlab-org/gitlab-ce/issues/15285

See merge request !3732