delta/gitlab/gitlab-ce.git/app/controllers, branch fix-diff-comment-alignment gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'zj-counting-commits' into 'master' 2018-06-19T12:45:49+00:00 Douwe Maan douwe@gitlab.com 2018-06-19T12:45:49+00:00 b0fadeee83f25fc96eac93ea1f0fb278e10ea266 Counting commits is done by Gitaly Closes gitaly#382 See merge request gitlab-org/gitlab-ce!19983 
Counting commits is done by Gitaly

Closes gitaly#382

See merge request gitlab-org/gitlab-ce!19983
 Counting commits is done by Gitaly 2018-06-19T08:37:51+00:00 Zeger-Jan van de Weg git@zjvandeweg.nl 2018-06-14T11:01:55+00:00 c24e39ab88af8fa3087efa0c7c6335e2941d8641 Closes https://gitlab.com/gitlab-org/gitaly/issues/382 
Closes https://gitlab.com/gitlab-org/gitaly/issues/382
Merge branch 'rails5-fix-46276' into 'master' 2018-06-19T08:36:57+00:00 Rémy Coutable remy@rymai.me 2018-06-19T08:36:57+00:00 719e0dc39e8b333c51a7cf504ef736eb31c085cb Rails5 fix format in uploads actions Closes #46276 See merge request gitlab-org/gitlab-ce!19907 
Rails5 fix format in uploads actions

Closes #46276

See merge request gitlab-org/gitlab-ce!19907
 Rails5 fix format in uploads actions 2018-06-18T16:21:40+00:00 Jasper Maes jaspermaes.jm@gmail.com 2018-06-15T16:07:47+00:00 4f76d953ddb44babe87c74be7e88018bd2e9aaa3 






Merge branch '47672-set_inline_content_type_for_ics' into 'master'
2018-06-18T09:35:20+00:00

Douwe Maan
douwe@gitlab.com

2018-06-18T09:35:20+00:00

a170c587a0ee2f303908c70a942ef3f163e2ddb7

Render calendar feed inline when accessed from GitLab

Closes #47672

See merge request gitlab-org/gitlab-ce!19698




Render calendar feed inline when accessed from GitLab

Closes #47672

See merge request gitlab-org/gitlab-ce!19698






Merge branch 'blackst0ne-rails5-expected-the-response-to-have-status-code-ok-but-it-was-404' into 'master'
2018-06-18T09:22:57+00:00

Rémy Coutable
remy@rymai.me

2018-06-18T09:22:57+00:00

47bfd782bdad9a021ae3241825c9538d42eee7a4

Resolve "[Rails5] expected the response to have status code :ok but it was 404"

Closes #48008

See merge request gitlab-org/gitlab-ce!19937




Resolve "[Rails5] expected the response to have status code :ok but it was 404"

Closes #48008

See merge request gitlab-org/gitlab-ce!19937






Merge branch 'blackst0ne-rails5-fix-blob-requests-format' into 'master'
2018-06-18T08:56:12+00:00

Rémy Coutable
remy@rymai.me

2018-06-18T08:56:12+00:00

b7700e0963675ce4dde85d4f3fe13e0e047a1950

[Rails5] Explicitly set request.format for blob_controller

Closes #47921

See merge request gitlab-org/gitlab-ce!19876




[Rails5] Explicitly set request.format for blob_controller

Closes #47921

See merge request gitlab-org/gitlab-ce!19876






Render calendar feed inline when accessed from GitLab
2018-06-18T08:53:52+00:00

Imre Farkas
ifarkas@gitlab.com

2018-06-12T09:35:34+00:00

6954ebbe55688633c6e4b43c28088e195191e8fc

With text/calendar as Content-Type, the browser always downloads the
content as a file (even ignoring the Content-Disposition header). We
want to display the content inline when accessed from GitLab, similarly
to the RSS feed.





With text/calendar as Content-Type, the browser always downloads the
content as a file (even ignoring the Content-Disposition header). We
want to display the content inline when accessed from GitLab, similarly
to the RSS feed.







Merge branch '47933-MR-invisible-milestone' into 'master'
2018-06-18T08:29:41+00:00

Douwe Maan
douwe@gitlab.com

2018-06-18T08:29:41+00:00

4be23eeae376ede50905b741f88b089b1669b07f

Resolve "Milestone not updating in MR sidebar after selection"

Closes #47933

See merge request gitlab-org/gitlab-ce!19870




Resolve "Milestone not updating in MR sidebar after selection"

Closes #47933

See merge request gitlab-org/gitlab-ce!19870






[Rails5] Set request.format for artifacts_controller
2018-06-16T10:46:31+00:00

blackst0ne
blackst0ne.ru@gmail.com

2018-06-16T10:46:31+00:00

c48e7dc2633f8ee8f38150b050938f43e75bd207

Since Rails 5 request.format gets set by extension if it's not explicitly
set.
That means artifacts_controller#file no longer works as expected.
This commit explicitly sets request.format for artifacts_controller#file.





Since Rails 5 request.format gets set by extension if it's not explicitly
set.
That means artifacts_controller#file no longer works as expected.
This commit explicitly sets request.format for artifacts_controller#file.