summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update currently supported Ruby version info.ruby-2-3-lets-not-break-thingsConnor Shea2016-08-112-1/+3
* Update gitlab ci tests to test ruby 2.1 now tooZ.J. van de Weg2016-08-111-1/+1
* Update docs to reference Ruby 2.3.1Connor Shea2016-08-111-7/+6
* Default build tests ruby 2.3.1Z.J. van de Weg2016-08-112-41/+41
* Merge branch 'remove-grack-lfs' into 'master' Rémy Coutable2016-08-1112-716/+433
|\
| * Fix typoJacob Vosmaer2016-08-111-1/+1
| * Improve validation of X-Gitlab-Lfs-Tmp headerJacob Vosmaer2016-08-102-9/+17
| * Use && and || instead of ifJacob Vosmaer2016-08-101-12/+3
| * Rename lfs_enabled helper methodJacob Vosmaer2016-08-103-3/+3
| * Remove duplicate method reintroduced by mergeJacob Vosmaer2016-08-091-4/+0
| * Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into remove-...Jacob Vosmaer2016-08-09905-17535/+25477
| |\
| * | Handle custom Git LFS content typeJacob Vosmaer2016-07-222-5/+12
| * | RubocopJacob Vosmaer2016-07-222-8/+8
| * | Better cache when modifying in-placeJacob Vosmaer2016-07-221-1/+1
| * | Remove obsolete codeJacob Vosmaer2016-07-225-594/+1
| * | Add LFS controllersJacob Vosmaer2016-07-227-116/+420
* | | Merge branch 'refactor-builds-creation-service' into 'master' Rémy Coutable2016-08-1147-966/+1042
|\ \ \
| * | | Pre-create all builds for Pipeline when a trigger is receivedKamil Trzcinski2016-08-1147-966/+1042
* | | | Merge branch '10772-fix-urlencoded-branchname' into 'master' Rémy Coutable2016-08-113-4/+18
|\ \ \ \
| * | | | Fix front-end for branches that happen to contain urlencoding escape characte...10772-fix-urlencoded-branchnameElliot2016-08-113-4/+18
* | | | | Merge branch 'file_exists_deprecated' into 'master' Rémy Coutable2016-08-118-19/+20
|\ \ \ \ \
| * | | | | Use `File::exist?` instead of `File::exists?`bogdanvlviv2016-08-118-19/+20
| |/ / / /
* | | | | Merge branch 'remove-unused-indexes' into 'master' Rémy Coutable2016-08-113-52/+117
|\ \ \ \ \
| * | | | | Remove various redundant indexesYorick Peterse2016-08-113-52/+117
| |/ / / /
* | | | | Merge branch '18583-implement-access-request-to-project-group-api' into 'mast...Rémy Coutable2016-08-1124-768/+1200
|\ \ \ \ \
| * | | | | Fix doc linting errors and remove useless API specs18583-implement-access-request-to-project-group-apiRémy Coutable2016-08-114-383/+18
| * | | | | 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-105-37/+72
| * | | | | New AccessRequests API endpoints for Group & ProjectRémy Coutable2016-08-1024-426/+1189
* | | | | | 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 '13333-consider-updating-http-parser-rb-to-0-6-0' into 'master' Rémy Coutable2016-08-117-26/+147
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Replace the tinder gem by bare HTTP requestsThomas Balthazar2016-08-117-26/+147
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'improve-oauth2-docs' into 'master' Achilleas Pipinellis2016-08-112-12/+39
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Update/Improve OAuth2 Client documentationKeith Pope2016-08-112-12/+39
* | | | | | Merge branch 'remove-ci-runner-trigram-indexes' into 'master' Rémy Coutable2016-08-113-3/+29
|\ \ \ \ \ \
| * | | | | | Remove trigram indexes for "ci_runners"remove-ci-runner-trigram-indexesYorick Peterse2016-08-103-3/+29
* | | | | | | Merge branch 'fix-branches-dropdown-initial-state' into 'master' Rémy Coutable2016-08-112-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix branches page dropdown sort initial stateClement Ho2016-08-102-1/+3
* | | | | | | | Merge branch 'convert-shortcuts-md' into 'master' Achilleas Pipinellis2016-08-112-1/+72
|\ \ \ \ \ \ \ \
| * | | | | | | | Convert shortcuts image into markdownClement Ho2016-08-032-1/+72
* | | | | | | | | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-08-111-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update container_registry.mdDavid Warburton2016-08-011-1/+3
| * | | | | | | | | Update container_registry.mdDavid Warburton2016-07-131-0/+2
* | | | | | | | | | Merge branch 'fix-thumbs-award-loading-toggle' into 'master' Fatih Acet2016-08-102-13/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix awardable button mutuality loading spinnersClement Ho2016-08-102-13/+2
* | | | | | | | | | | Merge branch 'cs-remove-inline-js' into 'master' Fatih Acet2016-08-103-6/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make sure Labels is instantiated on edit pagecs-remove-inline-jsAlfredo Sumaran2016-07-271-1/+4
| * | | | | | | | | | | Removes two simple instances of inline JavaScript.Connor Shea2016-07-263-6/+4
* | | | | | | | | | | | Merge branch 'explicit-arguments-on-diff_file_html_data' into 'master' Yorick Peterse2016-08-103-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |