summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* i18n and licensing requirementsissue-template-updateMike Bartlett2017-10-311-1/+3
* Merge branch 'ph-multi-file-upload-file' into 'master'Filipa Lacerda2017-10-3113-22/+325
|\
| * Upload files through the multi-file editorPhil Hughes2017-10-3113-22/+325
|/
* Merge branch '39593-emails-on-push-are-sent-to-only-the-first-recipient-when-...Douwe Maan2017-10-313-6/+26
|\
| * Only set Auto-Submitted header once39593-emails-on-push-are-sent-to-only-the-first-recipient-when-using-aws-sesSean McGivern2017-10-303-6/+26
* | Merge branch '39616-convert-autosize-js-library-to-be-a-yarn-managed-library'...Phil Hughes2017-10-3110-257/+19
|\ \
| * | Resolve "Convert autosize.js library to be a Yarn managed library"Tim Zallmann2017-10-3110-257/+19
|/ /
* | Merge branch 'revert-2573818f' into 'master'Phil Hughes2017-10-3116-174/+93
|\ \
| * | Revert "Merge branch '2518-saved-configuration-for-issue-board' into 'master'"revert-2573818fDmitriy Zaporozhets2017-10-3016-174/+93
|/ /
* | Merge branch '39582-nestingdepth-6' into 'master'39635-convert-jquery-scrollto-js-library-to-be-a-yarn-managed-libraryAnnabel Dunstone Gray2017-10-305-21/+12
|\ \
| * | Enable NestingDepth (level 6) on scss-lintTakuya Noguchi2017-10-305-21/+12
* | | Merge branch '39583-reopen-issue-count-cache' into 'master'Rémy Coutable2017-10-303-0/+7
|\ \ \
| * | | Refresh open Issue and Merge Request project counter caches when re-openingRob Ede2017-10-303-0/+7
|/ / /
* | | Merge branch 'sh-fix-broken-redirection-relative-url-root' into 'master'Rémy Coutable2017-10-306-10/+15
|\ \ \
| * | | Fix broken Members link when relative URL root paths are usedsh-fix-broken-redirection-relative-url-rootStan Hu2017-10-276-10/+15
* | | | Merge branch '39570-performance-bar-appears-enabled-even-though-it-won-t-show...Sean McGivern2017-10-306-2/+39
|\ \ \ \
| * | | | Add .gitlab/route-map.ymlRémy Coutable2017-10-301-0/+3
| * | | | Allow to disable the Performance Bar and document the `p b` shortcut in its d...Rémy Coutable2017-10-305-2/+36
| | |_|/ | |/| |
* | | | Merge branch '38869-importer_status' into 'master'Phil Hughes2017-10-3013-476/+305
|\ \ \ \
| * | | | Fix queried element38869-importer_statusFilipa Lacerda2017-10-301-3/+3
| * | | | Merge branch 'master' into 38869-importer_statusFilipa Lacerda2017-10-30144-583/+2125
| |\ \ \ \
| * | | | | Remove issuable form from global namespaceFilipa Lacerda2017-10-264-102/+98
| * | | | | Remove issuableContext from global namespaceFilipa Lacerda2017-10-266-64/+60
| * | | | | Improves issuable testsFilipa Lacerda2017-10-263-70/+37
| * | | | | Remove old codeFilipa Lacerda2017-10-265-242/+112
* | | | | | Merge branch 'update-fe-i18n-guide' into 'master'Filipa Lacerda2017-10-303-10/+39
|\ \ \ \ \ \
| * | | | | | Update i18n in FE docs, marking, interpolationupdate-fe-i18n-guideEric Eastwood2017-10-243-10/+39
* | | | | | | Merge branch '39020-fix-js-call-stack-size-exceeded-autocomplete-group-milest...Fatih Acet2017-10-303-5/+16
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Split project and group milestone dispatcher branch39020-fix-js-call-stack-size-exceeded-autocomplete-group-milestoneLuke "Jared" Bennett2017-10-241-0/+4
| * | | | | | Prefer dispatcher glform init over global initLuke "Jared" Bennett2017-10-231-0/+1
| * | | | | | Added group milestones form specLuke "Jared" Bennett2017-10-201-3/+10
| * | | | | | Remove page-specific GLForm init and add support_autocomplete: false local to...Luke "Jared" Bennett2017-10-202-2/+1
* | | | | | | Merge branch 'pawel/bump_prometheus_gem_to_fix_read_all_values_returning_bad_...Stan Hu2017-10-302-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Update Prometheus Gem to fix problem caused by reading bad data.Pawel Chojnacki2017-10-302-3/+3
* | | | | | | | Merge branch 'fix/project-select-js-without-button' into 'master'Filipa Lacerda2017-10-302-10/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Changed project select to use it independently and not onlt as a combobuttonFrancisco Javier López2017-10-302-10/+19
|/ / / / / / / /
* | | | | | | | Merge branch 'fix-500-on-old-merge-requests' into 'master'Douwe Maan2017-10-303-3/+47
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix 500 error for old (somewhat) MRsAlexWayfer2017-10-303-3/+47
|/ / / / / / /
* | | | | | | Merge branch 'an/gitaly-v0.50.0' into 'master'Sean McGivern2017-10-301-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Upgrade Gitaly to v0.50.0an/gitaly-v0.50.0Andrew Newdigate2017-10-261-1/+1
* | | | | | | | Merge branch '39054-activerecord-statementinvalid-pg-querycanceled-error-canc...Yorick Peterse2017-10-302-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Avoid hitting statement timeout finding MR pipelines39054-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeoutSean McGivern2017-10-272-1/+6
* | | | | | | | | Merge branch '39426-update-fog-google-docs' into 'master'Achilleas Pipinellis2017-10-301-33/+90
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Split S3 and Google Cloud Storage sections in backup docAchilleas Pipinellis2017-10-301-52/+90
| * | | | | | | | | Add docs for backing up to Google Cloud Storage39426-update-fog-google-docsLin Jen-Shin2017-10-301-0/+19
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'bvl-add-circuitbreaker-metrics-docs' into 'master'Achilleas Pipinellis2017-10-301-1/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Add missing circuitbreaker metrics to prometheus documentationbvl-add-circuitbreaker-metrics-docsBob Van Landuyt2017-10-271-1/+3
* | | | | | | | | Merge branch 'zj-tag-trait-ci-build' into 'master'Grzegorz Bizon2017-10-302-9/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Ci::Build tag is a trait instead of an own factoryZeger-Jan van de Weg2017-10-302-9/+9
* | | | | | | | | | Merge branch 'make-merge-jid-handling-less-stateful' into 'master'Sean McGivern2017-10-307-60/+24
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |