summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add merged_after scope for MR metricsbackport-introduce-analytics-workerPavel Shutsin2019-08-142-0/+14
|
* Declare Analytics queue for EEPavel Shutsin2019-08-132-1/+8
|
* 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
| * | | | Enable use of Rails' new cookie encryptionHeinrich Lee Yu2019-08-134-19/+29
| | | | | | | | | | | | | | | | | | | | | | | | | Old cookies are still valid and are automatically upgraded by Rails
* | | | | Merge branch 'ce-12547-load-search-counts-async' into 'master'Michael Kozono2019-08-1221-180/+425
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Load search result counts asynchronously (CE) See merge request gitlab-org/gitlab-ce!31663
| * | | | | Fix deprecation warning for dangerous order usageMarkus Koller2019-08-121-4/+6
| | | | | |
| * | | | | FE fetch counts async on search page loadPaul Slaughter2019-08-125-4/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates `refresh_counts` module to dynamically fetch and load data based on attributes of HAML elements.
| * | | | | Load search result counts asynchronouslyMarkus Koller2019-08-1216-176/+352
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Querying all counts for the different search results in the same request led to timeouts, so we now only calculate the count for the *current* search results, and request the others in separate asynchronous calls.
* | | | | | Merge branch 'sh-fix-import-export-suggestions' into 'master'Michael Kozono2019-08-124-2/+28
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly save suggestions in project exports Closes #65880 See merge request gitlab-org/gitlab-ce!31690
| * | | | | Properly save suggestions in project exportssh-fix-import-export-suggestionsStan Hu2019-08-104-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously imports would fail if a merge request note included a suggestion with an `ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection` exception. This was happening because suggestions were listed as a descendant of merge requests, but this doesn't work because suggestions are directly associated with notes, not merge requests, and that association is lost. Rails also disallows creating intializing a has_many association through a different object. We fix this by making `suggestions` a child of `notes` within a merge request. This doesn't fix previously broken exported project exports, but new exports will work. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65880
* | | | | | Merge remote-tracking branch 'dev/master'John T Skarbek2019-08-122-1/+21
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Update CHANGELOG.md for 12.0.6GitLab Release Tools Bot2019-08-121-0/+4
| | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Update CHANGELOG.md for 11.11.8GitLab Release Tools Bot2019-08-091-0/+8
| | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Update CHANGELOG.md for 12.1.5GitLab Release Tools Bot2019-08-093-10/+8
| | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Merge remote-tracking branch 'dev/pokstad1-master-patch-14984'John T Skarbek2019-08-091-0/+5
| |\ \ \ \ \
| | * | | | | Update Gitaly to v1.53.2 for security fixPaul Okstad2019-08-012-1/+6
| | | | | | |
| * | | | | | Merge branch 'security-pages-api-token-recovery' into 'master'John Skarbek2019-08-092-1/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix gitlab api token recovery See merge request gitlab/gitlabhq!3286
| | * | | | | | Fix gitlab api token recoveryVladimir Shushlin2019-08-092-1/+6
| |/ / / / / /
* | | | | | | Merge branch 'add-metadata-to-epic-list-view-ce' into 'master'Clement Ho2019-08-123-5/+16
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Internationalize Issue and MR list metadata strings See merge request gitlab-org/gitlab-ce!31677
| * | | | | | Internationalize Issue and MR list metadata stringsBrett Walker2019-08-123-5/+16
|/ / / / / /