summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '25426-group-dashboard-ui' into 'master'Douwe Maan2017-06-082-9/+28
|\
| * Merge branch 'master' into 25426-group-dashboard-ui25426-group-dashboard-uiAlfredo Sumaran2017-06-084-21/+21
| |\
| * | Use group and project finders instead of direct ActiveRecord relationsDouwe Maan2017-06-071-10/+11
| * | Merge branch 'master' into 25426-group-dashboard-uiAlfredo Sumaran2017-06-0766-200/+281
| |\ \
| * | | Minor visual adjustmentsAlfredo Sumaran2017-06-061-1/+1
| * | | Add json support to group members leave action in controllerDmitriy Zaporozhets2017-06-061-2/+7
| * | | Merge remote-tracking branch 'origin/master' into 25426-group-dashboard-uiDmitriy Zaporozhets2017-06-0265-536/+914
| |\ \ \
| * | | | Serialize groups as json for Dashboard::GroupsControllerDmitriy Zaporozhets2017-05-041-7/+20
* | | | | Use Diff::File blob methods from diff highlighterdm-highlight-diff-file-blobDouwe Maan2017-06-081-3/+5
| |_|_|/ |/| | |
* | | | Merge branch 'allow-reporters-to-promote-group-labels' into 'master'Douwe Maan2017-06-081-3/+3
|\ \ \ \
| * | | | Allow group reporters to promote labelsallow-reporters-to-promote-group-labelsSean McGivern2017-06-081-3/+3
* | | | | Merge branch 'zj-i18n-pipeline-schedules' into 'master'Douwe Maan2017-06-081-2/+2
|\ \ \ \ \
| * | | | | Allow translation of Pipeline SchedulesZ.J. van de Weg2017-06-081-2/+2
| |/ / / /
* | | | | Merge branch 'blob-load-all-data' into 'master'Grzegorz Bizon2017-06-081-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Blob#load_all_data! doesn’t need an argumentblob-load-all-dataDouwe Maan2017-06-071-3/+3
| | |_|/ | |/| |
* | | | Translate project & repository pagesBob Van Landuyt2017-06-071-13/+13
|/ / /
* | | Sync email address from specified omniauth providerRobin Bobbitt2017-06-071-2/+2
* | | Merge branch 'expand-backlog-closed-lists-issue-boards' into 'master'Douwe Maan2017-06-071-1/+3
|\ \ \
| * | | moved creating backlog list into list servicePhil Hughes2017-06-061-2/+2
| * | | Expand/collapse close & backlog lists in issue boardsPhil Hughes2017-05-311-0/+2
* | | | Merge branch '3191-deploy-keys-update' into 'master'Rémy Coutable2017-06-072-6/+47
|\ \ \ \
| * | | | Implement ability to update deploy keysAlexander Randa2017-06-022-6/+47
* | | | | Merge branch 'feature/gb/persist-pipeline-stages' into 'master'Kamil Trzciński2017-06-071-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'feature/gb/migrate-pipeline-stages' into feature/gb/persist-pip...Grzegorz Bizon2017-06-069-91/+37
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into feature/gb/persist-pipeline-stagesGrzegorz Bizon2017-06-0532-211/+394
| |\ \ \ \ \ \
| * | | | | | | Rename pipeline methods related to legacy stagesGrzegorz Bizon2017-06-011-1/+1
* | | | | | | | Merge branch 'instrument-infra' into 'master'Grzegorz Bizon2017-06-074-17/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | Move Prometheus presentation logic to PrometheusTextPawel Chojnacki2017-06-022-5/+3
| * | | | | | | | Make login_counter instance variable instead of class one.Pawel Chojnacki2017-06-023-5/+5
| * | | | | | | | Move most of MetricsController logic to MetricsServicePawel Chojnacki2017-06-021-35/+6
| * | | | | | | | Use interpolation instead of concatenationPawel Chojnacki2017-06-021-4/+4
| * | | | | | | | move check if metrics are enabled to before actionPawel Chojnacki2017-06-021-2/+6
| * | | | | | | | Correctly handle temporary folder for testing multiproces metricsPawel Chojnacki2017-06-021-1/+1
| * | | | | | | | Use only ENV for metrics folder locationPawel Chojnacki2017-06-021-2/+6
| * | | | | | | | Bring back the tokenPawel Chojnacki2017-06-021-0/+1
| * | | | | | | | Split metrics from health controller into metrics controllerPawel Chojnacki2017-06-022-29/+41
| * | | | | | | | Prometheus settingsPawel Chojnacki2017-06-021-0/+1
| * | | | | | | | Add trailing newline to response.Kevin Lyda2017-06-022-4/+20
| * | | | | | | | Prometheus metrics first passPawel Chojnacki2017-06-021-1/+3
| * | | | | | | | Initial pass at prometheus monitoring.Kevin Lyda2017-06-021-0/+1
* | | | | | | | | Merge branch '12910-snippets-description' into 'master'Phil Hughes2017-06-073-3/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Support uploads for newly created personal snippets12910-snippets-descriptionJarka Kadlecova2017-06-072-3/+10
| * | | | | | | | | Support descriptions for snippetsJarka Kadlecova2017-05-313-2/+14
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'zj-read-registry-pat' into 'master'Kamil Trzciński2017-06-072-3/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix test failureszj-read-registry-patZ.J. van de Weg2017-06-061-1/+1
| * | | | | | | | | Create read_registry scope with JWT authZ.J. van de Weg2017-06-052-4/+6
| |/ / / / / / / /
* | | | | | | | | Add a rubocop rule to check if a method 'redirect_to' is used without explici...31840-add-a-rubocop-that-forbids-redirect_to-inside-a-controller-destroy-action-without-an-explicit-statusblackst0ne2017-06-0743-52/+73
* | | | | | | | | Limit non-administrators to adding 100 members at a time to groups and projectsNick Thomas2017-06-062-6/+8
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge branch 'pull-mirror-overhaul-ce-backport' into 'master'Douwe Maan2017-06-051-8/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | backports changed import logic from pull mirroring feature into CETiago Botelho2017-06-051-8/+1
| | |_|_|_|/ / / | |/| | | | | |
View Lorry Controller Status