summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Merge branch ↵Kamil Trzciński2019-07-024-4/+16
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '63869-store-prometheus-metrics-in-separate-dirs-in-test-and-prod' into 'master' Use separate Prometheus metrics dirs in dev/test Closes #63869 See merge request gitlab-org/gitlab-ce!30253
| | * | | | | | | Use separate Prometheus metrics dirs in dev/test63869-store-prometheus-metrics-in-separate-dirs-in-test-and-prodAleksei Lipniagov2019-07-024-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store Sidekiq and Web server metrics from Prometheus in separate directories in `development` and `test` environments.
| * | | | | | | | Merge branch 'use-pg-9.6.11-on-ci' into 'master'Stan Hu2019-07-023-2/+7
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use PostgreSQL 9.6.11 in CI tests See merge request gitlab-org/gitlab-ce!30270
| | * | | | | | | | Use PostgreSQL 9.6.11 in CI testsTakuya Noguchi2019-07-033-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify the minor version of postgresql for CI Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | | | | | | Merge branch '62756-include-user-info-in-access-logs' into 'master'Stan Hu2019-07-022-4/+53
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include username in auth log Closes #62756 See merge request gitlab-org/gitlab-ce!29821
| | * | | | | | | | Include user id and username in auth logMayra Cabrera2019-07-022-4/+53
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetches user based on the value of 'rack.attack.match_discriminator' Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62756
| * | | | | | | | Merge branch '50228-deploy-tokens-custom-username' into 'master'Mayra Cabrera2019-07-0213-5/+124
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Custom username for deploy tokens See merge request gitlab-org/gitlab-ce!29639
| | * | | | | | | | Add username to deploy tokensKrasimir Angelov2019-07-0213-5/+124
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new attribute is optional and used when set instead of the default format `gitlab+deploy-token-#{id}`. Empty usernames will be saved as null in the database. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/50228.
| * | | | | | | | Merge branch 'master' into 'master'Mayra Cabrera2019-07-021-0/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Jekyll Pages template: LC_ALL=C.UTF-8 See merge request gitlab-org/gitlab-ce!29907
| | * | | | | | | LC_ALL=C.UTF-8Pat Myron2019-07-021-0/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'unicorn-sampler-fix' into 'master'Kamil Trzciński2019-07-022-6/+9
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start UnicornSampler in master process Closes #63830 See merge request gitlab-org/gitlab-ce!30215
| | * | | | | | | Start UnicornSampler in master processJan Provaznik2019-07-022-6/+9
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using `on_master_start` assures that the sampler is started in master process and not in worker processes.
| * | | | | | | Merge branch '12534-clusters' into 'master'Phil Hughes2019-07-021-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backports css class used in EE specs Closes gitlab-ee#12534 See merge request gitlab-org/gitlab-ce!30258
| | * | | | | | | Backports css class used in EE specs12534-clustersFilipa Lacerda2019-07-021-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch '12537-settings-general' into 'master'Phil Hughes2019-07-021-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for app/views/groups/settings/_general.html.haml Closes gitlab-ee#12537 See merge request gitlab-org/gitlab-ce!30257
| | * | | | | | | | Removes EE differences12537-settings-generalFilipa Lacerda2019-07-021-1/+1
| | |/ / / / / / /
| * | | | | | | | Merge branch 'clarify-team-group-stage-labels' into 'master'Mek Stittri2019-07-021-15/+70
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile our team, group label definitions with our organization structure See merge request gitlab-org/gitlab-ce!29714
| | * | | | | | | | Reconcile our team, group label definitions with our organization structureMek Stittri2019-07-021-15/+70
| |/ / / / / / / /
| * | | | | | | | Merge branch '63690-issue-trackers-title' into 'master'Dmitriy Zaporozhets2019-07-0221-102/+490
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use title and description fields for issue trackers Closes #63690 See merge request gitlab-org/gitlab-ce!30096
| | * | | | | | | | Use title and description fields for issue trackers63690-issue-trackers-titleJarka Košanová2019-07-0221-102/+490
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - instead of using properties - backward compatibility has to be kept for now
| * | | | | | | | | Merge branch 'sh-cache-flipper-names-memory-cache' into 'master'Rémy Coutable2019-07-023-2/+9
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache Flipper persisted names directly to local memory storage See merge request gitlab-org/gitlab-ce!30265
| | * | | | | | | | | Cache Flipper persisted names directly to local memory storagesh-cache-flipper-names-memory-cacheStan Hu2019-07-023-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that application settings are no longer dominating network traffic, we see that the Feature#persisted_names is using a significant amount of CPU and network bandwidth for Redis. Move this cache into the thread-local memory storage to reduce Redis overhead.
| * | | | | | | | | | Merge branch 'leipert-prefer-offline-yarn' into 'master'Stan Hu2019-07-023-5/+5
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefer offline install for yarn See merge request gitlab-org/gitlab-ce!30267
| | * | | | | | | | | Prefer offline install for yarnLukas Eipert2019-07-023-5/+5
| | |/ / / / / / / /
| * | | | | | | | | Merge branch 'slaughter-codeowners' into 'master'Paul Slaughter2019-07-021-2/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add @pslaughter to CODEOWNERS See merge request gitlab-org/gitlab-ce!30252
| | * | | | | | | | | Add @pslaughter to CODEOWNERSWinnie Hellmann2019-07-021-2/+2
| |/ / / / / / / / /
| * | | | | | | | | Merge branch '62214-namespaces-storage-statistics-on-database' into 'master'Kamil Trzciński2019-07-0220-6/+719
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Step 2 of #62214: Includes logic to update namespaces storage statistics Closes #62214 See merge request gitlab-org/gitlab-ce!28996
| | * | | | | | | | Includes logic to persist namespace statisticsMayra Cabrera2019-07-0220-6/+719
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add two new ActiveRecord models: - RootNamespaceStoragestatistics will persist root namespace statistics - NamespaceAggregationSchedule will save information when a new update to the namespace statistics needs to be scheduled - Inject into UpdateProjectStatistics concern a new callback that will call an async job to insert a new row onto NamespaceAggregationSchedule table - When a new row is inserted a new job is scheduled. This job will update call an specific service to update the statistics and after that it will delete thee aggregated scheduled row - The RefresherServices makes heavy use of arel to build composable queries to update Namespace::RootStorageStatistics attributes. - Add an extra worker to traverse pending rows on NAmespace::AggregationSchedule table and schedule a worker for each one of this rows. - Add an extra worker to traverse pending rows on NAmespace::AggregationSchedule table and schedule a worker for each one of this rows
| * | | | | | | | Merge branch '59177-squash-old-migrations' into 'master'harish-and-cindy-ssl-check-rake-taskharish-and-cindy-ldap-sync-rake-tasksDmitriy Zaporozhets2019-07-02876-22421/+1855
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squash old migrations Closes #59177 See merge request gitlab-org/gitlab-ce!30226
| | * | | | | | | | Run the db:rollback-pg CI job from 2018Nick Thomas2019-07-021-1/+1
| | | | | | | | | |
| | * | | | | | | | Remove migrations from setup_postgresqlNick Thomas2019-07-021-14/+0
| | | | | | | | | |
| | * | | | | | | | Remove background migrations for old schemasNick Thomas2019-07-0213-1637/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the assumption that a background migration whose specs need a schema older than 2018 is obsoleted by this migration squash, we can remove both specs and code for those that fail to run in CI as a result of the schema at that date no longer existing. This is true for all but the MigrateStageStatus background migration, which is also used from the MigrateBuildStage background migration.
| | * | | | | | | | Remove migration specs from 201[4567]Nick Thomas2019-07-0246-2948/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the migrations are gone, we don't need these specs either
| | * | | | | | | | Bring the InitSchema migration up to standardNick Thomas2019-07-021-1/+11
| | | | | | | | | |
| | * | | | | | | | Squash old migrationsNick Thomas2019-07-02815-17821/+1844
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the `squasher` gem to squash migrations older than the start of 2018
| * | | | | | | | | Merge branch ↵Phil Hughes2019-07-0212-89/+219
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '45104-special-characters-in-project-name-path-prevent-users-from-using-the-container-registry' into 'master' Resolve "Special characters in project name/path prevent users from using the container registry" Closes #62770 and #45104 See merge request gitlab-org/gitlab-ce!29616
| | * | | | | | | | | Registry component now includes error messagesNick Kipling2019-07-0212-89/+219
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes changes to the Vue container registry component to support the display of an empty message and error message when invalid characters are found in the group, project or branch name. repositories/index.html.haml has been changed to remove the content and place into Vue component.
| * | | | | | | | | Merge branch 'feature/uninstall_cluster_ingress' into 'master'Dmitriy Zaporozhets2019-07-027-30/+42
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature/uninstall cluster ingress See merge request gitlab-org/gitlab-ce!29977
| | * | | | | | | | | Enables ingress for uninstallationJoão Cunha2019-07-027-30/+42
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - JupyterHub must not be available (installed or updated)
| * | | | | | | | | Merge branch 'disable-junit-reports' into 'master'Marin Jankovski2019-07-022-6/+6
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable juint reports tmp See merge request gitlab-org/gitlab-ce!30254
| | * | | | | | | | | Disable juint reports tmpdisable-junit-reportsSteve Azzopardi2019-07-022-6/+6
| | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The junit reports are creating 90mb files inside of redis for `gitlab-ce/ee` project. There is an ongoing production incident https://gitlab.com/gitlab-com/gl-infra/production/issues/928 that is because of high CPU uitlaization on the redis nodes. GitLab-ce/ee are the highest consumers of memory becuase of these junit reports. This is a bandage until we can scale redis properly.
| * | | | | | | | | Merge branch '60859-upload-after-delete' into 'master'Phil Hughes2019-07-0212-15/+173
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Cannot delete and upload file of the same name in the Web IDE" Closes #60859 See merge request gitlab-org/gitlab-ce!30239
| | * | | | | | | | | Allow adding new entries to existing pathDenys Mishunov2019-07-0212-15/+173
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an entry has been removed from the tree and later, during the same session, a user is trying to add a new item with the same name/path we should allow for that as long as the original entry is marked with `deleted`.
| * | | | | | | | | Merge branch '12532-services-form' into 'master'Phil Hughes2019-07-021-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for app/views/admin/services/_form.html.haml Closes gitlab-ee#12532 See merge request gitlab-org/gitlab-ce!30231
| | * | | | | | | | | Removes EE differences12532-services-formFilipa Lacerda2019-07-011-1/+1
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch 'sh-add-thread-memory-cache' into 'master'Rémy Coutable2019-07-0213-53/+105
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a memory cache local to the thread to reduce Redis load Closes #63977 See merge request gitlab-org/gitlab-ce!30233
| | * | | | | | | | Fix failing spec/models/user_spec.rbStan Hu2019-07-021-1/+1
| | | | | | | | | |
| | * | | | | | | | Use an uncached application setting for usage ping checksStan Hu2019-07-022-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The introduction of the in-memory cache for application settings had a side effect of making it harder to invalidate changes when the settings occur. We now bypass the cache because it's possible the admin enabled the usage ping, and we don't want to annoy the user again if they already set the value. To avoid causing significant load on the system, we add an extra check to ensure the user is an admin. and we don't want to annoy the user again if they already set the value. This is a bit of hack, but the alternative would be to put in a more complex cache invalidation step. Since this call only gets called in the uncommon situation where the user is an admin and the only user in the instance, this shouldn't cause too much load on the system.
| | * | | | | | | | Fix broken specs due to cached application settingsStan Hu2019-07-014-42/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The /admin panel will now always return an uncached application setting to ensure it always has the most current info.
| | * | | | | | | | Fix specs in spec/models/concerns/cacheable_attributes_spec.rbStan Hu2019-07-011-4/+5
| | | | | | | | | |