summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 8.12.0-rc3v8.12.0-rc3Ruben Davila2016-09-141-1/+1
* Merge branch 'master' into 8-12-stableRuben Davila2016-09-1425-116/+280
|\
| * Merge branch 'fix-remove-merge-request-diff-unique-index' into 'master' Rémy Coutable2016-09-141-3/+17
| |\
| | * Fix migration for removing MR diff indexesYorick Peterse2016-09-141-3/+17
| * | Merge branch 'update-gitlab-git' into 'master' Douwe Maan2016-09-144-4/+36
| |\ \
| | * | Handle encoding in non-binary Blob instancesupdate-gitlab-gitYorick Peterse2016-09-142-0/+32
| | * | Update gitlab_git to 10.6.6Yorick Peterse2016-09-142-4/+4
| * | | Merge branch 'backport_to_search_helper_from_ee' into 'master' Rémy Coutable2016-09-146-60/+66
| |\ \ \
| | * | | Backport search_helper changes from EEbackport_to_search_helper_from_eeValery Sizov2016-09-146-60/+66
| | | |/ | | |/|
| * | | Merge branch '5874-add-specs-for-removing-project' into 'master' Douwe Maan2016-09-143-3/+40
| |\ \ \
| | * | | add test about flash alertubudzisz2016-09-143-3/+40
| * | | | Merge branch '21748-updating-omniauth-facebook' into 'master' Douwe Maan2016-09-142-4/+4
| |\ \ \ \
| | * | | | Update omniauth-facebook to '~>4.0.0'Katarzyna Kobierska2016-09-132-4/+4
| * | | | | Merge branch 'document-checkout-mr-from-forks-locally' into 'master' Job van der Voort2016-09-141-0/+3
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Document the fact that merge requests from private forks can be checked out l...document-checkout-mr-from-forks-locallyRémy Coutable2016-09-131-0/+3
| * | | | | Merge branch 'gitlab_shell_350' into 'master' 21249-update-labels-sidebar-live-after-slash-command-existing-issue-mr-ajaxRémy Coutable2016-09-142-2/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Update the 8.11 to 8.12 update documentation to use gitlab-shell 3.5.0Rémy Coutable2016-09-141-1/+1
| | * | | | Update GITLAB_SHELL_VERSIONDrew Blessing2016-09-141-1/+1
| |/ / / /
| * | | | Merge branch 'fix/gitlab-popen-thread-safety' into 'master' Stan Hu2016-09-142-6/+7
| |\ \ \ \
| | * | | | Fix Gitlab::Popen.popen thread-safety issuefix/gitlab-popen-thread-safetyAhmad Sherif2016-09-132-6/+7
| * | | | | Merge branch 'pushes-since-gc-redis' into 'master' 19600-artifacts-show-up-in-interface-as-expired-immediately-although-configured-as-1-month-or-4-weeksRobert Speicher2016-09-137-33/+99
| |\ \ \ \ \
| | * | | | | Move pushes_since_gc to Redispushes-since-gc-redisYorick Peterse2016-09-137-33/+99
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'workhorse-secret-trailing-newline' into 'master' Stan Hu2016-09-132-1/+6
| |\ \ \ \ \
| | * | | | | Allow trailing newline in secret base64 dataJacob Vosmaer2016-09-132-1/+6
* | | | | | | Merge branch 'master' into 8-12-stableRuben Davila2016-09-13105-2071/+3421
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'rc-use-haml_lint' into 'master' Robert Speicher2016-09-135-0/+119
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Improve .haml-lint.yml, simplify the haml_lint task and remove CHANGELOG entryrc-use-haml_lintRémy Coutable2016-09-133-10/+2
| | * | | | | Add haml_lint rake taskRémy Coutable2016-09-132-1/+9
| | * | | | | Add .haml-lint.ymlRémy Coutable2016-09-131-0/+107
| | * | | | | Use haml_lint for views lintingRémy Coutable2016-09-134-0/+12
| * | | | | | Merge branch 'feature/builds-register-change-404-to-204' into 'master' Rémy Coutable2016-09-137-20/+68
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fix a typo in documentationfeature/builds-register-change-404-to-204Tomasz Maczukin2016-09-131-1/+1
| | * | | | | Add test with inactive error use case for 'POST /ci/api/v1/builds/register.json'Tomasz Maczukin2016-09-132-0/+14
| | * | | | | Fix rubocop offencesTomasz Maczukin2016-09-131-1/+1
| | * | | | | Update API documentationTomasz Maczukin2016-09-131-0/+9
| | * | | | | Update CHANGELOGTomasz Maczukin2016-09-131-0/+1
| | * | | | | Change response for /ci/api/v1/builds/register.json from 404 to 204Tomasz Maczukin2016-09-134-20/+44
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'rs-ssh-key-title-populate' into 'master' Robert Speicher2016-09-133-0/+20
| |\ \ \ \ \
| | * | | | | Restore SSH Key title auto-population behaviorRobert Speicher2016-09-133-0/+20
| | |/ / / /
| * | | | | Merge branch 'patch-4' into 'master' Robert Speicher2016-09-132-1/+2
| |\ \ \ \ \
| | * | | | | update gitlab shell secret file also when it is emptyElan Ruusamäe2016-09-132-1/+2
| | | |/ / / | | |/| | |
| * | | | | Merge branch '20780-import-github-release-notes' into 'master' Robert Speicher2016-09-136-2/+120
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Import GitHub release notesAndrew Smith2016-09-136-2/+120
| | |/ / /
| * | | | Merge branch '21636-deleting-source-project-with-existing-fork-closes-all-rel...Rémy Coutable2016-09-138-21/+127
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Change method name to #reopenable?Katarzyna Kobierska2016-09-133-12/+13
| | * | | Improve grammarKatarzyna Kobierska2016-09-132-2/+2
| | * | | Fix not working test with executeKatarzyna Kobierska2016-09-131-4/+4
| | * | | Add CHANGELOGKatarzyna Kobierska2016-09-131-0/+1
| | * | | Improve grammarKatarzyna Kobierska2016-09-132-2/+2
| | * | | Add #can_reopen? and testsKatarzyna Kobierska2016-09-134-24/+48
View Lorry Controller Status