Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Incorporate feedbackadd-prometheus-external-docs | Joshua Lambert | 2018-11-13 | 1 | -11/+14 |
| | |||||
* | Add additional documentation for external Prometheus server | Joshua Lambert | 2018-11-13 | 1 | -9/+46 |
| | |||||
* | WIP update | Joshua Lambert | 2018-11-06 | 1 | -36/+40 |
| | |||||
* | Merge branch '53224-rename-to-resource-base-qa' into 'master' | Douglas Barbosa Alexandre | 2018-11-05 | 85 | -1615/+1601 |
|\ | | | | | | | | | CE: Rename QA::Factory to QA::Resource See merge request gitlab-org/gitlab-ce!22772 | ||||
| * | Rename QA::Factory to QA::Resource53224-rename-to-resource-base-qa | Lin Jen-Shin | 2018-11-05 | 85 | -1615/+1601 |
| | | | | | | | | | | * Factory::Base -> Resource::Base, and therefore: * Factory::Resource::Project -> Resource::Project | ||||
* | | Merge branch 'fix-codequality' into 'master'testing-review-app-password | Grzegorz Bizon | 2018-11-05 | 2 | -2/+2 |
|\ \ | | | | | | | | | | | | | Fix invalid artifact path for codequality See merge request gitlab-org/gitlab-ce!22816 | ||||
| * | | Fix invalid artifact path for codequalityfix-codequality | Kamil Trzciński | 2018-11-05 | 2 | -2/+2 |
| | | | |||||
* | | | Merge branch '48239-performance-info-ref' into 'master' | Stan Hu | 2018-11-05 | 4 | -10/+26 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Performance tuning on Projects::GitHttpController#info_refs Closes #48239 See merge request gitlab-org/gitlab-ce!22013 | ||||
| * | | | Make migration symmetric48239-performance-info-ref | Mark Chao | 2018-11-05 | 1 | -1/+2 |
| | | | | |||||
| * | | | Combine two updates in one query | Mark Chao | 2018-11-05 | 1 | -9/+3 |
| | | | | |||||
| * | | | Add index to speed up loading projects from DeployToken | Mark Chao | 2018-11-05 | 2 | -0/+18 |
| | | | | |||||
| * | | | Memorize project to avoid re-query | Mark Chao | 2018-11-05 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | [skip ci] | ||||
* | | | | Merge branch '53362-allow-concurrency-in-puma' into 'master' | Stan Hu | 2018-11-05 | 3 | -1/+8 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow concurrency when using Puma Closes #53362 See merge request gitlab-org/gitlab-ce!22751 | ||||
| * | | | | Allow concurrency when using Puma | Andrew Newdigate | 2018-11-05 | 3 | -1/+8 |
|/ / / / | |||||
* | | | | Merge branch 'gl-ui-tooltip-2' into 'master' | Filipa Lacerda | 2018-11-05 | 5 | -4/+18 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove gitlab-ui's tooltip from global See merge request gitlab-org/gitlab-ce!22814 | ||||
| * | | | | Remove gitlab-ui's tooltip from global | Clement Ho | 2018-11-05 | 5 | -4/+18 |
|/ / / / | |||||
* | | | | Merge branch '52925-scheduled-pipelines-ui-problems' into 'master' | Clement Ho | 2018-11-05 | 3 | -4/+15 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pipeline schedule style issues Closes #52925 See merge request gitlab-org/gitlab-ce!22758 | ||||
| * | | | | Fix pipeline schedule style issues | Scott Hampton | 2018-11-05 | 3 | -4/+15 |
|/ / / / | |||||
* | | | | Merge branch 'disallow-retry-of-old-builds' into 'master' | Grzegorz Bizon | 2018-11-05 | 24 | -38/+270 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | Disallow retry of old builds Closes #50939 See merge request gitlab-org/gitlab-ce!22538 | ||||
| * | | | Allow to make builds soft-archived.disallow-retry-of-old-builds | Kamil Trzciński | 2018-11-05 | 24 | -38/+270 |
| | |/ | |/| | | | | | | | | | | The soft-archived builds cannot be run after some deadline time. The intent is to aggressively recycle old builds after sometime. | ||||
* | | | Merge branch 'use_tokenauthenticatable_method_for_token_lookup' into 'master' | Sean McGivern | 2018-11-05 | 5 | -14/+11 |
|\ \ \ | | | | | | | | | | | | | | | | | Remove PersonalAccessTokensFinder#find_by method See merge request gitlab-org/gitlab-ce!22617 | ||||
| * | | | Remove PersonalAccessTokensFinder#find_by methoduse_tokenauthenticatable_method_for_token_lookup | Imre Farkas | 2018-11-05 | 5 | -14/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | find_by_token is overriden by TokenAuthenticatable which can be easily missed or confused with #find_by(:token) defined by ActiveRecord. First step for safer usage is to remove #find_by. | ||||
* | | | | Merge branch '52300-pool-repositories' into 'master' | Sean McGivern | 2018-11-05 | 13 | -0/+177 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start tracking pool repositories Closes #38238 and #52300 See merge request gitlab-org/gitlab-ce!22482 | ||||
| * | | | | Start tracking pool repositories | Nick Thomas | 2018-11-05 | 9 | -0/+80 |
| | | | | | |||||
| * | | | | Start tracking shards in the database | Nick Thomas | 2018-11-05 | 6 | -0/+97 |
| | | | | | |||||
* | | | | | Merge branch 'sh-fix-issue-52176' into 'master' | Yorick Peterse | 2018-11-05 | 3 | -0/+36 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable replication lag check for Aurora PostgreSQL databases Closes #52176 See merge request gitlab-org/gitlab-ce!22786 | ||||
| * | | | | | Disable replication lag check for Aurora PostgreSQL databasessh-fix-issue-52176 | Stan Hu | 2018-11-03 | 3 | -0/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replication slots are not supported in Aurora. Attempting to check the lag results in the message: ``` ActiveRecord::StatementInvalid: PG::FeatureNotSupported: ERROR: Replication slots are currently not supported in Aurora : SELECT pg_xlog_location_diff(pg_current_xlog_insert_location(), restart_lsn)::... ``` To avoid breaking support for background migrations in Aurora, we just disable the check if we encounter this error. This change also now checks whether there are any replication slots present in the primary before checking the replication lag. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52176 | ||||
* | | | | | | Merge branch 'gt-update-project-and-group-labels-empty-state' into 'master' | Annabel Dunstone Gray | 2018-11-05 | 5 | -5/+14 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update project and group labels empty state See merge request gitlab-org/gitlab-ce!22745 | ||||
| * | | | | | | Remove empty state button margin on small viewports | George Tsiolis | 2018-11-03 | 2 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | Update project and group labels empty state | George Tsiolis | 2018-11-02 | 4 | -5/+13 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'issue_51323' into 'master' | Phil Hughes | 2018-11-05 | 21 | -21/+158 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'only history' option to notes filter Closes #51323 See merge request gitlab-org/gitlab-ce!22544 | ||||
| * | | | | | | Add 'only history' option to notes filter | Felipe Artur | 2018-11-05 | 21 | -21/+158 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'zj-bump-gitaly-0-128' into 'master' | Douwe Maan | 2018-11-05 | 2 | -1/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Gitaly to 0.128.0 See merge request gitlab-org/gitlab-ce!22802 | ||||
| * | | | | | | Bump Gitaly to 0.128.0 | Zeger-Jan van de Weg | 2018-11-05 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make sure GitLab will have the latest Gitaly, the version number has to be bumped here. | ||||
* | | | | | | | Merge branch 'scheduled-manual-jobs-environment-play-buttons' into 'master' | Tim Zallmann | 2018-11-05 | 15 | -92/+309 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the Play button for delayed jobs in environment page Closes #52129 See merge request gitlab-org/gitlab-ce!22106 | ||||
| * | | | | | | | Fix bad merge in ↵scheduled-manual-jobs-environment-play-buttons | Winnie Hellmann | 2018-11-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | app/assets/javascripts/environments/components/environment_item.vue | ||||
| * | | | | | | | Add scheduled_actions to JSON schema | Winnie Hellmann | 2018-10-24 | 1 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | Update translations in locale/gitlab.pot | Winnie Hellmann | 2018-10-24 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Use secondary text color for delayed job timer | Winnie Hellmann | 2018-10-22 | 1 | -1/+4 |
| | | | | | | | | |||||
| * | | | | | | | Add permission check for delayed job actions | Winnie Hellmann | 2018-10-22 | 1 | -6/+2 |
| | | | | | | | | |||||
| * | | | | | | | Update confirmation modal text for starting delayed jobs immediately | Winnie Hellmann | 2018-10-22 | 2 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into scheduled-manual-jobs-environment-play-buttons | Winnie Hellmann | 2018-10-22 | 2003 | -20531/+164530 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: spec/javascripts/environments/environment_actions_spec.js | ||||
| * | | | | | | | | Add spec for Deployment#scheduled_actions | Shinya Maeda | 2018-10-18 | 1 | -1/+16 |
| | | | | | | | | | |||||
| * | | | | | | | | Make frontend files prettier | Winnie Hellmann | 2018-10-15 | 2 | -2/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | Use regex for the extecped time | Shinya Maeda | 2018-10-12 | 1 | -2/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Improve deployment entity spec | Shinya Maeda | 2018-10-12 | 1 | -4/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Add changelog | Shinya Maeda | 2018-10-10 | 1 | -0/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix and add spec | Shinya Maeda | 2018-10-10 | 3 | -2/+67 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix issue URL of TODO in environment_actions.vue | Winnie Hellmann | 2018-10-09 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Add feature flags for scheduled jobs in environments list | Winnie Hellmann | 2018-10-09 | 2 | -3/+67 |
| | | | | | | | | |