summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ignore temporary table in schemaMichael Kozono2017-12-112-0/+7
* Merge branch 'docs/improve-limit-conflicts-with-ee' into 'master'Robert Speicher2017-12-087-355/+110
|\
| * Add "Guidelines for implementing Enterprise Edition features" in CE developme...docs/improve-limit-conflicts-with-eeRémy Coutable2017-12-061-0/+1
| * Address Robert's and Axil's feedbackRémy Coutable2017-12-064-15/+17
| * Move the "Limit conflicts with EE" doc to "Automatic CE-> EE merge"Rémy Coutable2017-12-056-353/+105
* | Merge branch '35385-allow-git-pull-push-on-project-redirects' into 'master'Douwe Maan2017-12-0820-52/+510
|\ \
| * | Allow git pull/push on project redirectsMayra Cabrera2017-12-0820-52/+510
|/ /
* | Merge branch '38032-deploy-markers-should-be-more-verbose' into 'master'Mike Greiling2017-12-0812-38/+199
|\ \
| * | Reduce the size of the deploy flag when there's no tag available38032-deploy-markers-should-be-more-verboseJose Ivan Vargas2017-12-071-3/+11
| * | Changed the deploy markers on the prometheus dashboard to be more verboseJose Ivan Vargas2017-12-0712-38/+191
* | | Merge branch '40031-include-assset_sync-gem' into 'master'Douwe Maan2017-12-084-0/+45
|\ \ \
| * | | Resolve "Include asset_sync gem"Ian Baum2017-12-084-0/+45
|/ / /
* | | Merge branch 'fix-event-target-author-preloading' into 'master'Douwe Maan2017-12-082-1/+6
|\ \ \
| * | | Fix N+1 query when displaying eventsfix-event-target-author-preloadingYorick Peterse2017-12-082-1/+6
* | | | Merge branch 'jprovazn-ignore-anchors' into 'master'Sean McGivern2017-12-084-0/+23
|\ \ \ \
| * | | | Use prefix for TableOfContents filter hrefsJan Provaznik2017-12-084-0/+23
* | | | | Merge branch 'fix/gb/fix-pipeline-build-chain-tag-evaluation' into 'master'Douwe Maan2017-12-0816-111/+367
|\ \ \ \ \
| * | | | | Fix RubocopKamil Trzcinski2017-12-081-1/+1
| * | | | | Add Chain::Command specsfix/gb/fix-pipeline-build-chain-tag-evaluationKamil Trzcinski2017-12-084-10/+190
| * | | | | Fix a bug of before_sha being inproperly evaluated to `checkout_sha`Kamil Trzcinski2017-12-081-5/+1
| * | | | | Implement and use Gitlab::Ci::Pipeline::Chain::CommandKamil Trzcinski2017-12-0814-127/+146
| * | | | | Fix invalid pipeline build chain tag evaluationGrzegorz Bizon2017-12-084-8/+69
* | | | | | Merge branch '29483-no-feedback-when-checking-on-checklist-if-potential-spam-...Sean McGivern2017-12-0816-68/+363
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Resolve "No feedback when checking on checklist if potential spam was detected"Luke Bennett2017-12-0816-68/+363
|/ / / / /
* | | | | Merge branch 'docs/add-why-do-i-get-signed-out-authentication-section' into '...Sean McGivern2017-12-083-1/+31
|\ \ \ \ \
| * | | | | Add docs explaining why you get signed out with "Remember me"docs/add-why-do-i-get-signed-out-authentication-sectionEric Eastwood2017-12-083-1/+31
* | | | | | Merge branch 'bvl-circuitbreaker-process' into 'master'Douwe Maan2017-12-0845-362/+983
|\ \ \ \ \ \
| * | | | | | Move the circuitbreaker check out in a separate processbvl-circuitbreaker-processBob Van Landuyt2017-12-0845-362/+983
|/ / / / / /
* | | | | | Merge branch '40754-fix-flash-usage-with-personal-access-token' into 'master'Grzegorz Bizon2017-12-084-5/+52
|\ \ \ \ \ \
| * | | | | | Fix new personal access token showing up in a flash message40754-fix-flash-usage-with-personal-access-tokenEric Eastwood2017-12-074-5/+52
* | | | | | | Merge branch 'jprovazn-testfix2' into 'master'Stan Hu2017-12-081-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Clean test path between merge request handler testsjprovazn-testfix2Jan Provaznik2017-12-071-5/+5
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'gitaly-795-migrate-repository-fsck' into 'master'Robert Speicher2017-12-082-2/+27
|\ \ \ \ \ \ \
| * | | | | | | Migrate Git::Repository#fsck to GitalyKim Carlbäcker2017-12-082-2/+27
|/ / / / / / /
* | | | | | | Merge branch '40825-use-relative-path-urls' into 'master'Robert Speicher2017-12-0711-14/+31
|\ \ \ \ \ \ \
| * | | | | | | Use relative _path helper URLs in the GitLab UI40825-use-relative-path-urlsEric Eastwood2017-12-0711-14/+31
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '40555-replace-absolute-urls-with-related-branches-to-avoid-host...Jacob Schatz2017-12-072-2/+8
|\ \ \ \ \ \ \
| * | | | | | | Replace absolute URLs on related branches/MRs with relative url to avoid host...40555-replace-absolute-urls-with-related-branches-to-avoid-hostnameEric Eastwood2017-12-042-2/+8
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'acet-fix-branches-list-on-cherry-pick-modal-after-merge' into '...Jacob Schatz2017-12-072-0/+14
|\ \ \ \ \ \ \
| * | | | | | | Fix loading branches list on cherry pick modal after merge.acet-fix-branches-list-on-cherry-pick-modal-after-mergeFatih Acet2017-12-042-0/+14
* | | | | | | | Merge branch 'use-us-english' into 'master'Jacob Schatz2017-12-071-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Add documentation about using US-EnglishClement Ho2017-12-071-0/+2
|/ / / / / / / /
* | | | | | | | Merge branch 'fix-transient-datefix-spec' into 'master'Jacob Schatz2017-12-071-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix transient error in pikadayToStringfix-transient-datefix-specClement Ho2017-12-051-1/+1
* | | | | | | | | Merge branch 'fix_39233' into 'master'Sean McGivern2017-12-073-1/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix #39233 - 500 in merge requestMartin Nowak2017-12-073-1/+10
* | | | | | | | | | Merge branch 'feature/sm/34834-missing-dependency-should-fail-job-2' into 'ma...Kamil Trzciński2017-12-0710-5/+272
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Clean up docs for dependencies validationfeature/sm/34834-missing-dependency-should-fail-job-2Achilleas Pipinellis2017-12-073-16/+63
| * | | | | | | | | Test for both ci_disable_validates_dependencies true/falseShinya Maeda2017-12-082-78/+129
| * | | | | | | | | Change feature flag to ci_disable_validates_dependencies to enable it as defaultShinya Maeda2017-12-073-3/+3