summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make sure that Arel.sql would work for update_column_in_batchestest-update_column_in_batches-with-sql-mysqlLin Jen-Shin2017-05-231-0/+8
|
* Merge branch 'dz-rename-pipelines-settings-tab' into 'master'Dmitriy Zaporozhets2017-05-2215-19/+23
|\ | | | | | | | | | | | | Rename CI/CD Pipelines to Pipelines in the project settings Closes #31980 See merge request !11305
| * Rename CI/CD Pipelines references to just Pipelines in docsdz-rename-pipelines-settings-tabDmitriy Zaporozhets2017-05-1111-14/+14
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Rename CI/CD Pipelines to Pipelines in the project settingsDmitriy Zaporozhets2017-05-115-5/+9
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'change_pipelines_schedules_help_page_path' into 'master'Rémy Coutable2017-05-222-3/+3
|\ \ | | | | | | | | | | | | Change pipelines schedules help page path See merge request !11592
| * | Change pipelines schedules help page pathchange_pipelines_schedules_help_page_pathAchilleas Pipinellis2017-05-222-3/+3
| | |
* | | Merge branch 'fix-retried-for-mysql' into 'master'Timothy Andrew2017-05-222-3/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixes broken MySQL migration for retried Closes #32647 See merge request !11593
| * | | Respect the typo as rubocop saidLin Jen-Shin2017-05-221-0/+0
| | | |
| * | | Add a test to ensure this works on MySQLLin Jen-Shin2017-05-221-0/+17
| | | |
| * | | Fixes broken MySQL migration for retriedKamil Trzcinski2017-05-221-3/+26
| |/ / | | | | | | | | | | | | | | | > Mysql2::Error: Table 'ci_builds' is specified twice, both as a target for 'UPDATE' and as a separate source for data: UPDATE `ci_builds` SET `retried` = ((SELECT MAX(ci_builds2.id) Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/32647
* | | Merge branch 'docs/deploys-perf-dashboard' into 'master'Sean Packham (GitLab)2017-05-224-12/+49
|\ \ \ | | | | | | | | | | | | | | | | Move environment monitoring to environments doc See merge request !11583
| * | | Move environment monitoring to environments docdocs/deploys-perf-dashboardAchilleas Pipinellis2017-05-214-12/+49
| | | |
* | | | Merge branch 'doc-hostname-fix' into 'master'Sean Packham (GitLab)2017-05-221-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | change domain to hostname in usage ping doc See merge request !11595
| * | | change domain to hostname in usage ping docJob van der Voort2017-05-221-1/+1
|/ / /
* | | Merge branch '31510-mask-password-field-edit' into 'master'Phil Hughes2017-05-223-3/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Show password field mask while editing service settings Closes #31510 See merge request !11431
| * | | Show password field mask while editing service settingsKushal Pandya2017-05-223-3/+7
|/ / /
* | | Merge branch '32496-admin-tabs' into 'master'Phil Hughes2017-05-221-35/+36
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix admin tabs Closes #32496 See merge request !11514
| * | | Fix admin tabs32496-admin-tabsAnnabel Dunstone Gray2017-05-181-35/+36
| | | |
* | | | Merge branch '32667-update-helm-chart-documentation' into 'master'Achilleas Pipinellis2017-05-221-0/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Update Helm Chart documentation See merge request !11588
| * | | Add notes for supported schedulers and cloud providers32667-update-helm-chart-documentationJoshua Lambert2017-05-221-0/+2
|/ / /
* | | Merge branch '32604-add-docs-for-change-of-cache-artifact-restore-order' ↵Achilleas Pipinellis2017-05-211-1/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add docs for change of Cache/Artifact restore order" Closes #32604 See merge request !11545
| * | | Add docs for change of Cache/Artifact restore order"Sean Packham (GitLab)2017-05-211-1/+7
|/ / /
* | | Merge branch '32462-award-emoji-tooltip-should-be-add-reaction' into 'master'Annabel Dunstone Gray2017-05-213-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve ""Award Emoji" tooltip should be "Add reaction"" Closes #32462 See merge request !11569
| * | | rename "Add emoji" and "Award emoji" to "Add reaction" where appropriate32462-award-emoji-tooltip-should-be-add-reactionMike Greiling2017-05-193-4/+4
| | | |
* | | | Merge branch 'zj-pipeline-json-performance' into 'master'Kamil Trzciński2017-05-211-5/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve pipeline size for query limit test Closes #31906 See merge request !11323
| * | | | Improve pipeline size for query limit testzj-pipeline-json-performanceZ.J. van de Weg2017-05-171-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pipeline was quite meagre in both stages and the number of groups. This has been improved. Performance is not yet optimal, but to limit this from sliding further this slippery slope, a hard limit has been set.
* | | | | Merge branch 'fix/gb/exclude-manual-actions-from-cancelable-jobs' into 'master'Kamil Trzciński2017-05-213-1/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude manual actions when checking if pipeline can be canceled Closes #31107 See merge request !11562
| * | | | | Exclude manual actions from cancelable jobs scopefix/gb/exclude-manual-actions-from-cancelable-jobsGrzegorz Bizon2017-05-193-1/+15
| | | | | |
* | | | | | Merge branch 'docs/issues-multiple-assignees' into 'master'Sean Packham (GitLab)2017-05-206-11/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add to docs: issues multiple assignees Closes gitlab-ee#2440 and #32574 See merge request !11556
| * | | | | | Add to docs: issues multiple assigneesMarcia Ramos2017-05-206-11/+25
| | | | | | |
* | | | | | | Merge branch 'docs/add-comment-snippets' into 'master'Sean Packham (GitLab)2017-05-202-0/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds "comments on snippets" to doc Closes #32575 See merge request !11563
| * | | | | | adds "comments on snippets" to docdocs/add-comment-snippetsMarcia Ramos2017-05-192-0/+10
| |/ / / / /
* | | | | | Merge branch 'bvl-fix-already-renamed-paths' into 'master'Douwe Maan2017-05-195-1/+250
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect renaming migrations Closes #32526 and #32530 See merge request !11515
| * | | | | Rename users on mysqlbvl-fix-already-renamed-pathsBob Van Landuyt2017-05-191-4/+15
| | | | | |
| * | | | | Don't try to rename `-`Bob Van Landuyt2017-05-191-1/+0
| | | | | |
| * | | | | Simpler way of renaming usersBob Van Landuyt2017-05-192-10/+10
| | | | | |
| * | | | | Fix incorrectly renamed routesBob Van Landuyt2017-05-193-1/+178
| | | | | |
| * | | | | Rename users that had their namespace renamedBob Van Landuyt2017-05-193-1/+63
| | |_|/ / | |/| | |
* | | | | Merge branch 'winh-frontend-api-users' into 'master'Clement Ho2017-05-1913-114/+419
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add users endpoint to frontend API class See merge request !11374
| * | | | | Add users endpoint to frontend API classWinnie Hellmann2017-05-1913-114/+419
|/ / / / /
* | | | | Merge branch 'fix-json-endpoint-redirection' into 'master'Douwe Maan2017-05-192-1/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bugfix: don't redirect to JSON endpoints after sign in See merge request !11561
| * | | | | Bugfix: don't redirect to JSON endpoints after sign inRuben Davila2017-05-192-1/+30
| | |/ / / | |/| | |
* | | | | Merge branch '32536-mr-widget-performance-improvements' into 'master'Fatih Acet2017-05-1912-28/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Load improvements related to MR widget See merge request !11518
| * | | | | Make sure fixture creation does not affect query count test32536-mr-widget-performance-improvementsOswaldo Ferreira2017-05-191-1/+4
| | | | | |
| * | | | | Remove routeOswaldo Ferreira2017-05-193-12/+0
| | | | | |
| * | | | | Fix Karma expectOswaldo Ferreira2017-05-181-1/+0
| | | | | |
| * | | | | Stop loading MergeRequestEntity data on sidebar requestOswaldo Ferreira2017-05-185-4/+4
| | | | | |
| * | | | | Remove unnecessary initial requestOswaldo Ferreira2017-05-182-2/+0
| | | | | |
| * | | | | Drop merge_check endpoint and use only MR show insteadOswaldo Ferreira2017-05-183-9/+20
| | |/ / / | |/| | |
* | | | | Merge branch 'winh-dropdown-ajax-cache' into 'master'Clement Ho2017-05-191-28/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use AjaxCache in Droplab Ajax plugin Closes #31897 See merge request !11171