summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'Douwe Maan2018-11-122-1/+18
|\ \
| * | Comment on any expanded diff line on MRsosw-comment-on-any-line-on-diffs-w-feature-flagOswaldo Ferreira2018-11-092-1/+18
| |/
* | Merge branch '34758-group-cluster-controller' into 'master'Kamil Trzciński2018-11-093-2/+45
|\ \
| * | Only project clusters has Project Namespace fieldThong Kuah2018-11-081-2/+2
| * | Adds feature flag for Group ClustersMayra Cabrera2018-11-081-0/+5
| * | Extend clusters_controller for group type clustersThong Kuah2018-11-082-0/+38
* | | Merge branch 'always-proxy-reports' into 'master'Grzegorz Bizon2018-11-092-3/+3
|\ \ \
| * | | backport: Always proxy reports downloadsalways-proxy-reportsKamil Trzciński2018-11-072-3/+3
* | | | Revert "Extract code into IssueBoardEntity"revert_issue_board_entityThong Kuah2018-11-091-5/+11
| |_|/ |/| |
* | | Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"osw-revert-comment-in-any-diff-lineOswaldo Ferreira2018-11-072-7/+1
| |/ |/|
* | Merge branch 'sh-paginate-bitbucket-server-imports' into 'master'Douglas Barbosa Alexandre2018-11-071-5/+19
|\ \ | |/ |/|
| * Paginate Bitbucket Server importer projectsStan Hu2018-11-071-5/+19
* | Merge branch 'revert-45b61a9e' into 'master'Nick Thomas2018-11-072-3/+1
|\ \
| * | Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'mas...Douwe Maan2018-11-072-3/+1
* | | Merge branch '52767-more-chaos-for-gitlab' into 'master'Sean McGivern2018-11-071-0/+56
|\ \ \ | |/ / |/| |
| * | Updated with Sean's feedbackAndrew Newdigate2018-11-051-5/+19
| * | Fixing the broken build with style fixesAndrew Newdigate2018-11-011-5/+2
| * | Add documentation, secure routes, etcAndrew Newdigate2018-11-011-0/+13
| * | Leak memory, spin cpu and kill the processAndrew Newdigate2018-11-011-0/+23
| * | Adding chaos to GitLab through chaos endpointsAndrew Newdigate2018-11-011-0/+9
* | | Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'Douwe Maan2018-11-072-1/+7
|\ \ \
| * | | Comment on any expanded diff line on MRsOswaldo Ferreira2018-11-062-1/+7
* | | | Merge branch 'ce-7472-epics-autocomplete' into 'master'Grzegorz Bizon2018-11-071-10/+8
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove instance autocomplete_service variablece-7472-epics-autocompleteJarka Košanová2018-11-061-10/+8
* | | | Merge branch 'bw-serializer-tech-debit' into 'master'Douwe Maan2018-11-061-11/+5
|\ \ \ \
| * | | | Extract code into IssueBoardEntityBrett Walker2018-11-061-11/+5
| |/ / /
* | | | Merge branch 'ce-jej/group-saml-sso-badges' into 'master'Robert Speicher2018-11-061-6/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Add MembersPreloader to fix ActiveRecord copce-jej/group-saml-sso-badgesJames Edwards-Jones2018-11-021-6/+1
* | | | Merge branch 'top_level_clusters_controller' into 'master'Kamil Trzciński2018-11-028-238/+322
|\ \ \ \
| * | | | Resolve controller sharing concernThong Kuah2018-11-014-40/+55
| * | | | Restore 403 functionality for external auth (EE)Thong Kuah2018-11-014-9/+23
| * | | | Move view and path concerns to presentersThong Kuah2018-11-012-29/+11
| * | | | Abstract out project out of ClustersControllerThong Kuah2018-11-013-22/+46
| * | | | Convert clusters to use a top-level controllerThong Kuah2018-11-013-6/+55
* | | | | Merge branch '28249-add-pagination' into 'master'Kamil Trzciński2018-11-022-2/+4
|\ \ \ \ \
| * | | | | Adds pagination to pipelines table in merge request page28249-add-paginationFilipa Lacerda2018-10-312-2/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'Achilleas Pipinellis2018-11-015-7/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix typos in comments and specsGeorge Tsiolis2018-11-015-7/+7
* | | | | Merge branch 'add-language-param-to-highlight' into 'master'Douwe Maan2018-10-302-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Make Highlight accept language paramMark Chao2018-10-302-2/+2
| |/ / /
* | | | Renaming Secret Variables in the codebaseMarcel Amirault2018-10-302-4/+4
|/ / /
* | | Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney2018-10-2911-12/+110
|\ \ \ | |/ /
| * | Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'Douwe Maan2018-10-292-1/+3
| |\ \
| | * | Update other linksblackst0ne2018-10-261-1/+1
| | * | Make new merge request URL more friendly when pushing codeblackst0ne2018-10-231-0/+2
| * | | Merge branch 'extract-ee-specific-lines-for-issues-and-mr-controllers' into '...Nick Thomas2018-10-292-4/+29
| |\ \ \
| | * | | Extract EE-specific lines from MRs controllerextract-ee-specific-lines-for-issues-and-mr-controllersSean McGivern2018-10-261-1/+13
| | * | | Extract EE-specific lines from issues controllerSean McGivern2018-10-241-3/+16
| * | | | post merge pipeline and environments statusAlessio Caiazza2018-10-291-3/+9
| * | | | Merge branch 'rz_fix_milestone_count' into 'master'Sean McGivern2018-10-292-2/+7
| |\ \ \ \
View Lorry Controller Status