summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* De-duplicate two specs in spec/services/notification_service_specrs-deduplicate-notification-service-specRobert Speicher2017-07-281-37/+10
* Merge branch 'rs-fix-master' into 'master'Robert Speicher2017-07-281-3/+3
|\
| * Fix spec/features/projects/branches_specRobert Speicher2017-07-281-3/+3
* | Merge branch 'ux-guide-search-filter-sort' into 'master'Rémy Coutable2017-07-281-0/+8
|\ \
| * | Add copy about search terms to ux guidetauriedavis2017-07-281-0/+8
* | | Merge branch 'docs/jira-article' into 'master'Marcia Ramos2017-07-281-8/+13
|\ \ \
| * | | Add link to JIRA article in docsdocs/jira-articleAchilleas Pipinellis2017-07-281-8/+13
* | | | Merge branch 'docs/ci-only-except' into 'master'Marcia Ramos2017-07-281-4/+17
|\ \ \ \
| * | | | Explain all possible values of 'only' and 'except'docs/ci-only-exceptAchilleas Pipinellis2017-07-281-4/+17
| |/ / /
* | | | Merge branch 'dm-large-push-performance' into 'master'Robert Speicher2017-07-284-16/+29
|\ \ \ \
| * | | | Load and process at most 100 commits when pushing into default branchDouwe Maan2017-07-284-16/+29
* | | | | Merge branch 'fix-replying-to-commit-comment-in-mr-from-fork' into 'master'Douwe Maan2017-07-287-3/+123
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix replying to commit comments on MRs from forksSean McGivern2017-07-287-3/+123
* | | | | Merge branch 'bugfix/fix_v3_project_hooks_build_events' into 'master'Rémy Coutable2017-07-283-5/+13
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fixup POST /v3/:id/hooks and PUT /v3/:id/hooks/:hook_idRichard Clamp2017-07-283-5/+13
|/ / / /
* | | | Merge branch '35695-comment-appears-in-a-wrong-place-after-changing-diff-view...Grzegorz Bizon2017-07-283-3/+20
|\ \ \ \
| * | | | Fix diff commenting results just after changing view35695-comment-appears-in-a-wrong-place-after-changing-diff-view-to-inlineSean McGivern2017-07-283-3/+20
* | | | | Merge branch '26890-sort-branches' into 'master'Rémy Coutable2017-07-281-1/+1
|\ \ \ \ \
| * | | | | WIP: This makes the default sort order for branches 'recently updated' rather...26890-sort-branchesMatt Lee2017-01-201-1/+1
* | | | | | Merge branch 'fix-500-error-when-rendering-avatar-for-deleted-project-creator...Sean McGivern2017-07-283-1/+24
|\ \ \ \ \ \
| * | | | | | Fix 500 error when rendering avatar for deleted project creatorAthar Hameed2017-07-283-1/+24
|/ / / / / /
* | | | | | Merge branch 'merge-issuable-reopened-into-opened-state' into 'master'Sean McGivern2017-07-2821-49/+65
|\ \ \ \ \ \
| * | | | | | Merge issuable "reopened" state into "opened"merge-issuable-reopened-into-opened-stateYorick Peterse2017-07-2821-49/+65
* | | | | | | Merge branch 'techbeacon_ci' into 'master'Rémy Coutable2017-07-281-0/+1
|\ \ \ \ \ \ \
| * | | | | | | added article from techbeacon on CItechbeacon_ciChad Malchow2017-04-041-0/+1
* | | | | | | | Merge branch 'patch-24' into 'master'Rémy Coutable2017-07-281-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Update gitlab_flow.md, Teatro seems to be completely dead, see also https://f...bart2017-07-281-1/+0
* | | | | | | | | Merge branch 'log_webhook_timeout' into 'master'Rémy Coutable2017-07-282-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Log web hook execution timeout eventsAlex Lossent2017-07-272-2/+2
* | | | | | | | | | Merge branch 'docs-metrics-haproxy' into 'master'Rémy Coutable2017-07-282-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Docs: fix HAProxy name and exporter's linkDênis Volpato Martins2017-07-252-5/+5
* | | | | | | | | | | Merge branch 'dm-api-csrf-token-verification' into 'master'Sean McGivern2017-07-281-0/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add log messages to clarify log messages about API CSRF token verification fa...dm-api-csrf-token-verificationDouwe Maan2017-07-281-0/+8
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'remove-default-access-levels' into 'master'Rémy Coutable2017-07-282-15/+71
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Make access level more compatible with EELin Jen-Shin2017-07-282-15/+71
* | | | | | | | | | Merge branch '35691-images-in-wiki-display-have-wrong-size' into 'master'Filipa Lacerda2017-07-281-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | none is not a CSS Value for sizes ;-)Tim Zallmann2017-07-281-3/+3
* | | | | | | | | | | Update CHANGELOG.md for 9.4.2James Edwards-Jones2017-07-2812-45/+15
* | | | | | | | | | | Merge branch 'help-page-breadcrumb-title-fix' into 'master'Filipa Lacerda2017-07-282-0/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed the breadcrumb title for help pageshelp-page-breadcrumb-title-fixPhil Hughes2017-07-282-0/+5
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ph-inline-js' into 'master'Tim Zallmann2017-07-2823-112/+135
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fixed form action not submitting the correct URLph-inline-jsPhil Hughes2017-07-281-1/+6
| * | | | | | | | | | | Merge branch 'master' into ph-inline-jsPhil Hughes2017-07-28971-1908/+4062
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ph-inline-jsPhil Hughes2017-07-27243-1206/+4245
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | fixed label subscription & merge conflictsPhil Hughes2017-07-263-3/+14
| * | | | | | | | | | | | moved some more inline codePhil Hughes2017-07-256-15/+20
| * | | | | | | | | | | | moved some code into new filesPhil Hughes2017-07-256-41/+52
| * | | | | | | | | | | | Removed inline JS in shared HAML filesPhil Hughes2017-07-2516-101/+90
* | | | | | | | | | | | | Merge branch 'feature/sm/35282-ci_pipeline_variables-2' into 'master'Kamil Trzciński2017-07-2817-27/+249
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Expand pipeline_trigger_service_spec by godfat requestfeature/sm/35282-ci_pipeline_variables-2Shinya Maeda2017-07-281-16/+28