summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove extraneous tests from Issues API specrs-over-testingRobert Speicher2018-02-192-50/+2
* Merge branch '4826-github-import-wiki-fix-1' into 'master'Nick Thomas2018-02-193-2/+12
|\
| * [GH Import] Create an empty wiki if wiki import failedValery Sizov2018-02-193-2/+12
|/
* Merge branch '42274-group-request-membership-long-too' into 'master'Rémy Coutable2018-02-195-78/+114
|\
| * Resolve "group request membership mail with too long list of "To:""🙈 jacopo beschi 🙉2018-02-195-78/+114
|/
* Merge branch 'kp-fix-stacked-bar-progress-value-clipping' into 'master'Filipa Lacerda2018-02-192-1/+6
|\
| * Add changelog entrykp-fix-stacked-bar-progress-value-clippingKushal Pandya2018-02-191-0/+5
| * Fix single digit value clippingKushal Pandya2018-02-191-1/+1
|/
* Merge branch 'jej/avoid-slow-file-lock-checks' into 'master'Sean McGivern2018-02-193-5/+10
|\
| * Avoid slow File Lock checks when not usedJames Edwards-Jones2018-02-193-5/+10
* | Merge branch 'flipper-caching' into 'master'Douwe Maan2018-02-192-1/+6
|\ \
| * | Increase feature flag cache TTL to one hourYorick Peterse2018-02-192-1/+6
* | | Merge branch 'qa/gb/fix-tests-for-hidden-secret-variables' into 'master'Rémy Coutable2018-02-195-40/+34
|\ \ \ | |/ / |/| |
| * | Remove useless assignment in secret variables specsqa/gb/fix-tests-for-hidden-secret-variablesGrzegorz Bizon2018-02-161-1/+1
| * | Fix and simplify end-to-end tests for secret variablesGrzegorz Bizon2018-02-165-39/+33
* | | Merge branch '32564-fix-double-system-closing-notes' into 'master'Sean McGivern2018-02-195-25/+51
|\ \ \
| * | | Convert Gitaly commit parent IDs to array as early as possibleSean McGivern2018-02-191-10/+1
| * | | applying feedback32564-fix-double-system-closing-notesMicaël Bergeron2018-02-163-5/+6
| * | | fix specsMicaël Bergeron2018-02-162-13/+18
| * | | add changelogMicaël Bergeron2018-02-161-0/+5
| * | | stop ProcessCommitWorker from processing MR merge commitMicaël Bergeron2018-02-163-17/+41
* | | | Merge branch 'sh-guard-read-only-user-updates' into 'master'Nick Thomas2018-02-193-0/+15
|\ \ \ \
| * | | | Don't attempt to update user tracked fields if database is in read-onlysh-guard-read-only-user-updatesStan Hu2018-02-173-0/+15
* | | | | Merge branch 'docs-articles-layout-frontmatter' into 'master'Achilleas Pipinellis2018-02-1911-63/+90
|\ \ \ \ \
| * | | | | Update all articles with the new layout (meta data from the frontmatter)docs-articles-layout-frontmatterMarcia Ramos2018-02-1611-63/+90
* | | | | | Merge branch 'sh-fix-squash-rebase-utf8-data' into 'master'Sean McGivern2018-02-193-0/+18
|\ \ \ \ \ \
| * | | | | | Clarify changelog for squash encoding fixSean McGivern2018-02-191-1/+1
| * | | | | | Fix squash rebase not working when diff contained encoded datash-fix-squash-rebase-utf8-dataStan Hu2018-02-183-0/+18
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ee-webpack-backport' into 'master'Filipa Lacerda2018-02-191-2/+2
|\ \ \ \ \ \
| * | | | | | Backport webpack.config.js changes from EEee-webpack-backportPhil Hughes2018-02-161-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'sh-fix-geo-error-500-gpg-commit' into 'master'Douwe Maan2018-02-193-2/+33
|\ \ \ \ \ \
| * | | | | | Fix Error 500 when viewing a commit with a GPG signature in GeoStan Hu2018-02-193-2/+33
| | |/ / / / | |/| | | |
* | | | | | Merge branch '41949-move' into 'master'Douwe Maan2018-02-193-1/+29
|\ \ \ \ \ \
| * | | | | | Remember assignee when moving an issue41949-moveJan Provaznik2018-02-183-1/+29
| |/ / / / /
* | | | | | Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' i...Douwe Maan2018-02-198-43/+213
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Validate SSH keys through the sshkey gemrd-40552-gitlab-should-check-if-keys-are-valid-before-savingRubén Dávila2018-02-166-45/+119
| * | | | | Revert "Merge branch 'rd-43185-revert-sanitize-extra-blank-spaces-used-when-u...Rubén Dávila2018-02-156-17/+113
* | | | | | Merge branch '17500-mr-multiple-issues-oxford-comma' into 'master'Stan Hu2018-02-183-1/+20
|\ \ \ \ \ \
| * | | | | | Add changelog entryVicky Chijwani2018-02-171-0/+5
| * | | | | | Allow oxford commas and spaces before commas in MR issue closing pattern.Vicky Chijwani2018-02-172-1/+15
* | | | | | | Merge branch 'revert-215dff76' into 'master'Ian Baum2018-02-172-38/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add back database changes for Ci::Buildrevert-215dff76Stan Hu2018-02-163-2/+27
| * | | | | | Revert "Merge branch 'expired-ci-artifacts' into 'master'"Stan Hu2018-02-165-65/+6
* | | | | | | Merge branch 'dm-dont-cache-nil-root-ref' into 'master'Stan Hu2018-02-172-6/+7
|\ \ \ \ \ \ \
| * | | | | | | Don't cache a nil repository root ref to prevent caching issuesdm-dont-cache-nil-root-refDouwe Maan2018-02-162-6/+7
| |/ / / / / /
* | | | | | | Merge branch '43296-fix-specs-broken-by-hardcoding-paths' into 'master'Robert Speicher2018-02-164-5/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix order dependencies in some specsNick Thomas2018-02-164-5/+5
|/ / / / / /
* | | | | | Merge branch 'fix-more-dispatcher-stuff' into 'master'Jacob Schatz2018-02-1631-206/+54
|\ \ \ \ \ \
| * | | | | | migrate admin:users:* to static bundlefix-more-dispatcher-stuffMike Greiling2018-02-164-24/+4
| * | | | | | correct for missing break statement in dispatcher.jsMike Greiling2018-02-162-0/+1