delta/gitlab/gitlab-ce.git/config, branch user-inline-scripts gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'sh-disabled-prepared-statements-in-test' into 'master' 2017-07-11T11:05:02+00:00 Yorick Peterse yorickpeterse@gmail.com 2017-07-11T11:05:02+00:00 655219e24a3043c19582808e02b20dd4feddb449 Disabled prepared statements in test See merge request !12773 
Disabled prepared statements in test

See merge request !12773
 Merge branch '33949-remove-healthcheck-access-token' into 'master' 2017-07-11T08:51:27+00:00 Sean McGivern sean@mcgivern.me.uk 2017-07-11T08:51:27+00:00 25d241ae97e22159bf71caa5553eb192fdb6d4c0 Remove the need to use health check token by adding ability to whitelist hosts Closes #33949 See merge request !12612 
Remove the need to use health check token by adding ability to whitelist hosts

Closes #33949

See merge request !12612
 Disabled prepared statements in test 2017-07-11T03:38:26+00:00 Stan Hu stanhu@gmail.com 2017-07-11T03:35:20+00:00 f92a12c265608e4907e3cfde2ba878b59668dc19 Some tests may test migrations and change the types of columns. If this happens, Rails may cache a statement that will cause PostgreSQL to fail with the message, "cached plan must not change result type": https://github.com/rails/rails/issues/12330 This happened in https://gitlab.com/gitlab-org/gitlab-ee/issues/2890#note_34636077. 
Some tests may test migrations and change the types of columns. If this
happens, Rails may cache a statement that will cause PostgreSQL to fail with
the message, "cached plan must not change result type":
https://github.com/rails/rails/issues/12330

This happened in https://gitlab.com/gitlab-org/gitlab-ee/issues/2890#note_34636077.
Support multiple Redis instances based on queue type 2017-07-11T03:35:47+00:00 Paul Charlton techguru@byiq.com 2017-07-11T03:35:47+00:00 cb3b4a15e6913bc28ee2ecaab017a4c3f08c438e 






Merge branch 'master' into 'catch-redis-address-error'
2017-07-10T21:20:52+00:00

DJ Mountney
dj@gitlab.com

2017-07-10T21:20:52+00:00

e643c0db35617d2b0ba607708322e827c15ce132

# Conflicts:
#   lib/gitlab/current_settings.rb




# Conflicts:
#   lib/gitlab/current_settings.rb






Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'"
2017-07-10T15:29:15+00:00

Marin Jankovski
maxlazio@gmail.com

2017-07-10T15:29:15+00:00

97a6ec4aaa2aa809023dde897e8ad88642fbb967

This reverts commit 83ec509ce43c56da601335de5b9ea4422c785560, reversing
changes made to 57f0677ad854b7b17bd57e1e3b0ef542ce322b56.





This reverts commit 83ec509ce43c56da601335de5b9ea4422c785560, reversing
changes made to 57f0677ad854b7b17bd57e1e3b0ef542ce322b56.







Re-add Feature.register_feature_groups which is already documented
2017-07-10T13:56:23+00:00

Rémy Coutable
remy@rymai.me

2017-07-10T13:54:49+00:00

a7d65aeaf2d340ffc8cc2db38a03d427d6aecbce

This is a follow-up for !12362 where this was documented but the code
was removed in the last iteration. Since this can still be useful and
this is already supported by the API, I think re-adding the code was
the best course of action.

Signed-off-by: Rémy Coutable <remy@rymai.me>





This is a follow-up for !12362 where this was documented but the code
was removed in the last iteration. Since this can still be useful and
this is already supported by the API, I think re-adding the code was
the best course of action.

Signed-off-by: Rémy Coutable <remy@rymai.me>







Merge branch 'feature/user-datetime-search-api-mysql' into 'master'
2017-07-07T20:52:17+00:00

Douwe Maan
douwe@gitlab.com

2017-07-07T20:52:17+00:00

94e2a286846ee8b8b36ac29ccae7d51cb19578d5

Add creation time filters to user search API for admins

Closes #29507

See merge request !12682




Add creation time filters to user search API for admins

Closes #29507

See merge request !12682






Merge branch '20628-add-oauth-implicit-grant' into 'master'
2017-07-07T18:41:32+00:00

Douwe Maan
douwe@gitlab.com

2017-07-07T18:41:32+00:00

9a708aec4b3ba8d7a410c4b06534d0d128470bf8

#20628 Enable implicit flow in Gitlab as OAuth Provider

Closes #20628, #2716, and #19470

See merge request !12384




#20628 Enable implicit flow in Gitlab as OAuth Provider

Closes #20628, #2716, and #19470

See merge request !12384






Merge branch 'dm-fix-project-path-helpers-production' into 'master'
2017-07-07T18:37:04+00:00

Douwe Maan
douwe@gitlab.com

2017-07-07T18:37:04+00:00

426271dacbb3b7462e4f7a78fa3628bbd267609a

Include new URL helpers retroactively into includers of Gitlab::Routing

Closes #34821

See merge request !12716




Include new URL helpers retroactively into includers of Gitlab::Routing

Closes #34821

See merge request !12716