summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge branch ↵revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-keyRubén Dávila2018-02-126-113/+17
| | | | | | | 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' into 'master'" This reverts commit a58f8c32c62bcf5824d1fe1d0de53e9bda974d65, reversing changes made to cd5d75c362cdf06efb8174eddfbd0f4b65687dec.
* Update VERSION to 10.5.0-rc3v10.5.0-rc3Ian Baum2018-02-091-1/+1
|
* Merge branch '10-5-stable-prepare-rc3' into '10-5-stable'Ian Baum2018-02-0930-130/+651
|\ | | | | | | | | Prepare 10.5 RC3 release See merge request gitlab-org/gitlab-ce!17026
| * Merge branch 'rs-pick-security' into 'master'Stan Hu2018-02-0930-130/+651
|/ | | | | Pick 10.4.3 fixes into master See merge request gitlab-org/gitlab-ce!17040
* 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
|\ | | | | | | | | Prepare 10.5 RC2 release See merge request gitlab-org/gitlab-ce!17001
| * Merge branch 'bump-gitlab-shell-version-to-6-0-3' into 'master'10-5-stable-prepare-rc2Marin Jankovski2018-02-081-1/+1
| | | | | | | | | | Bumps Gitlab Shell version to 6.0.3 See merge request gitlab-org/gitlab-ce!17008
| * Merge branch '10-5-update-dependencies-license-list' into 'master'Marin Jankovski2018-02-081-9/+1259
| | | | | | | | | | 10.5 Update the dependencies license list See merge request gitlab-org/gitlab-ce!16998
| * Merge branch '10-5-update-templates' into 'master'Marin Jankovski2018-02-088-6/+42
| | | | | | | | | | 10.5 Update the `.gitignore`, `.gitlab-ci.yml`, and `Dockerfile` templates See merge request gitlab-org/gitlab-ce!16997
| * Merge branch '10-5-ce-update-guides' into 'master'Marin Jankovski2018-02-081-0/+361
| | | | | | | | | | 10.5 Create the "Update" guides See merge request gitlab-org/gitlab-ce!16996
| * Merge branch '10-5-update-source-install-guide' into 'master'Marin Jankovski2018-02-081-2/+2
| | | | | | | | | | 10.5 Update the "Installation from Source" guide See merge request gitlab-org/gitlab-ce!16995
| * 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 Gitaly Closes gitlab-ee#4857 See merge request gitlab-org/gitlab-ce!16990
* Merge branch '2018-02-08-ce-cut-off-to-10-5-stable' into '10-5-stable'Marin Jankovski2018-02-08375-2340/+8350
|\ | | | | | | | | Update 10-5-stable to freeze point See merge request gitlab-org/gitlab-ce!16993
| * 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 internationalization See merge request gitlab-org/gitlab-ce!16687
| | * 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
| |\ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "New design for user deletion confirmation in admin area" Closes #41301 See merge request gitlab-org/gitlab-ce!16811
| | * 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 ↵Clement Ho2018-02-089-25/+167
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "New design for cancel / stop pipeline confirmation" Closes #41297 See merge request gitlab-org/gitlab-ce!16813
| | * Add modal for stopping and retrying pipelines41297-new-design-for-cancel-stop-pipeline-confirmationShah El-Rahman2018-02-079-25/+167
| | | | | | | | | | | | | | | | | | | | | | | | Fix tests Address code review feedback Fix tests
| * | Merge branch 'internationalize-graph-page' into 'master'Clement Ho2018-02-084-5/+19
| |\ \ | | | | | | | | | | | | | | | | Annotate graph page for internationalization See merge request gitlab-org/gitlab-ce!16688
| | * | 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" Closes #41300 See merge request gitlab-org/gitlab-ce!16812
| | * | 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 version See merge request gitlab-org/gitlab-ce!16984
| | * | Use prometheus-client-mmap released, final versionpawel/use-released-prometheus-versionPawel Chojnacki2018-02-072-3/+3
| | | |
| * | | Merge branch ↵Stan Hu2018-02-081-3/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42864-update-vendored-autodevops-yml-for-latest-browser-performance-testing-changes' into 'master' Update vendored AutoDevOps YML for latest Browser Performance Testing changes Closes #42864 See merge request gitlab-org/gitlab-ce!16982
| | * | | 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 Gitaly Closes #37445 and gitaly#985 See merge request gitlab-org/gitlab-ce!16928
| | * | | Migrate Git::Blob.batch to GitalyAhmad Sherif2018-02-087-50/+165
| | |/ / | | | | | | | | | | | | Closes gitaly#985
| * | | Merge branch 'patch-11' into 'master'Stan Hu2018-02-081-124/+140
| |\ \ \ | | |/ / | |/| | | | | | | | | | Add instructions for source installation to mysql_to_postgresql.md See merge request gitlab-org/gitlab-ce!16983
| | * | 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 the edit" Closes #42462 See merge request gitlab-org/gitlab-ce!16869
| | * | Resolve "Cancelling a second comment edit doesn't return its state to before ↵Simon Knox2018-02-074-47/+72
| | | | | | | | | | | | | | | | the edit"
| * | | Merge branch 'axios-profile' into 'master'Fatih Acet2018-02-072-17/+25
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Replace $.ajax in profile.js with axios See merge request gitlab-org/gitlab-ce!16895
| | * | | 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
| | | | | | | | | | | | [ci skip]
| * | | 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 metrics deletion See merge request gitlab-org/gitlab-ce!16964
| | * | | Update prometheus gem to version 0.9.1.pre.rc.2 fixing segfaults happening ↵prometheus-gem-update-to-version-0.9.1.pre.rc.1Pawel Chojnacki2018-02-072-3/+3
| | | | | | | | | | | | | | | | | | | | on metrics deletion
| * | | | Merge branch 'axios-diff-file-editor' into 'master'Fatih Acet2018-02-071-10/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Replace $.get in diff file editor with axios See merge request gitlab-org/gitlab-ce!16896
| | * | | | 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 response See merge request gitlab-org/gitlab-ce!16949
| | * | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate calls of MergeRequest#can_be_reverted? on MR widget endpoint See merge request gitlab-org/gitlab-ce!16975
| | * | | | | | 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 image See merge request gitlab-org/gitlab-ce!16977
| | * | | | | | 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
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | CE Port: for Filtered search releated changes See merge request gitlab-org/gitlab-ce!16917
| | * | | | | | Import FilteredSearchTokenKeys, update class initialization syntax4656-ce-port-filtered-search-barKushal Pandya2018-02-071-5/+6
| | | | | | | |
View Lorry Controller Status