summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'fl-mr-widget-missing-branch' into 'master'Phil Hughes2018-02-094-69/+72
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove not needed default statementFilipa Lacerda2018-02-091-1/+0
| * | | | | | | | | | Moves missing branch into a vue filefl-mr-widget-missing-branchFilipa Lacerda2018-02-084-69/+73
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'axios-post-importer' into 'master'Filipa Lacerda2018-02-0913-176/+328
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Replace $.post in importer status with axiosClement Ho2018-02-0913-176/+328
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs/update-vue-naming-guidelines' into 'master'Phil Hughes2018-02-092-5/+10
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Update vue component naming guidelinesGeorge Tsiolis2018-02-082-5/+10
| |/ / / / / / /
* | | | | | | | Merge branch 'sh-ldap-set-first-password-qa' into 'master'Grzegorz Bizon2018-02-091-9/+16
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Set initial password for instance in LDAP QA testsh-ldap-set-first-password-qaStan Hu2018-02-081-9/+16
* | | | | | | | Merge branch '42896-hashed-storage-beta-docs' into 'master'Stan Hu2018-02-091-39/+52
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Backport EE changes to some hashed storage documentation to CENick Thomas2018-02-081-39/+52
| |/ / / / / /
* | | | | | | Merge branch 'fix/remove-n-plus-one-from-branches-filter' into 'master'Robert Speicher2018-02-081-11/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove allow_n_plus_1 from Git::Repository#branches_filterAhmad Sherif2018-02-081-11/+8
|/ / / / / /
* | | | | | Merge branch '40744-hashed-storage-specs' into 'master'Sean McGivern2018-02-0836-254/+349
|\ \ \ \ \ \
| * | | | | | Use hashed storage in the specs40744-hashed-storage-specsNick Thomas2018-02-0736-254/+349
* | | | | | | Merge branch '4852-migration-specs-fail-locally-if-no-geo-db-is-configured' i...Nick Thomas2018-02-081-2/+7
|\ \ \ \ \ \ \
| * | | | | | | Make resetting column information overridable in EESean McGivern2018-02-081-2/+7
* | | | | | | | Merge branch 'bump-gitlab-shell-version-to-6-0-3' into 'master'Marin Jankovski2018-02-081-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Bumps Gitlab Shell version to 6.0.3bump-gitlab-shell-version-to-6-0-3Tiago Botelho2018-02-081-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'feature/26598-clear-button-ci-lint' into 'master'Clement Ho2018-02-084-8/+39
|\ \ \ \ \ \ \
| * | | | | | | Added 'clear' button to ci lint editorLin Jen-Shin2018-02-084-8/+39
|/ / / / / / /
* | | | | | | Merge branch 'docs-for-commits-linking-to-mrs' into 'master'Sean McGivern2018-02-081-1/+14
|\ \ \ \ \ \ \
| * | | | | | | Add docs for MR link in commit pagedocs-for-commits-linking-to-mrsSean McGivern2018-02-081-1/+14
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '180-qa-fix-api-spec' into 'master'Grzegorz Bizon2018-02-081-2/+2
|\ \ \ \ \ \ \
| * | | | | | | don't check against a hardcoded user name180-qa-fix-api-specBrett Walker2018-02-081-2/+2
* | | | | | | | Merge branch 'issues-in-subgroups' into 'master'Sean McGivern2018-02-082-6/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Issues and merge requests in subgroups docsVictor Wu 🌴Vacation Feb 10-18🌴2018-02-082-6/+4
|/ / / / / / /
* | | | | | | Merge branch 'update-docs-labels-ce' into 'master'Marcia Ramos2018-02-0825-119/+70
|\ \ \ \ \ \ \
| * | | | | | | Update docs labels CEVictor Wu 🌴Vacation Feb 10-18🌴2018-02-0825-119/+70
* | | | | | | | Merge branch '10-5-update-dependencies-license-list' into 'master'Marin Jankovski2018-02-081-9/+1259
|\ \ \ \ \ \ \ \
| * | | | | | | | 10.5 Update the dependencies license list10-5-update-dependencies-license-listMark Fletcher2018-02-081-9/+1259
* | | | | | | | | Merge branch 'new-list-dropdown-ajax-refactor' into 'master'Filipa Lacerda2018-02-081-3/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replaced $.get with axois.getnew-list-dropdown-ajax-refactorConstance Okoghenun2018-02-081-3/+4
* | | | | | | | | | Merge branch 'docs-pages-https' into 'master'Achilleas Pipinellis2018-02-082-5/+29
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | wording Marcia Ramos2018-02-081-1/+1
| * | | | | | | | | | un-index old blog post from doc, add the important content from the post to t...docs-pages-httpsMarcia Ramos2018-01-312-5/+29
* | | | | | | | | | | Merge branch 'feature/oidc-groups-claim' into 'master'Douwe Maan2018-02-087-7/+57
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add groups to OpenID Connect claimsHassan Zamani2018-02-087-7/+57
* | | | | | | | | | | | Merge branch 'mr-show-dispatcher-refactor' into 'master'Jacob Schatz2018-02-084-33/+35
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Refactored merge_requests/show path in dispatcher.jsConstance Okoghenun2018-02-084-33/+35
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch '10-5-update-templates' into 'master'Marin Jankovski2018-02-088-6/+42
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 10.5 Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates10-5-update-templatesMark Fletcher2018-02-088-6/+42
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '10-5-ce-update-guides' into 'master'Marin Jankovski2018-02-081-0/+361
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Create update guide for 10.510-5-ce-update-guidesMark Fletcher2018-02-081-0/+361
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch '10-5-update-source-install-guide' into 'master'Marin Jankovski2018-02-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Update 10.5 source install guideMark Fletcher2018-02-081-2/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'osw-wip-commit-docs' into 'master'Achilleas Pipinellis2018-02-081-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add blurb about changing MRs to WIP through commitsosw-wip-commit-docsOswaldo Ferreira2018-02-041-1/+2
* | | | | | | | | | | | Merge branch 'bvl-pot-merge-conflicts-docs' into 'master'Achilleas Pipinellis2018-02-081-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add a note about merge conflicts in `gitlab.pot`bvl-pot-merge-conflicts-docsBob Van Landuyt2018-02-071-0/+3