summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update TOC in CONRTIBUTING.md and doc/development/contributing/edstub207-#47282-phase2Rémy Coutable2018-08-095-20/+101
* Merge remote-tracking branch 'origin/master' into edstub207-#47282-phase2Rémy Coutable2018-08-092575-19215/+93100
|\
| * Merge branch 'docs-fix-conflict-bulk-editing' into 'master'Achilleas Pipinellis2018-08-092-7/+15
| |\
| | * Docs: fix ee-conflict in bulk editingMarcia Ramos2018-08-092-7/+15
| |/
| * Merge branch 'rd-fix-bug-when-authenticating-user-for-repo-with-size-check-en...Stan Hu2018-08-081-1/+1
| |\
| | * Backport of gitlab-org/gitlab-ee!6848Rubén Dávila2018-08-081-1/+1
| |/
| * Merge branch 'sh-fix-bitbucket-cloud-importer-replies' into 'master'Robert Speicher2018-08-083-10/+93
| |\
| | * Fix Bitbucket Cloud importer omitting repliesStan Hu2018-08-073-10/+93
| * | Merge branch 'ci-builds-status-index' into 'master'Yorick Peterse2018-08-083-2/+23
| |\ \
| | * | Remove redundant ci_builds (status) indexKamil Trzciński2018-08-073-2/+23
| * | | Merge branch 'frozen-string-enable-app-models-even-more' into 'master'Stan Hu2018-08-08101-2/+205
| |\ \ \
| | * | | Enable more frozen string in app/models/**/*.rbgfyoung2018-08-07101-2/+205
| * | | | Merge branch '35952-keep-project-repository-settings-open-after-submit' into ...Tim Zallmann2018-08-0814-22/+24
| |\ \ \ \
| | * | | | fix spec failuresMike Greiling2018-08-082-3/+3
| | * | | | ensure all project repository settings panels remain open after form submissionMike Greiling2018-08-0812-19/+21
| * | | | | Merge branch '35952-keep-project-settings-open-after-submit' into 'master'Tim Zallmann2018-08-084-8/+12
| |\ \ \ \ \
| | * | | | | Keep project settings sections expanded after submitting formMike Greiling2018-08-084-8/+12
| |/ / / / /
| * | | | | Merge branch '35952-keep-group-settings-open-after-submit' into 'master'Tim Zallmann2018-08-083-1/+3
| |\ \ \ \ \
| | * | | | | ensure all group settings panels remain open after form submissionMike Greiling2018-08-083-1/+3
| | |/ / / /
| * | | | | Merge branch 'ee-6470-milestone-dates-integrated-into-epics' into 'master'Sean McGivern2018-08-084-2/+52
| |\ \ \ \ \
| | * | | | | Port Milestone trait back used in EEMark Chao2018-08-071-0/+5
| | * | | | | Convert use of any_instance as it does not work with prependMark Chao2018-08-072-2/+6
| | * | | | | Add missing specMark Chao2018-08-071-0/+41
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'rename-security-products-team-label' into 'master'Marcia Ramos2018-08-081-1/+1
| |\ \ \ \ \
| | * | | | | Update CONTRIBUTING.mdFabio Busatto2018-08-071-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'bvl-11-2-update-templates-licenses' into 'master'Julius Kvedaras2018-08-0810-185/+155
| |\ \ \ \ \
| | * | | | | Update licensesBob Van Landuyt2018-08-081-163/+126
| | * | | | | Update templates for 11.2Bob Van Landuyt2018-08-089-22/+29
| * | | | | | Merge branch 'sh-fix-oauth-link-to-message' into 'master'Rémy Coutable2018-08-081-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix broken text in OAuth authorization screenStan Hu2018-08-071-1/+1
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'tz-mr-port-memory-fixes' into 'master'Mike Greiling2018-08-0818-86/+303
| |\ \ \ \ \
| | * | | | | Porting MR Vue Memory Fixes to current masterTim Zallmann2018-08-0818-86/+303
| |/ / / / /
| * | | | | Merge branch '46703-group-dashboard-line-height-is-too-tall-for-group-names' ...Fatih Acet2018-08-074-55/+80
| |\ \ \ \ \
| | * | | | | Resolve "Group dashboard > Line height is too tall for group names"Adriel Santiago2018-08-074-55/+80
| |/ / / / /
| * | | | | Merge branch '35952-keep-project-cicd-settings-open-after-submit' into 'master'Tim Zallmann2018-08-074-10/+10
| |\ \ \ \ \
| | * | | | | keep pipeline triggers settings panel open after form submissionMike Greiling2018-08-071-5/+5
| | * | | | | keep cicd runner settings panel open after form submissionMike Greiling2018-08-071-3/+3
| | * | | | | keep general pipeline settings panel open after form submissionMike Greiling2018-08-071-1/+1
| | * | | | | keep auto devops settings panel open after form submissionMike Greiling2018-08-071-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'pl-json-gon' into 'master'Tim Zallmann2018-08-073-2/+62
| |\ \ \ \ \
| | * | | | | Don't set gon variables in JSON requestsPeter Leitzen2018-08-073-2/+62
| |/ / / / /
| * | | | | Merge branch 'winh-restyle-user-status' into 'master'Mike Greiling2018-08-0712-52/+360
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Restyle status message input on profile settingsWinnie Hellmann2018-08-0712-52/+360
| * | | | | Merge branch 'enable-verbose-query-logs' into 'master'Robert Speicher2018-08-071-0/+54
| |\ \ \ \ \
| | * | | | | Enable verbose query loggingenable-verbose-query-logsKamil Trzciński2018-08-071-0/+54
| * | | | | | Merge branch '44127-board-label-edit-drop-down-is-showing-incorrect-selected-...Mike Greiling2018-08-075-6/+34
| |\ \ \ \ \ \
| | * | | | | | Resolve "Board label edit drop down is showing incorrect selected labels summ...Constance Okoghenun2018-08-075-6/+34
| |/ / / / / /
| * | | | | | Merge branch 'fix-prometheus-updated-status' into 'master'Mike Greiling2018-08-079-88/+87
| |\ \ \ \ \ \
| | * | | | | | Fix UI error whereby prometheus application status is updatedClement Ho2018-08-079-88/+87
| |/ / / / / /
| * | | | | | Merge branch 'osw-fix-missing-and-duplicated-milestones-on-list' into 'master'Sean McGivern2018-08-075-19/+57
| |\ \ \ \ \ \