summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | Merge branch 'security-55503-fix-pdf-js-vulnerability' into 'master'GitLab Release Tools Bot2019-04-028-32169/+50870
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix PDF.js vulnerability See merge request gitlab/gitlabhq!2999
| | | * | | | | | | | Added changelog entryNatalia Tepluhina2019-03-191-0/+5
| | | | | | | | | | |
| | | * | | | | | | | Fixed pdf testsNatalia Tepluhina2019-03-132-3/+3
| | | | | | | | | | |
| | | * | | | | | | | fix: changed PDFJS prop to GlobalWorkerOptionsNatalia Tepluhina2019-03-131-1/+1
| | | | | | | | | | |
| | | * | | | | | | | Updated PDF.js to 2.0.943Natalia Tepluhina2019-03-124-32165/+50861
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'security-use-untrusted-regexp' into 'master'GitLab Release Tools Bot2019-04-0215-96/+198
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use UntrustedRegexp for CI refs matching See merge request gitlab/gitlabhq!3005
| | | * | | | | | | | | Make CI refs matching to to use UntrustedRegexpKamil Trzciński2019-03-1515-96/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes ref validation to use always `UntrustedRegexp`. This also splits the existing RubySyntax into separate class.
| | * | | | | | | | | | Merge branch 'security-milestone-labels' into 'master'GitLab Release Tools Bot2019-04-024-8/+162
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Check label_ids parent when updating issue board See merge request gitlab/gitlabhq!3027
| | | * | | | | | | | | | Check if labels are available for target issuableJarka Košanová2019-03-284-8/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - labels have to be in the same project/group as an issuable
| | * | | | | | | | | | | Merge branch 'security-mass-assignment-on-project-update' into 'master'GitLab Release Tools Bot2019-04-023-5/+30
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disallow changing namespace of a project in update method See merge request gitlab/gitlabhq!3028
| | | * | | | | | | | | | | Refactor specs according to the code reviewMałgorzata Ksionek2019-03-261-1/+1
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Add cr remarksMałgorzata Ksionek2019-03-253-5/+5
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Disallow changing namespace of a project in update methodMałgorzata Ksionek2019-03-203-5/+30
| | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Merge branch 'security-disallow-guests-to-access-releases' into 'master'GitLab Release Tools Bot2019-04-024-3/+46
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disallow guest users from accessing Releases See merge request gitlab/gitlabhq!3041
| | | * | | | | | | | | | | Disallow guest users from accessing ReleasesShinya Maeda2019-03-264-3/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As they do not have a permission to read git tag
| | * | | | | | | | | | | | Update CHANGELOG.md for 11.7.10GitLab Release Tools Bot2019-03-281-0/+13
| | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | | | | | | | Update CHANGELOG.md for 11.9.3GitLab Release Tools Bot2019-03-271-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | | | | | | | Update CHANGELOG.md for 11.7.8GitLab Release Tools Bot2019-03-261-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | | | | | | | Update CHANGELOG.md for 11.9.2GitLab Release Tools Bot2019-03-261-0/+14
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | |