summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'network-assets' into 'master' Jacob Schatz2016-06-151-0/+1
* 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-144-0/+8
| |\
| * \ Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-142-7/+12
| |\ \
| * | | Add deployment viewsKamil Trzcinski2016-06-111-1/+1
| * | | commit statusKamil Trzcinski2016-06-101-0/+2
* | | | Merge branch '18451-track-new-redis-connections' into 'master' Douwe Maan2016-06-151-0/+16
|\ \ \ \
| * | | | Track new Redis connectionsSean McGivern2016-06-141-0/+16
| | |/ / | |/| |
* | | | 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 '13948-access-request-to-projects-and-groups' into 'master' Douwe Maan2016-06-141-2/+7
|\ \ \ \
| * \ \ \ Merge branch 'master' into 13948-access-request-to-projects-and-groupsDouwe Maan2016-06-144-0/+8
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | 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 branch '18527-instrument-private-methods' into 'master' Yorick Peterse2016-06-141-5/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Instrument private/protected methodsPaco Guzman2016-06-141-5/+0
| |/ /
* | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-141-1/+1
|\ \ \ | |/ /
| * | Merge branch 'gitlab-auth-method-names' into 'master' Douwe Maan2016-06-131-1/+1
| |\ \
| | * | Improve Gitlab::Auth method namesJacob Vosmaer2016-06-101-1/+1
* | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-131-6/+11
|\ \ \ \ | |/ / /
| * | | Instrument all Banzai::ReferenceParser classesinstrument-reference-parsersYorick Peterse2016-06-131-6/+11
| | |/ | |/|
* | | Added documentation to artifacts expireKamil Trzcinski2016-06-131-1/+1
* | | Enable exceptions on ChronicDurationKamil Trzcinski2016-06-131-0/+1
* | | Move keep to ArtifactsControllerKamil Trzcinski2016-06-133-6/+6
* | | Allow to expire build artifactsKamil Trzcinski2016-06-133-0/+7
|/ /
* | Merge branch 'fix-registry-docs' into 'master' Achilleas Pipinellis2016-06-101-1/+1
|\ \
| * | Fix incorrect registry key valueAchilleas Pipinellis2016-06-101-1/+1
| |/
* | Don't require Gitlab::Redis in mail_room.yml if it's already definedRémy Coutable2016-06-101-1/+1
|/
* 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 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-085-5/+203
|\ \ \ | |/ /
| * | Merge branch 'upgrade-nokogiri' into 'master' Robert Speicher2016-06-071-0/+6
| |\ \
| | * | Add LGPLv2 to license whiltelistStan Hu2016-06-071-0/+6
| * | | Merge branch '18082-instrument-repositorycheck-singlerepositoryworker-manuall...Yorick Peterse2016-06-071-0/+7
| |\ \ \ | | |/ / | |/| |
| | * | Instrument `RepositoryCheck::SingleRepositoryWorker` manuallyAlejandro Rodríguez2016-06-071-0/+7
| * | | Merge branch 'issue_14189' into 'master' Jacob Schatz2016-06-071-0/+2
| |\ \ \ | | |/ / | |/| |
| | * | Update method and routeAlfredo Sumaran2016-06-061-1/+1
| | * | Improve Issuable.order_labels_priorityRémy Coutable2016-06-062-16/+1
| | * | Sort by label priorityThijs Wouters2016-06-061-0/+15
| | * | Prioritize labels functionalityAlfredo Sumaran2016-06-061-0/+2
| * | | Resolve feedback.Connor Shea2016-06-062-2/+2
| * | | Add Licensing information and guidelines to the Documentation.Connor Shea2016-06-061-1/+1