delta/gitlab/gitlab-ce.git, 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












Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11744' into 9-2-stable
2017-06-13T06:35:29+00:00

Timothy Andrew
mail@timothyandrew.net

2017-06-13T06:35:29+00:00

670d8df5acb3b1ba84dc56953278be09bb2a1799












Ignore CVE-2017-5029 in Nokogiri
2017-06-13T06:34:28+00:00

winh
winnie@gitlab.com

2017-06-12T20:45:55+00:00

b83972f9633e865c1f7ddbfd2d03919ca7c40ae3












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







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