summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Move locked check to a guard-clauseOswaldo Ferreira2017-10-301-1/+3
| * | | | | Add changelogmake-merge-jid-handling-less-statefulOswaldo Ferreira2017-10-291-0/+5
| * | | | | Make merge_jid handling less stateful in MergeServiceOswaldo Ferreira2017-10-276-61/+18
* | | | | | Merge branch '2518-saved-configuration-for-issue-board' into 'master'Phil Hughes2017-10-3016-93/+174
|\ \ \ \ \ \
| * | | | | | [CE backport] Saved configuration for issue boardOswaldo Ferreira2017-10-3016-93/+174
|/ / / / / /
* | | | | | Merge branch 'bvl-fix-system-hook-project-visibility' into 'master'Sean McGivern2017-10-303-1/+12
|\ \ \ \ \ \
| * | | | | | Use the correct project visibility in system hooksBob Van Landuyt2017-10-303-1/+12
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '39366-email-confirmation-fails' into 'master'Douwe Maan2017-10-304-1/+16
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | more readable changelog39366-email-confirmation-failsBrett Walker2017-10-281-1/+1
| * | | | | remove extra whitespaceBrett Walker2017-10-271-2/+2
| * | | | | use a delegate for `username` to be more future friendlyBrett Walker2017-10-273-2/+11
| * | | | | add changelog entryBrett Walker2017-10-271-0/+5
| * | | | | fix to pass static-analysisBrett Walker2017-10-241-2/+2
| * | | | | grab the correct username when confirming secondary emailBrett Walker2017-10-231-1/+2
* | | | | | Merge branch 'es-module-autosave' into 'master'Filipa Lacerda2017-10-306-27/+17
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into 'es-module-autosave'es-module-autosaveMike Greiling2017-10-24925-9504/+22685
| |\ \ \ \ \ \
| * | | | | | | remove import from main.jsMike Greiling2017-10-121-1/+0
| * | | | | | | remove global exportMike Greiling2017-10-121-2/+0
| * | | | | | | convert Autosave into pure es module and remove global exportMike Greiling2017-10-125-25/+18
* | | | | | | | Merge branch 'docs/update-create-mr' into 'master'Marcia Ramos2017-10-274-13/+10
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Update docs on creating MRsdocs/update-create-mrAchilleas Pipinellis2017-10-214-13/+10
* | | | | | | | Merge branch 'use-git-branch-merged' into 'master'Rémy Coutable2017-10-2710-9/+121
|\ \ \ \ \ \ \ \
| * | | | | | | | Fetch the merged branches at onceLin Jen-Shin (godfat)2017-10-2710-9/+121
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-update-ee_features.md-ce' into 'master'Rémy Coutable2017-10-271-0/+382
|\ \ \ \ \ \ \ \
| * | | | | | | | Merging EE doc into CEdocs-update-ee_features.md-ceLin Jen-Shin2017-10-271-0/+382
|/ / / / / / / /
* | | | | | | | Merge branch 'zj-commit-cache' into 'master'Sean McGivern2017-10-278-21/+61
|\ \ \ \ \ \ \ \
| * | | | | | | | Cache commits on the repository modelZeger-Jan van de Weg2017-10-278-21/+61
* | | | | | | | | Merge branch 'fix/avoid-using-rugged-in-wiki-preview-slug' into 'master'Sean McGivern2017-10-271-1/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Avoid using Rugged in Gitlab::Git::Wiki#preview_slugAhmad Sherif2017-10-271-1/+10
* | | | | | | | | | Merge branch 'add-user-avatar-username-link' into 'master'Fatih Acet2017-10-272-3/+65
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove repetitive karma specadd-user-avatar-username-linkClement Ho2017-10-271-4/+0