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







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/backup-restore-resume' into 'master'
2017-06-12T06:34:36+00:00

James Lopez
james@gitlab.com

2017-06-07T17:55:49+00:00

1d1a55d03380538fc3aa34afb7c2535af0416136

Fix backup task to continue on corrupt repositories

Closes #31767

See merge request !11962




Fix backup task to continue on corrupt repositories

Closes #31767

See merge request !11962






Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11793' into 9-2-stable
2017-06-08T12:20:37+00:00

Timothy Andrew
mail@timothyandrew.net

2017-06-08T12:20:37+00:00

7078dfcc095fd70713fe87305d4599953df5a41d












Merge branch 'zj-drop-fk-if-exists' into 'master'
2017-06-08T11:45:51+00:00

Yorick Peterse
yorickpeterse@gmail.com

2017-06-01T10:57:42+00:00

f9e45bac3213c3d92a9efd6f7a17e5c2c8e4cbe7

Only remove FK if it exists

See merge request !11828




Only remove FK if it exists

See merge request !11828






Merge branch 'sh-fix-lfs-from-moving-across-filesystems' into 'master'
2017-06-08T11:36:42+00:00

Kamil Trzciński
ayufan@ayufan.eu

2017-06-05T06:58:37+00:00

da1ed066cfb2328598a9765794dfa71f2f8a786b

Fix LFS timeouts when trying to save large files

Closes #33218

See merge request !11866




Fix LFS timeouts when trying to save large files

Closes #33218

See merge request !11866






Merge branch '31556-ci-coverage-paralel-rspec' into 'master'
2017-06-08T10:29:36+00:00

Kamil Trzciński
ayufan@ayufan.eu

2017-05-26T09:16:50+00:00

aa28fa4e859ff9d6eaac94e2303da4080eb9d498

Return the last coverage in trace stream

Closes #31556

See merge request !11128




Return the last coverage in trace stream

Closes #31556

See merge request !11128