summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix pdf spec - needs Vue instance returned42783-resolve-no-new-eslint-issues-with-our-vue-instantiation-methodsSimon Knox2018-02-091-1/+1
* refactor several instances of new Vue to use Vue.createMike Greiling2018-02-0817-36/+24
* add Vue.create method as an alternative to new Vue which will not violate our...Mike Greiling2018-02-081-0/+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
|/ / / / / / / /
* | | | | | | | Merge branch 'pawel/use-released-prometheus-version' into 'master'Stan Hu2018-02-082-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Use prometheus-client-mmap released, final versionpawel/use-released-prometheus-versionPawel Chojnacki2018-02-072-3/+3
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch '42864-update-vendored-autodevops-yml-for-latest-browser-perform...Stan Hu2018-02-081-3/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Update AutoDevOps template for latest Browser Performance Testing changesJoshua Lambert2018-02-071-3/+4
| |/ / / / / / /
* | | | | | | | Merge branch 'feature/migrate-blob-batch-to-gitaly' into 'master'Robert Speicher2018-02-087-50/+165
|\ \ \ \ \ \ \ \
| * | | | | | | | Migrate Git::Blob.batch to GitalyAhmad Sherif2018-02-087-50/+165
| |/ / / / / / /
* | | | | | | | Merge branch 'patch-11' into 'master'Stan Hu2018-02-081-124/+140
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add instructions for source installation to mysql_to_postgresql.mdDark Dragon2018-02-071-124/+140
|/ / / / / / /
* | | | | | | Merge branch '42462-edit-note' into 'master'Fatih Acet2018-02-074-47/+72
|\ \ \ \ \ \ \
| * | | | | | | Resolve "Cancelling a second comment edit doesn't return its state to before ...Simon Knox2018-02-074-47/+72
* | | | | | | | Merge branch 'axios-profile' into 'master'Fatih Acet2018-02-072-17/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Replace $.ajax in profile.js with axiosClement Ho2018-02-072-17/+25
| |/ / / / / / /
* | | | | | | | Merge remote-tracking branch 'dev/master'Stan Hu2018-02-071-0/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Update CHANGELOG.md for 10.2.8Robert Speicher2018-02-071-0/+10
* | | | | | | | Merge branch 'prometheus-gem-update-to-version-0.9.1.pre.rc.1' into 'master'Stan Hu2018-02-072-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Update prometheus gem to version 0.9.1.pre.rc.2 fixing segfaults happening on...prometheus-gem-update-to-version-0.9.1.pre.rc.1Pawel Chojnacki2018-02-072-3/+3
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'axios-diff-file-editor' into 'master'Fatih Acet2018-02-071-10/+11
|\ \ \ \ \ \ \ \
View Lorry Controller Status