Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge branch 'mr-show-dispatcher-refactor' into 'master' | Jacob Schatz | 2018-02-08 | 4 | -33/+35 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Refactored merge_requests/show path in dispatcher.js | Constance Okoghenun | 2018-02-08 | 4 | -33/+35 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch '10-5-update-templates' into 'master' | Marin Jankovski | 2018-02-08 | 8 | -6/+42 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 10.5 Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates10-5-update-templates | Mark Fletcher | 2018-02-08 | 8 | -6/+42 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch '10-5-ce-update-guides' into 'master' | Marin Jankovski | 2018-02-08 | 1 | -0/+361 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Create update guide for 10.510-5-ce-update-guides | Mark Fletcher | 2018-02-08 | 1 | -0/+361 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch '10-5-update-source-install-guide' into 'master' | Marin Jankovski | 2018-02-08 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | ||||||
| * | | | | | | | | Update 10.5 source install guide | Mark Fletcher | 2018-02-08 | 1 | -2/+2 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'osw-wip-commit-docs' into 'master' | Achilleas Pipinellis | 2018-02-08 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add blurb about changing MRs to WIP through commitsosw-wip-commit-docs | Oswaldo Ferreira | 2018-02-04 | 1 | -1/+2 | |
* | | | | | | | | | Merge branch 'bvl-pot-merge-conflicts-docs' into 'master' | Achilleas Pipinellis | 2018-02-08 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add a note about merge conflicts in `gitlab.pot`bvl-pot-merge-conflicts-docs | Bob Van Landuyt | 2018-02-07 | 1 | -0/+3 | |
* | | | | | | | | | | Merge branch 'bvl-fix-concurrent-fork-network-migrations' into 'master'42861-include-external-files-in-gitlab-ci-yml-move-from-eep-to-ce | Yorick Peterse | 2018-02-08 | 5 | -34/+30 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | [docs] Info rescheduling background migrationsbvl-fix-concurrent-fork-network-migrations | Bob Van Landuyt | 2018-02-08 | 1 | -0/+12 | |
| * | | | | | | | | | Handle uniqueness on fork_network_member creation | Bob Van Landuyt | 2018-02-08 | 1 | -4/+11 | |
| * | | | | | | | | | Early migrations populating fork-networks: no-op | Bob Van Landuyt | 2018-02-08 | 3 | -30/+7 | |
* | | | | | | | | | | Merge branch 'sh-fix-rebase-in-progress-nplus-one' into 'master' | Marin Jankovski | 2018-02-08 | 1 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Memoize MergeRequest#rebase_in_progress? to prevent N+1 queries in Gitalysh-fix-rebase-in-progress-nplus-one | Stan Hu | 2018-02-08 | 1 | -3/+5 | |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'zj-namespace-gitaly-opt-out' into 'master' | Sean McGivern | 2018-02-08 | 1 | -4/+8 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Move Namespace to Gitaly using OPT-OUT | Zeger-Jan van de Weg | 2017-12-13 | 1 | -4/+8 | |
* | | | | | | | | | | Merge branch 'zj-n-1-root-show' into 'master' | Douwe Maan | 2018-02-08 | 1 | -4/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Don't allow N +1 calls from Root#show | Zeger-Jan van de Weg | 2018-02-07 | 1 | -4/+1 | |
* | | | | | | | | | | Merge branch 'sh-nfs-ip-docs' into 'master' | Achilleas Pipinellis | 2018-02-08 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix sample fstab file in GitLab HA docssh-nfs-ip-docs | Stan Hu | 2018-02-07 | 1 | -5/+5 | |
* | | | | | | | | | | | Merge branch 'snake-case' into 'master' | Filipa Lacerda | 2018-02-08 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Update style_guide_scss.md | Simon Knox | 2018-02-08 | 1 | -0/+2 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch '40994-expose-features-as-ci-cd-variable' into 'master' | Kamil TrzciĆski | 2018-02-08 | 4 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Expose GITLAB_FEATURES as CI/CD variable (fixes #40994)40994-expose-features-as-ci-cd-variable | Dylan Griffith | 2018-02-07 | 4 | -0/+11 | |
* | | | | | | | | | | | Merge branch 'internationalize-charts-page' into 'master'2018-02-08-ce-cut-off-to-10-5-stable | Clement Ho | 2018-02-08 | 3 | -13/+50 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Annotate charts page for internationalization | Shah El-Rahman | 2018-02-08 | 3 | -13/+50 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch '41301-new-design-for-user-deletion-confirmation-in-admin-area' ...42867-rsa-secureid-app-doesn-t-understand-gitlab-qr-code | Clement Ho | 2018-02-08 | 9 | -17/+288 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Resolve "New design for user deletion confirmation in admin area" | Shah El-Rahman | 2018-02-08 | 9 | -17/+288 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch '41297-new-design-for-cancel-stop-pipeline-confirmation' into 'm... | Clement Ho | 2018-02-08 | 9 | -25/+167 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add modal for stopping and retrying pipelines41297-new-design-for-cancel-stop-pipeline-confirmation | Shah El-Rahman | 2018-02-07 | 9 | -25/+167 | |
* | | | | | | | | | | | | Merge branch 'internationalize-graph-page' into 'master' | Clement Ho | 2018-02-08 | 4 | -5/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Annotate graph page for internationalization | Shah El-Rahman | 2018-02-08 | 4 | -5/+19 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch '41300-new-design-for-project-deletion-confirmation' into 'master' | Clement Ho | 2018-02-08 | 4 | -1/+175 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Resolve "New design for project deletion confirmation" | Shah El-Rahman | 2018-02-08 | 4 | -1/+175 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'pawel/use-released-prometheus-version' into 'master' | Stan Hu | 2018-02-08 | 2 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Use prometheus-client-mmap released, final versionpawel/use-released-prometheus-version | Pawel Chojnacki | 2018-02-07 | 2 | -3/+3 | |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch '42864-update-vendored-autodevops-yml-for-latest-browser-perform... | Stan Hu | 2018-02-08 | 1 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Update AutoDevOps template for latest Browser Performance Testing changes | Joshua Lambert | 2018-02-07 | 1 | -3/+4 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'feature/migrate-blob-batch-to-gitaly' into 'master' | Robert Speicher | 2018-02-08 | 7 | -50/+165 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Migrate Git::Blob.batch to Gitaly | Ahmad Sherif | 2018-02-08 | 7 | -50/+165 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'patch-11' into 'master' | Stan Hu | 2018-02-08 | 1 | -124/+140 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Add instructions for source installation to mysql_to_postgresql.md | Dark Dragon | 2018-02-07 | 1 | -124/+140 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch '42462-edit-note' into 'master' | Fatih Acet | 2018-02-07 | 4 | -47/+72 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Resolve "Cancelling a second comment edit doesn't return its state to before ... | Simon Knox | 2018-02-07 | 4 | -47/+72 | |
* | | | | | | | | | | | | Merge branch 'axios-profile' into 'master' | Fatih Acet | 2018-02-07 | 2 | -17/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Replace $.ajax in profile.js with axios | Clement Ho | 2018-02-07 | 2 | -17/+25 | |
| |/ / / / / / / / / / / |