delta/gitlab/gitlab-ce.git, branch rs-fix-lint-conflicts gitlab.com: gitlab-org/gitlab-ce.git Make lint-conflicts platform-agnostic 2019-02-26T23:31:22+00:00 Robert Speicher rspeicher@gmail.com 2019-02-26T23:31:22+00:00 1fd13a7fe3bab21df9cccfebfbd9e6389a67fdda Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51124 
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51124
Merge branch 'sh-remove-nplusone-admin-runners-tags' into 'master' 2019-02-26T21:22:15+00:00 Douglas Barbosa Alexandre dbalexandre@gmail.com 2019-02-26T21:22:15+00:00 3ae5e475293b4143ed6af530da0d2ab8d9fba56a Remove N+1 query for tags in /admin/runners page See merge request gitlab-org/gitlab-ce!25572 
Remove N+1 query for tags in /admin/runners page

See merge request gitlab-org/gitlab-ce!25572
 Remove N+1 query for tags in /admin/runners page 2019-02-26T20:44:28+00:00 Stan Hu stanhu@gmail.com 2019-02-26T19:30:43+00:00 ebb284c0dc59e2fd5bc76921609b60034f000c53 As discussed in https://github.com/mbleigh/acts-as-taggable-on/issues/91, we can avoid N+1 queries if we use `tags` instead of `tag_list`. Seen while reviewing https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19740. 
As discussed in https://github.com/mbleigh/acts-as-taggable-on/issues/91,
we can avoid N+1 queries if we use `tags` instead of `tag_list`.

Seen while reviewing
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19740.
Merge branch 'dimitrieh-master-patch-11599' into 'master' 2019-02-26T20:24:06+00:00 Robert Speicher rspeicher@gmail.com 2019-02-26T20:24:06+00:00 489d952f6302e240759092012921e421d68d1b5c update persona links issue template See merge request gitlab-org/gitlab-ce!25560 
update persona links issue template

See merge request gitlab-org/gitlab-ce!25560
 update persona links issue template 2019-02-26T20:24:05+00:00 Dimitrie Hoekstra dimitrie@gitlab.com 2019-02-26T20:24:05+00:00 b298e41e0ce7704974cd920f8114673f55cfbb7e 






Merge branch 'add-name_without_type-to-environments-json' into 'master'
2019-02-26T19:13:09+00:00

Stan Hu
stanhu@gmail.com

2019-02-26T19:13:09+00:00

3395eacb57285424b7b8d49bdf836f638af31e8c

Add name_without_type to environments.json

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




Add name_without_type to environments.json

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






Add name_without_type to environments.json
2019-02-26T19:13:09+00:00

Vladimir Shushlin
vshushlin@gitlab.com

2019-02-26T19:13:09+00:00

25c10abb80799e24e616e2bb8c0081096b201c29

It's needed to show shorter names in environments "folders"





It's needed to show shorter names in environments "folders"







Merge branch 'revert-48e6db0d' into 'master'
2019-02-26T18:45:47+00:00

Stan Hu
stanhu@gmail.com

2019-02-26T18:45:47+00:00

9812006568061f0afd8dfb146920e526877d4d9b

Revert "Merge branch '56726-fix-n+1-in-issues-and-merge-requests-api' into 'master'"

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




Revert "Merge branch '56726-fix-n+1-in-issues-and-merge-requests-api' into 'master'"

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






Merge branch '57905-etag-caching-probably-broken-since-11-5-0' into 'master'
2019-02-26T18:22:10+00:00

Robert Speicher
rspeicher@gmail.com

2019-02-26T18:22:10+00:00

9b3a0de5ed44fdcdb01bd520ad8e0ec8e3ab7ea6

Fix ETag caching not being used for AJAX requests

Closes #57905

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




Fix ETag caching not being used for AJAX requests

Closes #57905

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






Revert "Merge branch '56726-fix-n+1-in-issues-and-merge-requests-api' into 'master'"
2019-02-26T17:59:26+00:00

Heinrich Lee Yu
heinrich@gitlab.com

2019-02-26T17:59:26+00:00

f4be2d4e1bd4ac456610c72862f20ff29b3820a8

This reverts merge request !25042




This reverts merge request !25042