Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | |||||
| * | | | Update default configuration of stuck_ci_builds_worker cron interval | Tomasz Maczukin | 2017-03-01 | 1 | -1/+1 |
| |/ / | |||||
* | | | Make Warden set_user hook validate user ip uniquness | Pawel Chojnacki | 2017-03-06 | 1 | -0/+5 |
| | | | | | | | | | | | | + rename shared context | ||||
* | | | Remove unecessary calls to limit_user!, UniqueIps Middleware, and address MR ↵ | Pawel Chojnacki | 2017-03-06 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | review - cleanup formating in haml - clarify time window is in seconds - cleanup straneous chunks in db/schema - rename count_uniqe_ips to update_and_return_ips_count - other | ||||
* | | | Allow limiting logging in users from too many different IPs. | Pawel Chojnacki | 2017-03-06 | 2 | -2/+7 |
| | | | |||||
* | | | Merge branch 'etag-notes-polling' into 'master' | Sean McGivern | 2017-03-06 | 2 | -0/+4 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Use ETag to improve performance of issue notes polling Closes #27582 See merge request !9036 | ||||
| * | | Execute metrics initializer earlieretag-notes-polling | Adam Niedzielski | 2017-03-01 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | This makes sure that Gitlab::Metrics::RackMiddleware is added before Gitlab::EtagCaching::Middleware. | ||||
| * | | Add middleware for ETag caching with Redis | Adam Niedzielski | 2017-03-01 | 1 | -0/+4 |
| |/ | |||||
* | | Add internal endpoint to notify post-receive to Gitalygitaly-post-receive | Alejandro Rodríguez | 2017-03-01 | 1 | -0/+2 |
|/ | |||||
* | Merge branch '27989-disable-counting-tags' into 'master' | Rémy Coutable | 2017-02-23 | 1 | -0/+5 |
|\ | | | | | | | | | | | | | Disable unused tags count cache for Projects, Builds and Runners Closes #27989 See merge request !9467 | ||||
| * | Disable unused tags count cache for Projects, Builds and Runners | Pawel Chojnacki | 2017-02-23 | 1 | -0/+5 |
| | | | | | | | | + remove complete leftover when Issues were tagged using acts_as_taggable | ||||
* | | Revert "Prefer leading style for Style/DotPosition" | Douwe Maan | 2017-02-23 | 1 | -2/+2 |
| | | | | | | | | This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b. | ||||
* | | Manually correct autocorrect | Douwe Maan | 2017-02-23 | 1 | -0/+2 |
| | | |||||
* | | Fix new offenses | Douwe Maan | 2017-02-23 | 1 | -7/+7 |
| | | |||||
* | | Enable Style/WordArray | Douwe Maan | 2017-02-23 | 2 | -9/+9 |
| | | |||||
* | | Enable Style/MultilineArrayBraceLayout | Douwe Maan | 2017-02-23 | 1 | -9/+11 |
| | | |||||
* | | Prefer leading style for Style/DotPosition | Douwe Maan | 2017-02-23 | 1 | -2/+2 |
| | | |||||
* | | Fix code for cops | Douwe Maan | 2017-02-23 | 1 | -21/+23 |
| | | |||||
* | | Enable Style/ConditionalAssignment | Douwe Maan | 2017-02-23 | 1 | -6/+6 |
| | | |||||
* | | Enable Style/SpaceInsideBrackets | Douwe Maan | 2017-02-23 | 3 | -7/+7 |
| | | |||||
* | | Enable Style/MutableConstant | Douwe Maan | 2017-02-23 | 2 | -2/+2 |
|/ | |||||
* | No more and/or | Douwe Maan | 2017-02-21 | 2 | -2/+2 |
| | |||||
* | Merge branch 'authentiq-backchannel-logout' into 'master' | Douwe Maan | 2017-02-20 | 1 | -0/+11 |
|\ | | | | | | | | | Remote logout functionality on Authentiq OAuth provider See merge request !9381 | ||||
| * | Added support for Authentiq Back-Channel Logout | Alexandros Keramidas | 2017-02-20 | 1 | -0/+11 |
| | | |||||
* | | Merge branch 'fix/gb/remove-gitlab-ci-module' into 'master' | Kamil Trzciński | 2017-02-17 | 1 | -8/+0 |
|\ \ | | | | | | | | | | | | | Remove legacy GitlabCi module from initializers See merge request !9279 | ||||
| * | | Remove legacy GitlabCi module from initializersfix/gb/remove-gitlab-ci-module | Grzegorz Bizon | 2017-02-15 | 1 | -8/+0 |
| | | | |||||
* | | | Merge branch '26200-convert-sidebar-to-dropdown' into 'master' | Sean McGivern | 2017-02-17 | 1 | -1/+0 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Resolve "Update global sidebar to dropdown" Closes #26200 See merge request !9199 | ||||
| * | | Remove all gitlab theme related code | Annabel Dunstone Gray | 2017-02-15 | 1 | -1/+0 |
| |/ | |||||
* | | Set `Auto-Submitted: auto-generated` header to emails | Semyon Pupkov | 2017-02-15 | 1 | -0/+1 |
|/ | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20305 | ||||
* | rspec_profiling: Discover the correct branch name in GitLab CI | Nick Thomas | 2017-02-10 | 1 | -0/+8 |
| | |||||
* | Merge branch 'remove-sidekiq-backup-ar-threads' into 'master' | Douwe Maan | 2017-02-06 | 1 | -3/+1 |
|\ | | | | | | | | | | | | | Don't use backup AR connections for Sidekiq Closes #27713 See merge request !9001 | ||||
| * | Don't use backup AR connections for Sidekiqremove-sidekiq-backup-ar-threads | Yorick Peterse | 2017-02-06 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding two extra connections does nothing other than increasing the number of idle database connections. Given Sidekiq uses N threads it can never use more than N AR connections at a time, thus we don't need more. The initializer mentioned the Sidekiq upgrade guide stating this was required. This is false, the Sidekiq upgrade guide states this is necessary for Redis and not ActiveRecord. On GitLab.com this resulted in a reduction of about 80-100 PostgreSQL connections. Fixes #27713 | ||||
* | | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ce | James Edwards-Jones | 2017-02-06 | 2 | -0/+40 |
|\ \ | |/ | | | | | # Conflicts: # db/schema.rb | ||||
| * | Merge branch 'master' into go-go-gadget-webpack | Mike Greiling | 2017-02-03 | 2 | -2/+2 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (181 commits) Fixed adding to list bug Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index Fixed modal lists dropdown not updating when list is deleted Fixed remove btn error after creating new issue in list Removed duplicated test Removed Masonry, instead uses groups of data Uses mixins for repeated functions Fixed up specs Props use objects with required & type values Removes labels instead of closing issue when clicking remove button Fixed JS lint errors Fixed issue card spec Added webkit CSS properties Fixed bug with empty state showing after search Fixed users href path being incorrect Fixed bug where 2 un-selected issues would stay on selected tab Fixed DB schema Changed how components are added in objects Added remove button Add optional id property to the issue schema Fixed issue link href Disabled add issues button if no lists exist ... | ||||
| * | | DRY with Gitlab.config.webpack.dev_server referenceswebpack | Mike Greiling | 2017-02-02 | 1 | -10/+12 |
| | | | |||||
| * | | disable webpack proxy in rspec environment due to conflicts with webmock gem | Mike Greiling | 2017-02-02 | 1 | -12/+20 |
| | | |