Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove unused initializerremove-unused-initializer | Sean McGivern | 2017-05-02 | 1 | -5/+0 |
| | | | | We don't appear to have an `active_record_query_trace` dependency any more. | ||||
* | Resolve "rspec_profiling is enabled for MySQL" | Rémy Coutable | 2017-04-28 | 1 | -4/+4 |
| | |||||
* | Merge branch 'test-pg' into 'master' | Rémy Coutable | 2017-04-24 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Test both PostgreSQL and MySQL for the win Closes #2582 See merge request !10156 | ||||
| * | Set profiler only for postgresql not mysql | Lin Jen-Shin | 2017-04-10 | 1 | -1/+1 |
| | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10156#note_26812609 | ||||
* | | Make location of gitlab_workhorse_secret configurable | Jakub Jirutka | 2017-04-19 | 1 | -0/+6 |
| | | | | | | | | | | | | Hard-coding location of configuration files is very bad practice. This patch applies the same approach as currently used for gitlab_shell_secret file. | ||||
* | | Don't use `send` in settings initializer | Sean McGivern | 2017-04-14 | 1 | -6/+6 |
| | | |||||
* | | Remove unused user activities code | Sean McGivern | 2017-04-14 | 1 | -2/+2 |
| | | |||||
* | | Add new ScheduleUpdateUserActivityWorker and UpdateUserActivityWorker | Rémy Coutable | 2017-04-14 | 1 | -0/+5 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Port 'Add EE usage ping' to CE | Sean McGivern | 2017-04-14 | 1 | -0/+11 |
|/ | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/557 | ||||
* | Change configuration in gitlab.com as trigger_schedule_worker will perform ↵ | Shinya Maeda | 2017-04-06 | 1 | -1/+1 |
| | | | | twice a day 2 | ||||
* | Rename ScheduledTrigger to TriggerSchedule. Because table structure changed. | Shinya Maeda | 2017-04-06 | 1 | -3/+3 |
| | |||||
* | Add config for worker | Shinya Maeda | 2017-04-06 | 1 | -0/+3 |
| | |||||
* | Merge branch 'fix/gh-import-status-check' into 'master' | Sean McGivern | 2017-04-06 | 1 | -0/+3 |
|\ | | | | | | | | | | | | | Periodically mark projects that are stuck in importing as failed Closes #17709 See merge request !10207 | ||||
| * | Periodically mark projects that are stuck in importing as failed | James Lopez | 2017-04-05 | 1 | -0/+3 |
| | | | | | | | | | | | | Adds import jid to projects Refactor middleware to set custom expiration time via sidekiq options Add completed_jids option to sidekiq status and a few other changes | ||||
* | | Deal with Rails autoload instance variable resets | Jacob Vosmaer | 2017-04-05 | 1 | -13/+1 |
|/ | | | | | | | | Rails auto-load (a development feature) can end up resetting instance variables on classes. This breaks Gitlab::GitalyClient, which uses instance variables to keep global hashes to look up channels and addresses. This change adds code that regenerates the hashes if they suddenly become nil. | ||||
* | Enable the `bullet_logger` setting; enable `raise` in test environmentrs-bullet-raise | Robert Speicher | 2017-04-03 | 1 | -4/+9 |
| | |||||
* | Add support for Gitaly calls over TCP connectionfeature/support-grpc-calls-over-tcp-conn | Ahmad Sherif | 2017-04-03 | 1 | -1/+1 |
| | | | | Closes gitaly#166 | ||||
* | Merge branch '24784-system-notes-meta-data' into 'master' | Sean McGivern | 2017-03-30 | 1 | -1/+1 |
|\ | | | | | | | | | Add metadata for system notes See merge request !9964 | ||||
| * | Add system_note_metadata model | Jarka Kadlecova | 2017-03-28 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'gitaly-socket-per-shard' into 'master' | Sean McGivern | 2017-03-29 | 2 | -13/+38 |
|\ \ | |/ |/| | | | | | One Gitaly connection per storage shard See merge request !10150 | ||||
| * | Change socket_path to gitaly_address | Jacob Vosmaer | 2017-03-29 | 1 | -3/+17 |
| | | |||||
| * | Expand relative paths in storages | Jacob Vosmaer | 2017-03-29 | 1 | -10/+19 |
| | | |||||
| * | Separate GRPC channels per repository storage | Jacob Vosmaer | 2017-03-29 | 2 | -2/+4 |
| | | |||||
* | | RSpec profiling: Prepend the branch name with `ce` or `ee` | Rémy Coutable | 2017-03-24 | 1 | -1/+5 |
|/ | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Added Gitlab::Database.config | Yorick Peterse | 2017-03-17 | 1 | -1/+1 |
| | | | | | | | | This returns the ActiveRecord configuration for the current environment. While CE doesn't use this very often, EE will use it in a few places for the database load balancing code. I'm adding this to CE so we don't end up with merge conflicts in this file. | ||||
* | Merge branch 'pages-multiple-ips-doc' into 'master' | Kamil Trzciński | 2017-03-16 | 1 | -2/+2 |
|\ | | | | | | | | | The GitLab Pages external-http and external-https arguments can be specified multiple times See merge request !9812 | ||||
| * | The GitLab Pages external-http and external-https arguments can be specified ↵ | Nick Thomas | 2017-03-08 | 1 | -2/+2 |
| | | | | | | | | multiple times | ||||
* | | Futher rename the CI variableszj-rename-ci-vars | Z.J. van de Weg | 2017-03-16 | 1 | -1/+1 |
| | | |||||
* | | Merge branch '29389-fix-already-initialized-constants' into 'master' | Robert Speicher | 2017-03-14 | 2 | -9/+6 |
|\ \ | | | | | | | | | | | | | | | | | | | Remove explicit `require` calls, and use `require_dependency` when needed Closes #29389 See merge request !9899 | ||||
| * | | Remove explicit `require` calls, and use `require_dependency` when needed29389-fix-already-initialized-constants | Rémy Coutable | 2017-03-13 | 2 | -9/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | See http://guides.rubyonrails.org/autoloading_and_reloading_constants.html for more info. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | Merge branch '25515-delegate-single-discussion-to-new-issue' into 'master' | Douwe Maan | 2017-03-13 | 1 | -7/+11 |
|\ \ \ | |/ / |/| | | | | | | | | Create a new issue for a single discussion See merge request !8266 | ||||
| * | | Don't instrument `app/services/concerns` | Bob Van Landuyt | 2017-03-13 | 1 | -7/+11 |
| | | | |||||
* | | | Merge branch 'backport-cache-middleware-fix' into 'master' | Rémy Coutable | 2017-03-13 | 1 | -0/+24 |
|\ \ \ | |/ / |/| | | | | | | | | Backport cache middleware fix See merge request !9867 | ||||
| * | | Try out the monkey patch to fix the middlewarebackport-cache-middleware-fix | Lin Jen-Shin | 2017-03-11 | 1 | -0/+24 |
| | | | | | | | | | | | | | | | | | | | | | which isn't properly cleaning up whenever something is thrown, not raised. See: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1402#note_25128108 | ||||
* | | | Execute inflections initializer earlierfix/execute-inflections-initializer-early | Douglas Barbosa Alexandre | 2017-03-10 | 1 | -0/+0 |
|/ / | |||||
* | | Enable snippets for new projects by defaultenable-snippets-by-default | Sean McGivern | 2017-03-10 | 1 | -1/+1 |
| | | | | | | | | | | If there is an existing gitlab.yml file with snippets explicitly disabled, they won't be enabled with this change. | ||||
* | | Improve storage validation after configuration structure updatestorage-validation-improvement | Alejandro Rodríguez | 2017-03-08 | 1 | -6/+10 |
|/ | | | | | | | | | | Besides improving the error message to specify what exactly you need to do to solve the error, we now don't skip all storage validations on the test environment, so that you also get a nice error message if you're running tests. Now if conditions are met to skip valitaions (test env or env variable) we still make sure the settings _look_ sane, we just skip verifying the paths exists and meet the given conditions. | ||||
* | Clear AR connections before starting Sidekiq | Yorick Peterse | 2017-03-08 | 1 | -0/+6 |
| | | | | | | | This should ensure that connections obtained before starting Sidekiq are not leaked, leading to connection timeouts. Fixes gitlab-com/infrastructure#1139 | ||||
* | Merge branch '29005-rspec-profiling-errors-to-warnings' into 'master' | Robert Speicher | 2017-03-07 | 1 | -9/+28 |
|\ | | | | | | | | | | | | | Swallow collection errors in RspecProfiling Closes #29005 See merge request !9765 | ||||
| * | Swallow collection errors in RspecProfiling | Nick Thomas | 2017-03-07 | 1 | -9/+28 |
| | | |||||
* | | Merge branch '28447-hybrid-repository-storages' into 'master' | Sean McGivern | 2017-03-07 | 2 | -9/+26 |
|\ \ | | | | | | | | | | | | | Update storage settings to allow extra values per shard See merge request !9597 | ||||
| * | | Update storage settings to allow extra values per shard28447-hybrid-repository-storages | Alejandro Rodríguez | 2017-03-03 | 2 | -9/+26 |
| | | | | | | | | | | | | | | | | | | | | | This will be necessary when adding gitaly settings. This version doesn't make any functional changes, but allows us to include this breaking change in 9.0 and add the needed extra settings in the future with backwards compatibility | ||||
* | | | Merge branch 'rfr-20170307-change-default-project-number-limit' into 'master' | James Lopez | 2017-03-07 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | Change project count limit from 10 to 100000 See merge request !9767 | ||||
| * | | | Change project count limit from 10 to 100000rfr-20170307-change-default-project-number-limit | Regis Freyd | 2017-03-07 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Add specs for Doorkeeper resource_owner_authenticator | Markus Koller | 2017-03-07 | 1 | -2/+2 |
| | | | |||||
* | | | Implement OpenID Connect identity provider | Markus Koller | 2017-03-07 | 3 | -2/+48 |
|/ / | |||||
* | | Merge branch 'backup_storage_class' into 'master' | Rémy Coutable | 2017-03-06 | 1 | -0/+1 |
|\ \ | | | | | | | | | | | | | Add storage class configuration option for Amazon S3 remote backups See merge request !9599 | ||||
| * | | Add storage class configuration option for Amazon S3 remote backups | Jon Keys | 2017-02-28 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch '27523-make-stuck-build-detection-more-performant' into 'master' | Kamil Trzciński | 2017-03-06 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Make stuck builds detection more performant Closes #27523 See merge request !9025 | ||||
| * | | | Renable StuckCiBuildsWorker to StucjCiJobsWorker27523-make-stuck-build-detection-more-performant | Tomasz Maczukin | 2017-03-03 | 1 | -3/+3 |
| | | | |