summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Rename QA::Factory to QA::Resource53224-rename-to-resource-base-qaLin Jen-Shin2018-11-0585-1615/+1601
| | | | | * Factory::Base -> Resource::Base, and therefore: * Factory::Resource::Project -> Resource::Project
* Merge branch 'use_tokenauthenticatable_method_for_token_lookup' into 'master'Sean McGivern2018-11-055-14/+11
|\ | | | | | | | | Remove PersonalAccessTokensFinder#find_by method See merge request gitlab-org/gitlab-ce!22617
| * Remove PersonalAccessTokensFinder#find_by methoduse_tokenauthenticatable_method_for_token_lookupImre Farkas2018-11-055-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 McGivern2018-11-0513-0/+177
|\ \ | | | | | | | | | | | | | | | | | | Start tracking pool repositories Closes #38238 and #52300 See merge request gitlab-org/gitlab-ce!22482
| * | Start tracking pool repositoriesNick Thomas2018-11-059-0/+80
| | |
| * | Start tracking shards in the databaseNick Thomas2018-11-056-0/+97
| | |
* | | Merge branch 'sh-fix-issue-52176' into 'master'Yorick Peterse2018-11-053-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-52176Stan Hu2018-11-033-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 Gray2018-11-055-5/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update project and group labels empty state See merge request gitlab-org/gitlab-ce!22745
| * | | | Remove empty state button margin on small viewportsGeorge Tsiolis2018-11-032-1/+2
| | | | |
| * | | | Update project and group labels empty stateGeorge Tsiolis2018-11-024-5/+13
| | | | |
* | | | | Merge branch 'issue_51323' into 'master'Phil Hughes2018-11-0521-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 filterFelipe Artur2018-11-0521-21/+158
|/ / / / /
* | | | | Merge branch 'zj-bump-gitaly-0-128' into 'master'Douwe Maan2018-11-052-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bump Gitaly to 0.128.0 See merge request gitlab-org/gitlab-ce!22802
| * | | | | Bump Gitaly to 0.128.0Zeger-Jan van de Weg2018-11-052-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 Zallmann2018-11-0515-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-buttonsWinnie Hellmann2018-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | app/assets/javascripts/environments/components/environment_item.vue
| * | | | | | Add scheduled_actions to JSON schemaWinnie Hellmann2018-10-241-0/+4
| | | | | | |
| * | | | | | Update translations in locale/gitlab.potWinnie Hellmann2018-10-241-1/+1
| | | | | | |
| * | | | | | Use secondary text color for delayed job timerWinnie Hellmann2018-10-221-1/+4
| | | | | | |
| * | | | | | Add permission check for delayed job actionsWinnie Hellmann2018-10-221-6/+2
| | | | | | |
| * | | | | | Update confirmation modal text for starting delayed jobs immediatelyWinnie Hellmann2018-10-222-2/+2
| | | | | | |
| * | | | | | Merge branch 'master' into scheduled-manual-jobs-environment-play-buttonsWinnie Hellmann2018-10-222003-20531/+164530
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: spec/javascripts/environments/environment_actions_spec.js
| * | | | | | | Add spec for Deployment#scheduled_actionsShinya Maeda2018-10-181-1/+16
| | | | | | | |
| * | | | | | | Make frontend files prettierWinnie Hellmann2018-10-152-2/+7
| | | | | | | |
| * | | | | | | Use regex for the extecped timeShinya Maeda2018-10-121-2/+1
| | | | | | | |
| * | | | | | | Improve deployment entity specShinya Maeda2018-10-121-4/+4
| | | | | | | |
| * | | | | | | Add changelogShinya Maeda2018-10-101-0/+5
| | | | | | | |
| * | | | | | | Fix and add specShinya Maeda2018-10-103-2/+67
| | | | | | | |
| * | | | | | | Fix issue URL of TODO in environment_actions.vueWinnie Hellmann2018-10-091-1/+1
| | | | | | | |
| * | | | | | | Add feature flags for scheduled jobs in environments listWinnie Hellmann2018-10-092-3/+67
| | | | | | | |
| * | | | | | | Add component test for scheduled jobs in environments actions componentWinnie Hellmann2018-10-091-34/+88
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'gitlab.com/master' into ↵Winnie Hellmann2018-10-09753-3382/+8795
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | scheduled-manual-jobs-environment-play-buttons
| * | | | | | | | Display scheduled job actions on environments listWinnie Hellmann2018-10-083-43/+45
| | | | | | | | |
| * | | | | | | | Add scheduled actions in deployment entityShinya Maeda2018-10-043-2/+11
| | | | | | | | |
* | | | | | | | | Merge branch 'qa-batch-comments-e2e-tests' into 'master'Nick Thomas2018-11-057-8/+65
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA Selectors for Batch Comment E2E Automation See merge request gitlab-org/gitlab-ce!22681
| * | | | | | | | | removing duplicate definitionsqa-batch-comments-e2e-testsat.ramya2018-10-311-27/+1
| | | | | | | | | |
| * | | | | | | | | Updating selectors for diff lineat.ramya2018-10-301-1/+1
| | | | | | | | | |
| * | | | | | | | | Adding methodsat.ramya2018-10-301-1/+1
| | | | | | | | | |
| * | | | | | | | | QA Selectors for Batch Comment E2E Automationat.ramya2018-10-302-1/+27
| | | | | | | | | |
| * | | | | | | | | Updating selectors for diff lineat.ramya2018-10-302-2/+2
| | | | | | | | | |
| * | | | | | | | | Adding methodsat.ramya2018-10-301-1/+32
| | | | | | | | | |
| * | | | | | | | | QA Selectors for Batch Comment E2E Automationat.ramya2018-10-307-8/+34
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fast_project_blob_path' into 'master'Douwe Maan2018-11-0510-46/+98
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of tree rendering in repositories with a lot of items See merge request gitlab-org/gitlab-ce!16511
| * | | | | | | | | | Improve performance of tree rendering in repositories with lots of itemsDrew Blessing2018-10-3110-46/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails is slow to generate paths dynamically especially when called hundreds/thousands of times. Also, rendering many partials hundreds of times can be slower. This change reduces the number of partials rendered and introduces two fast path methods to speed up path generation.
* | | | | | | | | | | Merge branch 'docs/gitlab-pages-permissions' into 'master'Nick Thomas2018-11-051-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add access controlled pages entry to permissions table See merge request gitlab-org/gitlab-ce!22798
| * | | | | | | | | | Add access controlled pages entry to permissions tabledocs/gitlab-pages-permissionsEvan Read2018-11-051-2/+3
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ml-create-user-via-api-qa' into 'master'Grzegorz Bizon2018-11-056-42/+89
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create users via the API See merge request gitlab-org/gitlab-ce!22779
| * | | | | | | | | | Create users via the APIml-create-user-via-api-qaMark Lapierre2018-11-026-42/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows users to be fetched/created via the API.
* | | | | | | | | | | Merge branch '53450-wrong-value-for-kubernetes_version-variable' into 'master'Kamil Trzciński2018-11-052-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump KUBERNETES_VERSION to latest 1.10 series Closes #53450 See merge request gitlab-org/gitlab-ce!22757
View Lorry Controller Status