summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'patch-28' into 'master'44564-error-500-while-attempting-to-resolve-conflicts-due-to-utf-8-conversion-errorSean McGivern2018-03-231-1/+1
|\
| * Update the menu information to access "Schedules" pageBertrand Jamin2018-03-231-1/+1
* | Merge branch 'tz-prettier-print-width-100' into 'master'Clement Ho2018-03-231-0/+1
|\ \
| * | Update Prettier Print WIdth to 100Tim Zallmann2018-03-231-0/+1
* | | Merge branch '43525-limit-number-of-failed-logins-using-ldap' into 'master'Douwe Maan2018-03-233-43/+96
|\ \ \
| * | | Writes specs43525-limit-number-of-failed-logins-using-ldapTiago Botelho2018-03-223-45/+88
| * | | Tracks the number of failed attempts made by a user trying to authenticate wi...Tiago Botelho2018-03-221-0/+10
* | | | Merge branch 'patch-1' into 'master'Sean McGivern2018-03-231-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Reques Chinese Traditional proofreader permissions.d.weizhe@gmail.com2018-03-151-0/+1
* | | | Merge branch 'storage-dropdown' into 'master'Sean McGivern2018-03-231-1/+1
|\ \ \ \
| * | | | Show gitaly address instead of disk pathJacob Vosmaer2018-03-231-1/+1
* | | | | Merge branch 'jprovazn-issueref' into 'master'Douwe Maan2018-03-233-1/+23
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix issuable state indicatorJan Provaznik2018-03-233-1/+23
* | | | | Merge branch '43771-improve-avatar-error-message' into 'master'Sean McGivern2018-03-236-10/+9
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Change avatar error message to include allowed file formatsFabian Schneider2018-03-226-10/+9
* | | | | Merge branch '43482-enabling-auto-devops-on-an-empty-project-gives-you-wrong-...Kamil Trzciński2018-03-233-7/+43
|\ \ \ \ \
| * | | | | Use actual repo instead of stubbing method43482-enabling-auto-devops-on-an-empty-project-gives-you-wrong-informationMatija Čupić2018-03-221-7/+1
| * | | | | Refactor AutoDevops pipeline logic into methodMatija Čupić2018-03-221-8/+13
| * | | | | Add CHANGELOGMatija Čupić2018-03-111-0/+5
| * | | | | Add empty repo check before running AutoDevOps pipelineMatija Čupić2018-03-112-5/+37
| |/ / / /
* | | | | 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
|\ \ \ \ \ \ \ \ \ \ \