delta/gitlab/gitlab-ce.git/app, branch patch-23 gitlab.com: gitlab-org/gitlab-ce.git Port _merge_params.html.haml conflict message 2017-06-13T15:39:02+00:00 Luke "Jared" Bennett lbennett@gitlab.com 2017-06-13T15:39:02+00:00 8035ea9f1274dd8cf5aa1183c79b350b6506bc4d 






Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11706' into 9-2-stable
2017-06-13T08:07:38+00:00

Timothy Andrew
mail@timothyandrew.net

2017-06-13T08:07:38+00:00

23557433b16e03beb3e8bb94b6fc26164de639d0












Fix merge conflicts on pipeline schedules
2017-06-13T06:23:16+00:00

Z.J. van de Weg
git@zjvandeweg.nl

2017-06-12T06:08:31+00:00

34655464133921e4dcfed429566271da7f05046b












Merge branch '32790-pipeline_schedules-pages-throwing-error-500' into 'master'
2017-06-13T06:23:16+00:00

Kamil Trzciński
ayufan@ayufan.eu

2017-05-29T20:46:56+00:00

16977ad3f37250dfb26a835e391688123966ec3b

Resolve "pipeline_schedules pages throwing error 500"

Closes #32790

See merge request !11706
Conflicts:
app/models/ci/pipeline_schedule.rb
app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml





Resolve "pipeline_schedules pages throwing error 500"

Closes #32790

See merge request !11706
Conflicts:
app/models/ci/pipeline_schedule.rb
app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml







Merge branch '9-2-stable' into fix-9-2-stable-conflicts-for-mr-11744
2017-06-12T19:24:49+00:00

Clement Ho
ClemMakesApps@gmail.com

2017-06-12T19:24:49+00:00

4ba257b9a81e412220b813eb1d3a66cb81bb9a99












Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11700' into 9-2-stable
2017-06-12T10:15:18+00:00

Timothy Andrew
mail@timothyandrew.net

2017-06-12T10:15:18+00:00

cd40278beeec41f900f53d1c2df6be944b018647












Merge branch 'sh-recaptcha-fix-try2' into 'master'
2017-06-12T08:31:20+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-06-12T08:24:27+00:00

09420c6d8fe4f428d0a7aaebadf15ddd4cfc36fc

Make sure reCAPTCHA configuration is loaded when spam checks are initiated

Closes #33532

See merge request !12080




Make sure reCAPTCHA configuration is loaded when spam checks are initiated

Closes #33532

See merge request !12080






Merge branch '32888-fix-error-after-missing-note-hash-fragment-in-dom' into 'master'
2017-06-12T08:03:06+00:00

Clement Ho
clemmakesapps@gmail.com

2017-05-26T14:26:24+00:00

0d554df6eb9e1c14060cf6be51d5527fe3f95baa

Fix error thrown with missing note fragment in DOM

Closes #32888

See merge request !11700
Conflicts:
spec/javascripts/merge_request_tabs_spec.js





Fix error thrown with missing note fragment in DOM

Closes #32888

See merge request !11700
Conflicts:
spec/javascripts/merge_request_tabs_spec.js







Merge branch 'counters_cache_invalidation' into 'master'

2017-06-12T07:59:12+00:00

Rémy Coutable
remy@rymai.me

2017-05-17T14:09:09+00:00

04ba6ae564e406b3bfa244f5bdb4ab80151fbfd3


Invalidate cache for issue and MR counters separately

See merge request !11394





Invalidate cache for issue and MR counters separately

See merge request !11394






Merge branch 'fix-filtered-search-issuable-empty-state-exception' into 'master'
2017-06-12T06:38:19+00:00

Phil Hughes
me@iamphill.com

2017-05-25T16:22:29+00:00

9fc3140e46b869225d103ac9714d9abc230c23a7

Fix filtered search issuable empty state exception

Closes #31455

See merge request !11347




Fix filtered search issuable empty state exception

Closes #31455

See merge request !11347