summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'docs-12250-update-permissions-for-dependency-list' into 'master'Achilleas Pipinellis2019-08-131-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update permissions for dependency list See merge request gitlab-org/gitlab-ce!31666
| * | | | | | | | | Update permissions for dependency listTetiana Chupryna2019-08-131-1/+2
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs-attachment-size' into 'master'Stan Hu2019-08-131-9/+24
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain max attachment size in docs Closes #1508 See merge request gitlab-org/gitlab-ce!31745
| * | | | | | | | | Update admin_area to explain max attachment sizeMarcel Amirault2019-08-131-9/+24
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add information about max attachment size, including troubleshooting information if an error is received
* | | | | | | | | Merge branch 'pb-update-mr-approvals-docs' into 'master'Marcia Ramos2019-08-131-14/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Remove info about approvals_required restriction See merge request gitlab-org/gitlab-ce!31268
| * | | | | | | | Remove info about approvals_required restrictionpb-update-mr-approvals-docsPatrick Bajao2019-08-131-14/+3
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'fix-filename-length' into 'master'Rémy Coutable2019-08-134-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure changelog filenames have length less than 99 characters See merge request gitlab-org/gitlab-ce!31752
| * | | | | | | | Ensure changelog filenames are less than 99 characters longfix-filename-lengthBalasankar "Balu" C2019-08-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
| * | | | | | | | Rename changelog files to have their less than 100 characters longBalasankar "Balu" C2019-08-132-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
* | | | | | | | | Merge branch 'remove-concerns-paths' into 'master'Jan Provaznik2019-08-131-5/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove concerns from eager load paths See merge request gitlab-org/gitlab-ce!31649
| * | | | | | | | | Remove concerns from eager load pathsdineshpanda2019-08-091-5/+0
| | | | | | | | | |
* | | | | | | | | | Merge branch 'require-stage-to-be-set-with-needs' into 'master'Grzegorz Bizon2019-08-135-4/+57
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require `stage:` to be set with `needs:` Closes #65568 See merge request gitlab-org/gitlab-ce!31760
| * | | | | | | | | Require `stage:` to be set with `needs:`Kamil Trzciński2019-08-135-4/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we are unsure what would be the behavior of `stage:` when we work on DAG. Let's make `stage:` to be required today with `needs:`.
* | | | | | | | | | Merge branch '65963-avoid-extra-query-allowed-to-uninstall' into 'master'Nick Thomas2019-08-132-2/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a performance issue in Helm#can_uninstall? Closes #65963 See merge request gitlab-org/gitlab-ce!31751
| * | | | | | | | | | Fix performance issue in Helm#can_uninstall?65963-avoid-extra-query-allowed-to-uninstallDylan Griffith2019-08-132-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling #present? was causing a DB query to happen each time around the loop. We only wanted to check for nil as it's nil in the first loop around so there is no need for #present?
* | | | | | | | | | | Merge branch 'remove-build-process-worker' into 'master'Grzegorz Bizon2019-08-133-43/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused `BuildProcessWorker` Closes #65539 See merge request gitlab-org/gitlab-ce!31756
| * | | | | | | | | | Remove unused `BuildProcessWorker`Kamil Trzciński2019-08-133-43/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We migrated all logic to `PipelineProcessWorker` and this worker become redundant.
* | | | | | | | | | | Merge branch 'spec_cluster_policy_coverage' into 'master'Bob Van Landuyt2019-08-132-0/+12
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve cluster policy spec coverage See merge request gitlab-org/gitlab-ce!31700
| * | | | | | | | | | | Improve cluster policy spec coveragespec_cluster_policy_coverageThong Kuah2019-08-122-0/+12
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'docs/edit-event-tracking' into 'master'Achilleas Pipinellis2019-08-131-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edits to event tracking topic Closes #65431 See merge request gitlab-org/gitlab-ce!31457
| * | | | | | | | | | Edits to event tracking topicEvan Read2019-08-131-2/+4
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-shared-runners-quota' into 'master'Achilleas Pipinellis2019-08-137-56/+55
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move shared minutes purchase details to /subscription Closes #63461 See merge request gitlab-org/gitlab-ce!31753
| * | | | | | | | | | Move shared minutes purchase details to /subscriptionMarcel Amirault2019-08-137-56/+55
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move details and images related to buying more runner minutes to the subscription page, which deals with all purchase related information, and update links
* | | | | | | | | | Merge branch 'doc-update-template' into 'master'Ramya Authappan2019-08-132-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update link to test engineering docs See merge request gitlab-org/gitlab-ce!31681
| * | | | | | | | | | Update links in the issue templatesdoc-update-templateMek Stittri2019-08-092-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '61800-migrate-environment-rollback-tests-to-jest' into 'master'Tim Zallmann2019-08-134-20/+53
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert `spec/javascripts/environments/*rollback*` tests from Jasmine to Jest Closes #61800 See merge request gitlab-org/gitlab-ce!31021
| * | | | | | | | | | | Convert spec/javascripts/environments/*rollback* tests to Jest61800-migrate-environment-rollback-tests-to-jestNathan Friend2019-08-124-20/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit converts two Jasmine tests into Jest tests.
* | | | | | | | | | | | Merge branch 'docs-nik-postgres-links-to-gitlab' into 'master'Achilleas Pipinellis2019-08-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs (links): switch from GitHub to GitLab Postgres mirror repo See merge request gitlab-org/gitlab-ce!31627
| * | | | | | | | | | | | Links: switch from GitHub to GitLab Postgres mirror repoNikolay Samokhvalov2019-08-131-2/+2
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab.com also has an up-to-date Postgres mirror.
* | | | | | | | | | | | Merge branch 'docs/update-gitlab-com-default-for-sidekiq-schedule-cron' into ↵Achilleas Pipinellis2019-08-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update default values in GitLab.com settings See merge request gitlab-org/gitlab-ce!31682
| * | | | | | | | | | | | Update default values in GitLab.com settingsdocs/update-gitlab-com-default-for-sidekiq-schedule-cronCindy Pallares 🦉2019-08-121-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates SIDEKIQ_MEMORY_KILLER_MAX_RSS default value
* | | | | | | | | | | | Merge branch 'gitaly-version-v1.59.0' into 'master'Stan Hu2019-08-133-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Gitaly to v1.59.0 See merge request gitlab-org/gitlab-ce!31743
| * | | | | | | | | | | Upgrade Gitaly to v1.59.0GitalyBot2019-08-133-2/+7
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'chore/fix-typo' into 'master'Ray Paik2019-08-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo See merge request gitlab-org/gitlab-ce!31750
| * | | | | | | | | | Fix typoArun Kumar Mohan2019-08-121-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '65701-Add-Gitmessage-Template' into 'master'Ash McKenzie2019-08-131-0/+31
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sample gitmessage template to the merge request guide Closes #65701 See merge request gitlab-org/gitlab-ce!31540
| * | | | | | | | | | | Add sample gitmessage template to the merge request guideDoug Stull2019-08-131-0/+31
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This provides users with an easy to apply gitmessage template for ease of seeing the commit guidelines here when they commit against gitlab: i https://docs.gitlab.com/ee/development/contributing/merge_request_workflow.html#commit-messages-guidelines
* | | | | | | | | | | Merge branch 'patch-74' into 'master'Stan Hu2019-08-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update duplication of unicorn min environment variable See merge request gitlab-org/gitlab-ce!31749
| * | | | | | | | | | update duplication of unicorn min environment variableRobin2019-08-131-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-debug-dstanley' into 'master'Evan Read2019-08-131-0/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring resources.md from debug project to docs See merge request gitlab-org/gitlab-ce!31366
| * | | | | | | | | | Bring resources.md from debug project to docsMarcel Amirault2019-08-131-0/+5
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy resources.md to docs project, renamed to links.md and add frontmatter and top level header
* | | | | | | | | | Merge branch 'philbz-master-patch-49694' into 'master'Drew Blessing2019-08-131-0/+30
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Grafana doc for security update See merge request gitlab-org/gitlab-ce!31739
| * | | | | | | | | | Update Grafana doc for security updatePhil Zona2019-08-131-0/+30
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-styleguide-lists' into 'master'Evan Read2019-08-131-11/+105
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update list information in docs styleguide See merge request gitlab-org/gitlab-ce!31293
| * | | | | | | | | | Update list information in docs styleguideMarcel Amirault2019-08-131-11/+105
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain indentation more carefully, and expand examples
* | | | | | | | | | Merge branch 'patch-73' into 'master'Ray Paik2019-08-131-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update styleguide.md - just a little typo. See merge request gitlab-org/gitlab-ce!31724
| * | | | | | | | | | Update styleguide.md - just a little typo.David Kartuzinski2019-08-121-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'improve-quick-action-messages' into 'master'Mayra Cabrera2019-08-139-85/+91
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve quick action error messages See merge request gitlab-org/gitlab-ce!31451
| * | | | | | | | | | Improve quick action error messagesHeinrich Lee Yu2019-08-139-85/+91
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standardize punctuation and format
* | | | | | | | | | Merge branch ↵Thong Kuah2019-08-124-19/+29
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '63942-remove-config-action_dispatch-use_authenticated_cookie_encryption-configuration' into 'master' Remove `config.action_dispatch.use_authenticated_cookie_encryption` configuration Closes #63942 See merge request gitlab-org/gitlab-ce!31463