summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'remove-grack-lfs' into 'master' Rémy Coutable2016-08-113-590/+0
|\
| * Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into remove-...Jacob Vosmaer2016-08-0998-786/+1746
| |\
| * | Remove obsolete codeJacob Vosmaer2016-07-223-590/+0
* | | Merge branch 'refactor-builds-creation-service' into 'master' Rémy Coutable2016-08-111-1/+1
|\ \ \
| * | | Pre-create all builds for Pipeline when a trigger is receivedKamil Trzcinski2016-08-111-1/+1
* | | | Merge branch '10772-fix-urlencoded-branchname' into 'master' Rémy Coutable2016-08-111-1/+1
|\ \ \ \
| * | | | Fix front-end for branches that happen to contain urlencoding escape characte...10772-fix-urlencoded-branchnameElliot2016-08-111-1/+1
| |/ / /
* | | | Merge branch 'file_exists_deprecated' into 'master' Rémy Coutable2016-08-116-18/+18
|\ \ \ \
| * | | | Use `File::exist?` instead of `File::exists?`bogdanvlviv2016-08-116-18/+18
| |/ / /
* | | | Merge branch '18583-implement-access-request-to-project-group-api' into 'mast...Rémy Coutable2016-08-118-229/+282
|\ \ \ \
| * | | | Improve the performance of the GET /:sources/:id/{access_requests,members} AP...Rémy Coutable2016-08-103-8/+7
| * | | | Restore back-compatibility for current members API endpointsRémy Coutable2016-08-102-8/+38
| * | | | New AccessRequests API endpoints for Group & ProjectRémy Coutable2016-08-108-229/+253
| |/ / /
* | | | Merge branch 'fix-gitaccess-scope' into 'master' Rémy Coutable2016-08-111-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fixing scope issue in GitAccess.Elliot Wiltshire2016-07-251-1/+1
* | | | Merge branch 'clean-up-project-destroy' into 'master' Robert Speicher2016-08-101-1/+1
|\ \ \ \
| * | | | Clean up project destructionclean-up-project-destroyStan Hu2016-08-101-1/+1
* | | | | Merge branch 'feature/svg-badge-template' into 'master' Douwe Maan2016-08-103-28/+111
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'master' into feature/svg-badge-templateGrzegorz Bizon2016-08-0914-114/+83
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Improve indentation in svg badge templateGrzegorz Bizon2016-08-081-1/+1
| * | | | Improve builds badge specs, remove legacy methodsGrzegorz Bizon2016-08-081-15/+6
| * | | | Merge branch 'master' into feature/svg-badge-templateGrzegorz Bizon2016-08-0876-664/+1516
| |\ \ \ \
| * | | | | Use new badge template to render build status badgeGrzegorz Bizon2016-08-081-0/+4
| * | | | | Add badge template class to use with SVG ERB templateGrzegorz Bizon2016-07-281-0/+63
| * | | | | Calculate build status only in build badge classGrzegorz Bizon2016-07-281-7/+13
| * | | | | Extract build status badge metadata to separate classGrzegorz Bizon2016-07-282-21/+40
* | | | | | Merge branch 'rs-rename-run-helper' into 'master' Douwe Maan2016-08-104-17/+15
|\ \ \ \ \ \
| * | | | | | Rename `run` task helper method to prevent conflict with StateMachineRobert Speicher2016-08-094-17/+15
* | | | | | | Merge branch 'gh-pull-requests' into 'master' Douwe Maan2016-08-094-87/+39
|\ \ \ \ \ \ \
| * | | | | | | Prefixes removed branches name with PR number when importing PR from GHgh-pull-requestsDouglas Barbosa Alexandre2016-08-082-6/+14
| * | | | | | | Remove SHA suffix for removed branches name when importing PR from GHDouglas Barbosa Alexandre2016-08-082-29/+27
| * | | | | | | Allow users to import cross-repository pull requests from GitHubDouglas Barbosa Alexandre2016-08-041-5/+1
| * | | | | | | Does not need to disable GitHub webhooks since PRs are check out locallyDouglas Barbosa Alexandre2016-08-042-54/+0
| * | | | | | | Check out locally PRs where the source/target branch were removedDouglas Barbosa Alexandre2016-08-041-7/+11
* | | | | | | | Merge branch 'brodock/gitlab-ce-feature/redis-sentinel'Douwe Maan2016-08-092-25/+116
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Small refactor in Redis class and improved specsGabriel Mazetto2016-08-061-1/+5
| * | | | | | | Small refactor and a few documentation fixesGabriel Mazetto2016-08-042-3/+3
| * | | | | | | Few minor fixes to Redis params order and commented out sentinel configGabriel Mazetto2016-08-042-7/+7
| * | | | | | | Fixed MailRoom specs and make sure it works with new resque.yml formatGabriel Mazetto2016-08-042-1/+9
| * | | | | | | Fixed specs for Gitlab::Redis and code for Redis Sentinel supportGabriel Mazetto2016-08-042-9/+10
| * | | | | | | Specs for RedisConfigGabriel Mazetto2016-08-041-1/+1
| * | | | | | | Deduplicated resque.yml loading from several placesGabriel Mazetto2016-08-042-25/+103
| |/ / / / / /
* | | | | | | Merge branch 'relative-link-filter-ref' into 'master' Robert Speicher2016-08-091-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Do not look up commit again when it is passed to RelativeLinkFilter (!5455)winniehell2016-08-021-3/+3
* | | | | | | | Merge branch 'fix/import-mr-source' into 'master' Robert Speicher2016-08-091-6/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | fix MR source project assignmentfix/import-mr-sourceJames Lopez2016-08-091-6/+8
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'avoid-constant-warnings-in-rails' into 'master' Robert Speicher2016-08-092-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Rails prefers require_dependency so that it won't require twice:avoid-constant-warnings-in-railsLin Jen-Shin2016-08-092-2/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'upgrade-grape' into 'master' Rémy Coutable2016-08-091-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Retain old behaviorConnor Shea2016-08-091-2/+4
| | |/ / / / / / | |/| | | | | |
View Lorry Controller Status