summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update jquery.waitforimages & use npm versionnpm-waitforimagesPhil Hughes2018-02-087-149/+6
* 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
* | | | | | | | Merge branch 'bvl-fix-concurrent-fork-network-migrations' into 'master'42861-include-external-files-in-gitlab-ci-yml-move-from-eep-to-ceYorick Peterse2018-02-085-34/+30
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | [docs] Info rescheduling background migrationsbvl-fix-concurrent-fork-network-migrationsBob Van Landuyt2018-02-081-0/+12
| * | | | | | | Handle uniqueness on fork_network_member creationBob Van Landuyt2018-02-081-4/+11
| * | | | | | | Early migrations populating fork-networks: no-opBob Van Landuyt2018-02-083-30/+7
* | | | | | | | Merge branch 'sh-fix-rebase-in-progress-nplus-one' into 'master'Marin Jankovski2018-02-081-3/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Memoize MergeRequest#rebase_in_progress? to prevent N+1 queries in Gitalysh-fix-rebase-in-progress-nplus-oneStan Hu2018-02-081-3/+5
* | | | | | | | | Merge branch 'zj-namespace-gitaly-opt-out' into 'master'Sean McGivern2018-02-081-4/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Move Namespace to Gitaly using OPT-OUTZeger-Jan van de Weg2017-12-131-4/+8
* | | | | | | | | Merge branch 'zj-n-1-root-show' into 'master'Douwe Maan2018-02-081-4/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Don't allow N +1 calls from Root#showZeger-Jan van de Weg2018-02-071-4/+1
* | | | | | | | | Merge branch 'sh-nfs-ip-docs' into 'master'Achilleas Pipinellis2018-02-081-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix sample fstab file in GitLab HA docssh-nfs-ip-docsStan Hu2018-02-071-5/+5
* | | | | | | | | | Merge branch 'snake-case' into 'master'Filipa Lacerda2018-02-081-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update style_guide_scss.mdSimon Knox2018-02-081-0/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '40994-expose-features-as-ci-cd-variable' into 'master'Kamil Trzciński2018-02-084-0/+11
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Expose GITLAB_FEATURES as CI/CD variable (fixes #40994)40994-expose-features-as-ci-cd-variableDylan Griffith2018-02-074-0/+11
* | | | | | | | | | Merge branch 'internationalize-charts-page' into 'master'2018-02-08-ce-cut-off-to-10-5-stableClement Ho2018-02-083-13/+50
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Annotate charts page for internationalizationShah El-Rahman2018-02-083-13/+50
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '41301-new-design-for-user-deletion-confirmation-in-admin-area' ...42867-rsa-secureid-app-doesn-t-understand-gitlab-qr-codeClement Ho2018-02-089-17/+288
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Resolve "New design for user deletion confirmation in admin area"Shah El-Rahman2018-02-089-17/+288
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '41297-new-design-for-cancel-stop-pipeline-confirmation' into 'm...Clement Ho2018-02-089-25/+167
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add modal for stopping and retrying pipelines41297-new-design-for-cancel-stop-pipeline-confirmationShah El-Rahman2018-02-079-25/+167
* | | | | | | | | | | Merge branch 'internationalize-graph-page' into 'master'Clement Ho2018-02-084-5/+19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Annotate graph page for internationalizationShah El-Rahman2018-02-084-5/+19
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '41300-new-design-for-project-deletion-confirmation' into 'master'Clement Ho2018-02-084-1/+175
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Resolve "New design for project deletion confirmation"Shah El-Rahman2018-02-084-1/+175
|/ / / / / / / / / / /