delta/gitlab/gitlab-ce.git/spec, branch patch-23 gitlab.com: gitlab-org/gitlab-ce.git 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 






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







Use wait_for_ajax instead of wait_for_requests
2017-06-12T19:26:09+00:00

Clement Ho
ClemMakesApps@gmail.com

2017-06-12T19:26:09+00:00

af97988ab51b4c5f2f4a4e6303cffdd4b56c19ef












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 remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11964' into 9-2-stable
2017-06-12T09:11:30+00:00

Timothy Andrew
mail@timothyandrew.net

2017-06-12T09:11:30+00:00

1e24ed3ae38e00a1cf898bf0109ad9502aee0796












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 '32995-issue-contents-dynamically-replaced-with-stale-version-after-saving-or-refreshing-relative-external_url-only' into 'master'
2017-06-12T08:04:21+00:00

Adam Niedzielski
adamsunday@gmail.com

2017-06-08T12:05:04+00:00

0d0d0297a1e90fc7d50deb8fa7c3f966036480f4

Fix incorrect ETag cache key when relative instance URL is used

Closes #32995

See merge request !11964





Fix incorrect ETag cache key when relative instance URL is used

Closes #32995

See merge request !11964







Fix up merge_reqest_tabs import/require conflicts
2017-06-12T08:03:06+00:00

Eric Eastwood
contact@ericeastwood.com

2017-06-08T15:07:51+00:00

0ef4d3cc569f9a04c6872146a2c293e6d457bdde

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12011





See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12011







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