summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Docs: Merge EE doc/user/project/repository and doc/push_rules to CEMarcel Amirault2019-05-052-1/+157
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-repo-merge-19-user-admin-area' into 'master'Achilleas Pipinellis2019-05-0529-20/+376
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge EE doc/user/admin_area to CE See merge request gitlab-org/gitlab-ce!27869
| * | | | | | | | | | Docs: Merge EE doc/user/admin_area to CEMarcel Amirault2019-05-0529-20/+376
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-repo-merge-2-development' into 'master'Achilleas Pipinellis2019-05-059-2/+713
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge EE doc/development to CE See merge request gitlab-org/gitlab-ce!27606
| * | | | | | | | | | Docs: Merge EE doc/development to CEMarcel Amirault2019-05-059-2/+713
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-repo-merge-16-user' into 'master'Achilleas Pipinellis2019-05-0512-9/+223
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge EE doc/​user to CE See merge request gitlab-org/gitlab-ce!27785
| * | | | | | | | | | Docs: Merge EE doc/​user to CEMarcel Amirault2019-05-0512-9/+223
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-repo-merge-17-admin-monitoring' into 'master'Achilleas Pipinellis2019-05-053-0/+81
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge EE doc/administration/monitoring to CE See merge request gitlab-org/gitlab-ce!27784
| * | | | | | | | | | Docs: Merge EE doc/administration/monitoring to CEMarcel Amirault2019-05-053-0/+81
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-repo-merge-15-admin-auth' into 'master'Achilleas Pipinellis2019-05-0511-6/+871
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge EE doc/​administration/​auth to CE See merge request gitlab-org/gitlab-ce!27740
| * | | | | | | | | | Docs: Merge EE doc/​administration/​auth to CEMarcel Amirault2019-05-0511-6/+871
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-repo-merge-14-project-milestones' into 'master'Achilleas Pipinellis2019-05-053-11/+96
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge EE doc/​user/project/milestones to CE See merge request gitlab-org/gitlab-ce!27713
| * | | | | | | | | | Docs: Merge EE doc/​user/project/milestones to CEMarcel Amirault2019-05-053-11/+96
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-repo-merge-13-project-clusters' into 'master'Achilleas Pipinellis2019-05-055-3/+24
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge EE doc/​user/project/clusters to CE See merge request gitlab-org/gitlab-ce!27710
| * | | | | | | | | | Docs: Merge EE doc/​user/project/clusters to CEMarcel Amirault2019-05-055-3/+24
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-repo-merge-12-user-disc' into 'master'Achilleas Pipinellis2019-05-0511-0/+70
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge EE doc/​user/discussions to CE See merge request gitlab-org/gitlab-ce!27709
| * | | | | | | | | | Docs: Merge EE doc/​user/discussions to CEMarcel Amirault2019-05-0511-0/+70
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-repo-merge-11-admin-ops' into 'master'Achilleas Pipinellis2019-05-055-2/+234
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge EE doc/administration/operations to CE See merge request gitlab-org/gitlab-ce!27704
| * | | | | | | | | | Docs: Merge EE doc/administration/operations to CEMarcel Amirault2019-05-055-2/+234
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-repo-merge-10-group-misc' into 'master'Achilleas Pipinellis2019-05-0541-13/+680
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge EE doc/​user/group to CE See merge request gitlab-org/gitlab-ce!27702
| * | | | | | | | | | Docs: Merge EE doc/​user/group to CEMarcel Amirault2019-05-0541-13/+680
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-repo-merge-5-update' into 'master'Achilleas Pipinellis2019-05-0569-2/+345
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge EE doc/​update to CE See merge request gitlab-org/gitlab-ce!27654
| * | | | | | | | | | Docs: Merge EE doc/​update to CEMarcel Amirault2019-05-0569-2/+345
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-repo-merge-4-workflow' into 'master'Achilleas Pipinellis2019-05-0514-24/+581
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge EE doc/​workflow to CE See merge request gitlab-org/gitlab-ce!27622
| * | | | | | | | | | Docs: Merge EE doc/​workflow to CEMarcel Amirault2019-05-0514-24/+581
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-repo-merge-3-integration' into 'master'Achilleas Pipinellis2019-05-0520-128/+1279
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge EE doc/​integration to CE See merge request gitlab-org/gitlab-ce!27610
| * | | | | | | | | Docs: Merge EE doc/​integration to CEMarcel Amirault2019-05-0520-128/+1279
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs-repo-merge-1-customization' into 'master'Achilleas Pipinellis2019-05-041-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge EE doc/​customization to CE See merge request gitlab-org/gitlab-ce!27604
| * | | | | | | | | Docs: Merge EE doc/​customization to CEMarcel Amirault2019-05-041-0/+5
|/ / / / / / / / /
* | | | | | | | | Merge branch '50926-sort-by-due-date-and-popularity' into 'master'Douglas Barbosa Alexandre2019-05-043-16/+35
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Sort by due date and popularity in both directions" Closes #50926 See merge request gitlab-org/gitlab-ce!25502
| * | | | | | | | | Resolve "Sort by due date and popularity in both directions"Nermin Vehabovic2019-05-043-16/+35
|/ / / / / / / / /
* | | | | | | | | Merge branch '59365-include-time-window-parameters-in-the-url-query-string' ↵Fatih Acet2019-05-034-27/+65
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Include time window parameters in the URL query string" Closes #59365 See merge request gitlab-org/gitlab-ce!27230
| * | | | | | | | | Make time window parameters available in the query string59365-include-time-window-parameters-in-the-url-query-stringJose Vargas2019-05-014-27/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds the frontend functionality to add the parameters via the `pushState` api, preventing the need for a page reload.
* | | | | | | | | | Merge branch 'sh-cache-rubocop-cwd' into 'master'Douwe Maan2019-05-032-3/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache current working directory to speed up Rubocop Closes #61383 See merge request gitlab-org/gitlab-ce!28066
| * | | | | | | | | | Cache current working directory to speed up Rubocopsh-cache-rubocop-cwdStan Hu2019-05-032-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves thousands of getcwd() system calls and improves the performance of running Rubocop, which is also used by HAML linting. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61383
* | | | | | | | | | | Merge branch '10763-track-uninstall-button-clicks-ce' into 'master'Filipa Lacerda2019-05-033-4/+26
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Backport of tracking uninstall button click See merge request gitlab-org/gitlab-ce!28012
| * | | | | | | | | | | CE-backport track uninstall button clicks10763-track-uninstall-button-clicks-ceEnrique Alcantara2019-05-023-4/+26
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'patch-37' into 'master'Bob Van Landuyt2019-05-031-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add @katrinleinweber as German proofreader See merge request gitlab-org/gitlab-ce!24331
| * | | | | | | | | | | | Add @katrinleinweber as German proofreaderKatrin Leinweber2019-01-111-0/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'docs-56838-allow-guest-access-to-releases' into 'master'Marcia Ramos2019-05-031-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Releases permissions docs See merge request gitlab-org/gitlab-ce!27935
| * | | | | | | | | | | | | Update Releases permissions docsKrasimir Angelov2019-05-031-2/+6
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guest users now can read releases, except for items related to source code. Releated: https://gitlab.com/gitlab-org/gitlab-ce/issues/56838 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/27247
* | | | | | | | | | | | | Merge branch '59952' into 'master'Kushal Pandya2019-05-031-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set timezone as GMT in Jest config file Closes #59952 See merge request gitlab-org/gitlab-ce!27738
| * | | | | | | | | | | | | Set timezone to GMT in Jest config59952Fatih Acet2019-05-021-0/+4
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '56838-allow-guest-access-to-releases' into 'master'Lin Jen-Shin2019-05-0318-38/+162
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow guests users to access project releases Closes #56838 See merge request gitlab-org/gitlab-ce!27247
| * | | | | | | | | | | | | | Allow guests users to access project releasesKrasimir Angelov2019-05-0318-38/+162
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is step one of resolving https://gitlab.com/gitlab-org/gitlab-ce/issues/56838. Here is what changed: - Revert the security fix from bdee9e8412d. - Do not leak repository information (tag name, commit) to guests in API responses. - Do not include links to source code in API responses for users that do not have download_code access. - Show Releases in sidebar for guests. - Do not display links to source code under Assets for users that do not have download_code access. GET ':id/releases/:tag_name' still do not allow guests to access releases. This is to prevent guessing tag existence.
* | | | | | | | | | | | | | Merge branch '46806-typed-ci-variables-docs' into 'master'Marcia Ramos2019-05-038-27/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Update docs related to CI variables See merge request gitlab-org/gitlab-ce!27786
| * | | | | | | | | | | | | | Update docs related to CI variablesKrasimir Angelov2019-05-038-27/+42
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `Variable Types` section to explain supported variable types and update example and related screenshots.
* | | | | | | | | | | | | | Merge branch 'include-all-postgres-queries-in-performance-bar-summary' into ↵Stan Hu2019-05-031-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Include all queries in the performance bar summary Closes #61372 See merge request gitlab-org/gitlab-ce!28063
| * | | | | | | | | | | | | | Include all queries in the performance bar summarySean McGivern2019-05-031-0/+12
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails 5.1's `exec_no_cache` doesn't call `async_exec` any more, but `exec_params`: https://github.com/rails/rails/pull/33188 This means that the DB summary in the performance bar was wrong. The individual query details were still correct (we subscribe to ActiveRecord events for those). We can remove this once the upstream PR to peek-pg is in a release and we update to use that release.
* | | | | | | | | | | | | | Merge branch 'js-i18n-reports' into 'master'Tim Zallmann2019-05-032-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internationalisation of reports directory See merge request gitlab-org/gitlab-ce!27742