summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-095-18/+25
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-095-18/+25
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-0310-16/+73
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-0310-16/+73
| | |\ \ \ \ \ \ \
| * | | | | | | | | 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-252-0/+5
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | 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-222-0/+5
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' into fea...James Lopez2016-04-226-7/+51
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | download export now workingJames Lopez2016-04-151-0/+1
| * | | | | | | | | | some experimental UI stuff to test exportJames Lopez2016-04-141-0/+1
* | | | | | | | | | | Merge branch '2979-personal-access-tokens' into 'master' Douwe Maan2016-06-171-0/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-166-7/+36
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-144-9/+14
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-101-17/+17
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-096-9/+233
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-0317-97/+103
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Minor fixes after a final look at the diff.Timothy Andrew2016-05-111-4/+0
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-05-1111-36/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Allow revoking personal access tokens.Timothy Andrew2016-04-282-1/+9
| * | | | | | | | | | | | | | Allow creating Personal Access Tokens through the website.Timothy Andrew2016-04-281-0/+1
* | | | | | | | | | | | | | | Fix images in emails18474-missing-images-on-confirmation-emailSean McGivern2016-06-161-0/+1
| |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'network-assets' into 'master' Jacob Schatz2016-06-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Replace raphael-rails with raphael.js so it can be split from the rest of the...Connor Shea2016-06-101-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
| | |/ / / / / / / / / / | |/| | | | | | | | | |