summaryrefslogtreecommitdiff
path: root/config/routes.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-171-0/+8
|\
| * a few changes based on MR feedbackJames Lopez2016-06-171-0/+1
| * fixed merge conflicts on UI branchJames Lopez2016-06-161-2/+12
| |\
| | * fixed merge conflictsJames Lopez2016-06-161-2/+12
| | |\
| * | | lots of refactoring again based on feedback. Changed the UI slightly and also...James Lopez2016-06-151-0/+1
| * | | adapted current services stuff to use new project import, plus fixes a few is...James Lopez2016-06-141-1/+1
| * | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-131-30/+75
| |\ \ \ | | |/ /
| | * | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-131-30/+75
| | |\ \
| | * | | updated routes for gitlab_projectsJames Lopez2016-05-171-4/+2
| * | | | updated routes for gitlab_projectJames Lopez2016-05-171-1/+1
| * | | | updated routes fileJames Lopez2016-05-131-2/+0
| * | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-031-7/+10
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-031-7/+10
| | |\ \ \
| * | | | | more refactoring, now using custom job for processing project importsJames Lopez2016-04-261-0/+1
| * | | | | refactoring, mainly UI stuff to follow other import actionsJames Lopez2016-04-261-1/+0
| * | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-04-251-0/+6
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...James Lopez2016-04-251-0/+1
| | |\ \ \ \
| | * | | | | changes to be picked by the UI branchJames Lopez2016-04-251-0/+6
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...James Lopez2016-04-221-0/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Merge branches 'feature/project-export' and 'feature/project-import' into fea...James Lopez2016-04-221-1/+9
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | download export now workingJames Lopez2016-04-151-0/+1
| * | | | | | some experimental UI stuff to test exportJames Lopez2016-04-141-0/+1
* | | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-161-2/+12
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'environments-and-deployments' into 'master' Rémy Coutable2016-06-151-0/+2
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-141-0/+1
| | |\ \ \ \ \ \
| | * | | | | | | Add deployment viewsKamil Trzcinski2016-06-111-1/+1
| | * | | | | | | commit statusKamil Trzcinski2016-06-101-0/+2
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'manual-todos-issuable-sidebar' into 'master' Stan Hu2016-06-141-0/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Uses update URL to update the status of a todoPhil Hughes2016-06-141-1/+1
| | * | | | | | | Moved todo creation over to project todos controllerPhil Hughes2016-06-141-2/+2
| | * | | | | | | Manually create todo for issuablePhil Hughes2016-06-141-0/+2
| | |/ / / / / /
| * | | | | | | Merge branch 'master' into 13948-access-request-to-projects-and-groupsDouwe Maan2016-06-141-0/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Move keep to ArtifactsControllerKamil Trzcinski2016-06-131-1/+1
| | * | | | | | Allow to expire build artifactsKamil Trzcinski2016-06-131-0/+1
| | |/ / / / /
| * | | | | | Factorize access request routes into a new :access_requestable route concernRémy Coutable2016-06-141-14/+5
| * | | | | | Factorize #request_access and #approve_access_request into a new AccessReque...Rémy Coutable2016-06-141-0/+5
| * | | | | | Add request access for groupsRémy Coutable2016-06-141-3/+10
| * | | | | | Initial implementation of user access request to projectsDavid Alexander2016-06-141-0/+2
| |/ / / / /
* | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-101-17/+17
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'fix-git-http-routing' into 'master' Douwe Maan2016-06-091-17/+17
| |\ \ \ \ \
| | * | | | | Ensure only IDs ending in .git perform git actionsfix-git-http-routingSean McGivern2016-06-091-17/+17
* | | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-091-8/+36
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '18019-fix-wiki-linking' into 'master' Rémy Coutable2016-06-091-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Hook up the updated `WikiLinkFilter` to the wiki controllers.Timothy Andrew2016-06-091-1/+1
| * | | | | | Merge branch '13840-allow-clones-from-http-url-s-without-appending-git' into ...Robert Speicher2016-06-081-0/+17
| |\ \ \ \ \ \
| | * | | | | | Allow clones from /namespace/projectSean McGivern2016-06-081-0/+17
| * | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt...Jacob Vosmaer2016-06-081-5/+7
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Update method and routeAlfredo Sumaran2016-06-061-1/+1
| | * | | | | | Improve Issuable.order_labels_priorityRémy Coutable2016-06-061-1/+1
| | * | | | | | Prioritize labels functionalityAlfredo Sumaran2016-06-061-0/+2