summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Cleanup new branch/merge request form in issueswinh-new-branch-dropdown-styleWinnie Hellmann2018-02-1210-139/+135
|
* Merge branch '40994-expose-features-as-ci-cd-variable' into 'master'Kamil Trzciński2018-02-084-0/+11
|\ | | | | | | | | | | | | Resolve "Expose GitLab license/plan as a CI/CD variable" Closes #40994 See merge request gitlab-org/gitlab-ce!16936
| * 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 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
| | | | | | |
| * | | | | | 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
| | | | | | |
| * | | | | | Remove `FilteredSearchTokenKeys` importKushal Pandya2018-02-071-1/+0
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ce-4813-fix-ee-projects-destroy_service_spec' into 'master'Sean McGivern2018-02-074-19/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset column information after the schema is migrated in MigrationsHelpers.schema_migrate_up! Closes gitlab-ee#4813 See merge request gitlab-org/gitlab-ce!16950
| * | | | | | Reset column information after the schema is migrated in ↵ce-4813-fix-ee-projects-destroy_service_specRémy Coutable2018-02-074-19/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MigrationsHelpers.schema_migrate_up! Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'clear-job-request-timeout' into 'master'Filipa Lacerda2018-02-072-19/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear the timeout in Jobs class after each test Closes #42830 See merge request gitlab-org/gitlab-ce!16969
| * | | | | | | Clear the timeout in Jobs class after each testPhil Hughes2018-02-072-19/+28
| | | | | | | |
* | | | | | | | Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'Robert Speicher2018-02-0747-118/+612
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deploy prometheus through kubernetes and autoconnect to cluster Closes #30480 and #28916 See merge request gitlab-org/gitlab-ce!16182
View Lorry Controller Status