summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 10.5.0-rc2v10.5.0-rc210-5-stable-prepare-rc3Ian Baum2018-02-081-1/+1
* Merge branch '10-5-stable-prepare-rc2' into '10-5-stable'Ian Baum2018-02-0813-21/+1670
|\
| * Merge branch 'bump-gitlab-shell-version-to-6-0-3' into 'master'10-5-stable-prepare-rc2Marin Jankovski2018-02-081-1/+1
| * Merge branch '10-5-update-dependencies-license-list' into 'master'Marin Jankovski2018-02-081-9/+1259
| * Merge branch '10-5-update-templates' into 'master'Marin Jankovski2018-02-088-6/+42
| * Merge branch '10-5-ce-update-guides' into 'master'Marin Jankovski2018-02-081-0/+361
| * Merge branch '10-5-update-source-install-guide' into 'master'Marin Jankovski2018-02-081-2/+2
| * Merge branch 'sh-fix-rebase-in-progress-nplus-one' into 'master'Marin Jankovski2018-02-081-3/+5
|/
* Merge branch '2018-02-08-ce-cut-off-to-10-5-stable' into '10-5-stable'Marin Jankovski2018-02-08375-2340/+8350
|\
| * 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
| |\ \ \ \
| | * | | | Replace $.get in diff file editor with axiosaxios-diff-file-editorClement Ho2018-02-021-10/+11
| * | | | | Merge branch 'fix/cache-gitaly-find-commits' into 'master'Sean McGivern2018-02-072-8/+56
| |\ \ \ \ \
| | * | | | | Cache Gitaly FindCommit RPC responsefix/cache-gitaly-find-commitsAhmad Sherif2018-02-072-8/+56
| * | | | | | Merge branch 'osw-remove-duplicate-can-be-reverted-calls' into 'master'Stan Hu2018-02-072-2/+14
| |\ \ \ \ \ \
| | * | | | | | Address naming suggestionOswaldo Ferreira2018-02-071-4/+3
| | * | | | | | Remove duplicate calls of MergeRequest#can_be_reverted?Oswaldo Ferreira2018-02-072-2/+15
| * | | | | | | Merge branch 'fix_help_controller_spec' into 'master'Sean McGivern2018-02-071-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Updating `HelpController` spec to use an existing imageMario de la Ossa2018-02-071-1/+1
| * | | | | | | Merge branch '4656-ce-port-filtered-search-bar' into 'master'Clement Ho2018-02-0715-81/+108
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Import FilteredSearchTokenKeys, update class initialization syntax4656-ce-port-filtered-search-barKushal Pandya2018-02-071-5/+6
| | * | | | | | Import and use `FilteredSearchTokenKeys` independentlyKushal Pandya2018-02-075-27/+30
| | * | | | | | Update class initialization syntaxKushal Pandya2018-02-075-6/+14
| | * | | | | | Export class instead of assigning to `gl`Kushal Pandya2018-02-071-4/+1
| | * | | | | | Make class initialization configurableKushal Pandya2018-02-072-38/+57