delta/gitlab/gitlab-ce.git/app/controllers/projects, branch docs/trigger-script gitlab.com: gitlab-org/gitlab-ce.git Merge remote-tracking branch 'upstream/master' into 5029-support-cluster-metrics-ce 2018-03-06T15:08:11+00:00 Pawel Chojnacki pawel@chojnacki.ws 2018-03-06T15:08:11+00:00 4ff8db0d2e8371dfdae2ddef8a8595c1ef80c3d4 # Conflicts: # spec/models/clusters/applications/prometheus_spec.rb 
# Conflicts:
#	spec/models/clusters/applications/prometheus_spec.rb
Fix Gitaly n+1 in NetworkController#show 2018-03-06T13:32:48+00:00 Andrew Newdigate andrew@gitlab.com 2018-03-06T13:32:48+00:00 b5ec6097b75819626083726d1073978d11aba7e3 






Merge branch '40187-project-branch-dashboard-with-active-stale-branches' into 'master'
2018-03-06T13:14:10+00:00

Rémy Coutable
remy@rymai.me

2018-03-06T13:14:10+00:00

af84ccbd8227ac6d4d609bc8ff941ee6cad131f5

Add overview of branches and filtered views for active/stale branches

Closes #40187 et #17293

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




Add overview of branches and filtered views for active/stale branches

Closes #40187 et #17293

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






Add overview of branches and a filter for active/stale branches
2018-03-06T12:28:14+00:00

Takuya Noguchi
takninnovationresearch@gmail.com

2017-11-15T14:56:36+00:00

580d8953636266e40802fd8ea525c4908ebc8b9f












one space too far
2018-03-05T22:32:08+00:00

Pawel Chojnacki
pawel@chojnacki.ws

2018-03-05T22:32:08+00:00

bd684b70ebbc7f3dfedc4fa29485e67e13ca4731












Check if prometheus_adapter is properly called
2018-03-05T20:02:26+00:00

Pawel Chojnacki
pawel@chojnacki.ws

2018-03-05T20:02:26+00:00

b53356546dc54a6674eda8fa2d4f730a70f77206












Merge branch 'dz-use-less-deprecated-methods' into 'master'
2018-03-05T18:53:38+00:00

Douwe Maan
douwe@gitlab.com

2018-03-05T18:53:38+00:00

650d758f056237a46b5be3cae13d4f4c9e07cbb8

Reduce usage of deprecated *_with_namespace methods

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




Reduce usage of deprecated *_with_namespace methods

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






Implemente Prometheus:AdapterService
2018-03-05T18:34:59+00:00

Pawel Chojnacki
pawel@chojnacki.ws

2018-03-05T18:34:59+00:00

5ceec83a0154e513480a9bb08e252371bf7886c6












Replace deprecated name_with_namespace with full_name in app and spec
2018-03-05T14:15:26+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2018-03-05T14:15:26+00:00

8fe9995f11010749c5fb183f2d8129f547ae6d4a

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>





Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>







Fix n+1 issue by not reloading fully loaded blobs
2018-03-05T14:14:43+00:00

Alejandro Rodríguez
alejorro70@gmail.com

2018-02-28T22:22:44+00:00

0a4ee10eda01e23ddea0e6b4f80f61df3ffaabde