summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove already defined shared example59756-shared-example-already-definedAlexandru Croitor2019-04-021-85/+0
| | | | | | | | | Removing the time traking shared example as it was actually moved under time_tracking_quick_action_shared_examples.rb filename to a different path as part of spec refactorign for quick action https://gitlab.com/gitlab-org/gitlab-ce/issues/50199 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26095
* Merge branch 'qa/document_click_vs_go_to' into 'master'Rémy Coutable2019-04-022-0/+47
|\ | | | | | | | | | | | | Document `click_` vs. `go_to_` standard for e2e tests Closes #59645 See merge request gitlab-org/gitlab-ce!26825
| * Document click_ vs. go_to_ standard for e2e testsqa/document_click_vs_go_toWalmyr Lima2019-04-012-0/+47
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59645.
* | Merge branch 'expose-mr-pipeline-parameters-for-merge-widget-ce' into 'master'Kamil Trzciński2019-04-026-50/+17
|\ \ | | | | | | | | | | | | Backport: Expose merge request pipeline parameters for MR widget See merge request gitlab-org/gitlab-ce!26826
| * | Backport EE changeexpose-mr-pipeline-parameters-for-merge-widget-ceShinya Maeda2019-04-026-50/+17
| | | | | | | | | | | | This is for merge request pipelines
* | | Merge branch 'diff-tree-mobile-bug' into 'master'Filipa Lacerda2019-04-021-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed positioning of the diff tree list on mobile Closes #59739 See merge request gitlab-org/gitlab-ce!26820
| * | | Fixed positioning of the diff tree list on mobilePhil Hughes2019-04-021-1/+4
| | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59739
* | | | Merge branch 'id-split-self-approval-restrictions' into 'master'Nick Thomas2019-04-024-36/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Backport splitting approval changes from CE See merge request gitlab-org/gitlab-ce!26323
| * | | | Backport splitting approval changes from CEIgor2019-04-024-36/+17
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Author and committers approvals are split in EE This commit provides backports for those changes This reverts commit 886f00bcba23d67e2c86591c2eb5359ef457a2f9.
* | | | Merge branch 'docs-css' into 'master'Phil Hughes2019-04-021-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Adds documentation about the utility classes See merge request gitlab-org/gitlab-ce!26824
| * | | | Adds documentation about the utility classesFilipa Lacerda2019-04-021-0/+9
|/ / / /
* | | | Merge branch 'fix-expand-full-file-on-image' into 'master'Douwe Maan2019-04-022-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed expand full file button showing on images Closes #59695 See merge request gitlab-org/gitlab-ce!26830
| * | | | Fixed expand full file button showing on imagesPhil Hughes2019-04-012-1/+6
| | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59695
* | | | | Merge branch 'jprovazn-graphql-prometheus' into 'master'Dmitriy Zaporozhets2019-04-024-0/+84
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Monitor GraphQL with Prometheus See merge request gitlab-org/gitlab-ce!26569
| * | | | | Monitor GraphQL with PrometheusJan Provaznik2019-04-024-0/+84
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extends graphql's platform tracing class to observe duration of graphql methods. In graphql 1.8.11 is added prometheus class but it's not very useful for us because it uses prometheus_exporter to export results.
* | | | | Merge branch 'design-management-upload-client-ce' into 'master'Filipa Lacerda2019-04-024-54/+81
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE backport of design-management-upload-client See merge request gitlab-org/gitlab-ce!26766
| * | | | | CE backport of design-management-upload-clientPhil Hughes2019-04-024-54/+81
| | | | | |
* | | | | | Merge branch 'sh-fix-rugged-tree-entries' into 'master'Sean McGivern2019-04-023-9/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid excessive recursive calls with Rugged TreeEntries Closes #59759 See merge request gitlab-org/gitlab-ce!26813
| * | | | | | Avoid excessive recursive calls with Rugged TreeEntriessh-fix-rugged-tree-entriesStan Hu2019-03-313-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Rugged implementation was recursively scanning the repository to create `flat_path` because the post-process step was being called from with a loop. For large repositories, this was significantly slowing things down. Break the call to `rugged_populate_flat_path` out of this loop to make this work efficiently. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59759
* | | | | | | Merge branch ↵Rémy Coutable2019-04-022-6/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-10828-follow-up-from-ee-port-externalize-strings-in-projects-controllers' into 'master' (CE Port) "Follow-up from "(EE port) Externalize strings in projects controllers"" See merge request gitlab-org/gitlab-ce!26832
| * | | | | | (CE Port) "Follow-up from "(EE port) Externalize strings in projects ↵Martin Wortschack2019-04-022-6/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | controllers""
* | | | | | Merge branch 'issue_51789_part_1' into 'master'Sean McGivern2019-04-0212-2/+273
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate issuable states to integer patch 1 of 2 Closes #51789 See merge request gitlab-org/gitlab-ce!25107
| * | | | | | Remove additional loggingissue_51789_part_1Felipe Artur2019-04-012-4/+0
| | | | | | |
| * | | | | | Address review commentsFelipe Artur2019-03-283-23/+14
| | | | | | |
| * | | | | | Merge masterFelipe Artur2019-03-274727-30866/+92031
| |\ \ \ \ \ \
| * | | | | | | Remove auto vacuum logic, decrease batch size and intervalFelipe Artur2019-03-015-141/+32
| | | | | | | |
| * | | | | | | Address review commentsFelipe Artur2019-02-198-90/+113
| | | | | | | |
| * | | | | | | Merge branch 'master' into issue_51789_part_1Felipe Artur2019-02-19760-36065/+150713
| |\ \ \ \ \ \ \
| * | | | | | | | Add more specs and code improvementsFelipe Artur2019-02-196-56/+89
| | | | | | | | |
| * | | | | | | | Make migrations reschedulableFelipe Artur2019-02-185-27/+92
| | | | | | | | |
| * | | | | | | | Fix typoFelipe Artur2019-02-181-2/+2
| | | | | | | | |
| * | | | | | | | Fix rubocopFelipe Artur2019-02-184-52/+61
| | | | | | | | |
| * | | | | | | | Add Reschedulable moduleFelipe Artur2019-02-154-36/+63
| | | | | | | | |
| * | | | | | | | Fix specsFelipe Artur2019-02-152-2/+4
| | | | | | | | |
| * | | | | | | | fix typoFelipe Artur2019-02-141-2/+2
| | | | | | | | |
| * | | | | | | | Fix broken specsFelipe Artur2019-02-143-2/+12
| | | | | | | | |
| * | | | | | | | Add specs for issuable states syncFelipe Artur2019-02-142-0/+31
| | | | | | | | |
| * | | | | | | | Split background migration for issues and merge requestsFelipe Artur2019-02-148-50/+81
| | | | | | | | |
| * | | | | | | | Code improvementsFelipe Artur2019-02-134-25/+18
| | | | | | | | |
| * | | | | | | | Improve batch sizeFelipe Artur2019-02-123-11/+12
| | | | | | | | |
| * | | | | | | | Schedule background migrations and specsFelipe Artur2019-02-124-56/+27
| | | | | | | | |
| * | | | | | | | Migrate issuable states to integer patch 1Felipe Artur2019-02-118-2/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch 1 that migrates issues/merge requests states from integer to string. On this commit we are only adding the state_id column and syncing it with a backgroud migration. On Patch 2 the code to use the new integer column will be deployed and the old column will be removed.
* | | | | | | | | Merge branch 'contribute/fix-project-name-members-page' into 'master'Sean McGivern2019-04-024-3/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't sanitize project names on project members page Closes #58751 See merge request gitlab-org/gitlab-ce!25946
| * | | | | | | | Don't sanitize project names on project members pageElias Werberich2019-04-014-3/+8
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'kube_helm_auto_devops_213' into 'master'Kamil Trzciński2019-04-022-2/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Kubectl and Helm in Auto-DevOps.gitlab-ci.yml See merge request gitlab-org/gitlab-ce!26534
| * | | | | | | | Bump Kubectl and Helm in Auto-DevOps.gitlab-ci.ymlkube_helm_auto_devops_213Thong Kuah2019-04-012-2/+7
| | | | | | | | |
* | | | | | | | | Merge branch 'coverage-parsing-examples' into 'master'Grzegorz Bizon2019-04-021-3/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tweak coverage parsing examples See merge request gitlab-org/gitlab-ce!26732
| * | | | | | | | | Add Elixir example for built in coverage tooloptikfluffel2019-03-281-0/+3
| | | | | | | | | |
| * | | | | | | | | Move NodeJS examples next to each otheroptikfluffel2019-03-281-3/+3
| | | | | | | | | |
* | | | | | | | | | Merge branch '56557-add-managed-field-to-cluster' into 'master'Kamil Trzciński2019-04-023-1/+24
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds `managed` boolean column to Clusters table Closes #56557 See merge request gitlab-org/gitlab-ce!26675