summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update ruby 2.3.1ruby-2-3-1Z.J. van de Weg2016-08-121-2/+2
* Merge branch 'update-performance-guide' into 'master' Achilleas Pipinellis2016-08-121-5/+4
|\
| * Corrected links/usernames in performance guideupdate-performance-guideYorick Peterse2016-08-111-5/+4
* | Merge branch 'remove-unused-spam-report' into 'master' Robert Speicher2016-08-111-5/+0
|\ \
| * | Remove unused SpamReport model; this was renamed to SpamLogremove-unused-spam-reportStan Hu2016-08-111-5/+0
* | | Merge branch '19725-new-pipeline-auto-completion' into 'master' Robert Speicher2016-08-113-4/+30
|\ \ \
| * | | Update CHANGELOGula budziszewska2016-08-111-1/+0
| * | | render only commit titleubudzisz2016-08-113-3/+30
|/ / /
* | | Merge branch 'gitlab-shell-3-3-3' into 'master' Douwe Maan2016-08-112-2/+2
|\ \ \
| * | | Update gitlab-shell to v3.3.3Douwe Maan2016-08-112-2/+2
* | | | Merge branch 'rails-4-2-7-1' into 'master' Robert Speicher2016-08-112-32/+32
|\ \ \ \ | |/ / / |/| | |
| * | | Upgrade Rails to 4.2.7.1 for security fixes.Connor Shea2016-08-112-32/+32
|/ / /
* | | Merge branch 'feature/merge-request-link-after-push' into 'master' Douwe Maan2016-08-1111-23/+254
|\ \ \
| * | | api for generating new merge requestScott Le2016-08-1111-23/+254
* | | | Merge branch 'ruby-2-3-lets-not-break-things' into 'master' Douwe Maan2016-08-114-48/+48
|\ \ \ \
| * | | | Target 8.11 for CHANGELOG entry Ruby 2.3Z.J. van de Weg2016-08-111-2/+1
| * | | | Update currently supported Ruby version info.Connor 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-schedules' into 'master' Sid Sijbrandij2016-08-111-5/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | editremove-schedulesErnst van Nierop2016-04-131-1/+1
| * | | | remove need for schedulesernstvn2016-04-121-5/+9
* | | | | Merge branch '20614-show-member-roles-to-all-users' into 'master' Robert Speicher2016-08-116-84/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Show member roles to all users on members page20614-show-member-roles-to-all-usersDouwe Maan2016-08-116-84/+2
* | | | | Merge branch '15000-rename-markdown-preview' into 'master' Robert Speicher2016-08-118-14/+15
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Rename `markdown_preview` routes to `preview_markdown`Christopher Bartz2016-08-118-14/+15
* | | | | 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