summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \
| | * | | | Update MR based on Sean's feedbackrz_fix_milestone_countEagllus2018-10-261-1/+1
| | * | | | Update code according comment recommendationsEagllus2018-10-163-7/+7
| | * | | | Fixing count on MilestonesRonald van Zon2018-10-042-1/+6
| * | | | | Merge branch '42790-improve-feedback-for-internal-git-access-checks-timeouts'...Douwe Maan2018-10-261-0/+5
| |\ \ \ \ \
| | * | | | | Adds tracing messages for slow git pushesTiago Botelho2018-10-251-0/+5
| | | |/ / / | | |/| | |
| * | | | | Automatically navigate to last board visitedBrett Walker2018-10-262-1/+37
| * | | | | Simplify query and add tests for authorization changeHeinrich Lee Yu2018-10-261-7/+3
| * | | | | Update boards issue creation authorizationHeinrich Lee Yu2018-10-261-1/+8
| * | | | | Backport SSH host key detection code to CENick Thomas2018-10-251-0/+16
| |/ / / /
* | | | | Merge branch 'fix/control-headers' into 'master'Jan Provaznik2018-10-291-0/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix content caching for non auth usersJames Lopez2018-10-231-0/+9
* | | | | Resolve "Filter discussion (tab) by comments or activity in issues and merge ...Oswaldo Ferreira2018-10-233-5/+47
| |_|/ / |/| | |
* | | | Merge branch '52559-applications-api-get-delete' into 'master'Rémy Coutable2018-10-221-6/+2
|\ \ \ \
| * | | | Remove useless braces !22296JB Vasseur2018-10-181-1/+1
| * | | | Use ApplicationsFinder !22296JB Vasseur2018-10-181-6/+2
* | | | | Frontend: Review app changesFilipa Lacerda2018-10-221-0/+3
* | | | | Merge branch 'rails5-fix-delete-blob' into 'master'Grzegorz Bizon2018-10-221-1/+1
|\ \ \ \ \
| * | | | | Rails5: fix delete blobJasper Maes2018-10-181-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'ccr/43034_issues_controller_100_queries' into 'master'Douglas Barbosa Alexandre2018-10-191-9/+8
|\ \ \ \ \
| * | | | | Add preload in issues controllerChantal Rollison2018-10-181-9/+8
* | | | | | Merge branch 'bvl-remove-forked-project-link' into 'master'Sean McGivern2018-10-191-2/+2
|\ \ \ \ \ \
| * | | | | | Remove the `ForkedProjectLink` modelBob Van Landuyt2018-10-191-2/+2
| | |_|/ / / | |/| | | |
View Lorry Controller Status