summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Send notification emails when push to a merge requestYarNayar/gitlab-ce-23460-send-email-when-pushing-more-commits-to-the-merge-requestYarNayar2018-03-2615-10/+154
* Merge branch 'mark-legacy-git-access' into 'master'Sean McGivern2018-03-2346-85/+138
|\
| * Route path lookups through legacy_disk_pathmark-legacy-git-accessJacob Vosmaer2018-03-2146-85/+138
* | Merge branch 'winh-deprecate-old-modal' into 'master'Filipa Lacerda2018-03-2312-135/+158
|\ \
| * | Rename modal.vue to deprecated_modal.vuewinh-deprecate-old-modalWinnie Hellmann2018-03-2212-135/+158
* | | Merge branch 'increase-unicorn-memory-killer-limits' into 'master'Douwe Maan2018-03-232-2/+7
|\ \ \
| * | | Increase the memory limits used in the unicorn killerincrease-unicorn-memory-killer-limitsDJ Mountney2018-03-222-2/+7
* | | | Merge branch 'tc-re-add-read-only-banner' into 'master'Stan Hu2018-03-236-14/+45
|\ \ \ \ | |/ / / |/| | |
| * | | Add read-only banner to all pagesToon Claes2018-03-226-14/+45
* | | | Merge branch 'ci-pipeline-commit-lookup' into 'master'Kamil Trzciński2018-03-223-5/+10
|\ \ \ \
| * | | | Use porcelain commit lookup method on CI::CreatePipelineServiceci-pipeline-commit-lookupAlejandro Rodríguez2018-03-223-5/+10
* | | | | Merge branch 'prettier-ignore' into 'master'Mike Greiling2018-03-222-73/+57
|\ \ \ \ \
| * | | | | remove svg.config.js as it no longer existsMike Greiling2018-03-221-1/+1
| * | | | | Added prettierignore fileprettier-ignorePhil Hughes2018-03-212-73/+57
* | | | | | Merge branch 'move-concatenate-module-plugin' into 'master'Jacob Schatz2018-03-221-3/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | enable scope hoisting only in produciton (it interferes with HMR)Mike Greiling2018-03-221-3/+1
* | | | | | Merge branch '44382-ui-breakdown-for-create-merge-request' into 'master'Clement Ho2018-03-223-7/+9
|\ \ \ \ \ \
| * | | | | | Fix UI breakdown for Create merge request buttonTakuya Noguchi2018-03-233-7/+9
* | | | | | | Merge branch '43273-fix-double-scrollbar-dropdowns' into 'master'Jacob Schatz2018-03-225-4/+40
|\ \ \ \ \ \ \
| * | | | | | | Resolve "Some dropdowns have two scroll bars."Dennis Tang2018-03-225-4/+40
|/ / / / / / /
* | | | | | | Merge branch '44365-fix-module-reloading' into 'master'Robert Speicher2018-03-221-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Force Rails to not complain about reloadingLin Jen-Shin2018-03-221-1/+1
* | | | | | | Merge branch 'robots-help' into 'master'Robert Speicher2018-03-221-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Add the /help page in robots.txtrobots-helpAchilleas Pipinellis2018-03-221-0/+1
* | | | | | | | Merge branch 'bw-tweak-migration-style-guide-docs' into 'master'Robert Speicher2018-03-221-4/+12
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | make a little more obvious what operations might need downtime or enhanced mi...Brett Walker2018-03-221-4/+12
|/ / / / / / /
* | | | | | | Merge branch '44386-better-ux-for-long-name-branches' into 'master'Phil Hughes2018-03-223-72/+95
|\ \ \ \ \ \ \
| * | | | | | | UX re-design branch items with flexboxTakuya Noguchi2018-03-223-72/+95
* | | | | | | | Merge branch 'backport-4006-add-weight-indicator-to-issues-board' into 'master'Clement Ho2018-03-221-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | backport dependency import change in issue_card_inner.jsbackport-4006-add-weight-indicator-to-issues-boardDennis Tang2018-03-211-2/+2
* | | | | | | | | Merge branch 'leipert-42037-long-instance-names-group-names-covers-namespace-...Clement Ho2018-03-224-25/+40
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Prevent overflow of long instance urls during Project creationLukas Eipert2018-03-224-25/+40
|/ / / / / / / / /
* | | | | | | | | Merge branch 'latest-security-to-master-21-03-18' into 'master'Douwe Maan2018-03-2248-135/+543
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into 'latest-security-to-master-21-03-18'James Lopez2018-03-22219-1250/+2797
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixing request options to allow_local_requests with DELETE verblatest-security-to-master-21-03-18Francisco Javier López2018-03-211-1/+1
| * | | | | | | | | | Adapting mattermost to the new way of calling HTTPFrancisco Javier López2018-03-211-1/+1
| * | | | | | | | | | Merge branch 'fix/auth0-unsafe-login-10-6' into 'security-10-6'James Lopez2018-03-219-55/+134
| * | | | | | | | | | Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'Douwe Maan2018-03-2139-79/+408
* | | | | | | | | | | Merge branch '44453-performance-bar-modalbox' into 'master'Phil Hughes2018-03-223-2/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix class nameFilipa Lacerda2018-03-221-1/+1
| * | | | | | | | | | | Merge branch 'master' into '44453-performance-bar-modalbox'44453-performance-bar-modalboxPhil Hughes2018-03-22217-1250/+2795
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Prevent column with smaller width in performance barFilipa Lacerda2018-03-211-2/+1
| * | | | | | | | | | | | Merge branch 'master' into 44453-performance-bar-modalboxFilipa Lacerda2018-03-21155-331/+9448
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Adds a bigger width to the performance bar modal box and breaks the contentFilipa Lacerda2018-03-203-2/+14
* | | | | | | | | | | | | Merge branch 'docs/cache-clear-image' into 'master'Marcia Ramos2018-03-222-8/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add image for clearing the cache docsAchilleas Pipinellis2018-03-222-8/+10
* | | | | | | | | | | | | | Merge branch 'fix/remove-wiki-cache-clear' into 'master'Sean McGivern2018-03-221-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove calls to clear_cache from Git::Wikifix/remove-wiki-cache-clearAhmad Sherif2018-03-211-3/+0
* | | | | | | | | | | | | | Merge branch 'ce-version-of-ee-4295' into 'master'Achilleas Pipinellis2018-03-221-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix CI Jobs retry linkGeorge Tsiolis2018-03-211-2/+2