Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Convert hashes to ruby 1.9 style | Dmitriy Zaporozhets | 2015-02-02 | 2 | -7/+7 | |
| | | | ||||||
* | | | Allow configuring protection of the default branch upon first push | Marco Wessel | 2015-01-25 | 1 | -0/+1 | |
|/ / | ||||||
* | | Increase password reset timeout since other people trigger it when they ↵ | Sytse Sijbrandij | 2015-01-23 | 1 | -1/+2 | |
| | | | | | | | | create an account for you. | |||||
* | | allow to use http in redirect url | Valery Sizov | 2015-01-22 | 1 | -0/+6 | |
| | | ||||||
* | | Allow commit messages to close several issues at once (thanks @123Haynes | jubianchi | 2015-01-20 | 1 | -1/+1 | |
| | | | | | | | | for his work and help) | |||||
* | | Application admin scaffold | Valery Sizov | 2015-01-17 | 1 | -1/+1 | |
| | | ||||||
* | | Fix signup settings | Dmitriy Zaporozhets | 2015-01-16 | 1 | -1/+1 | |
| | | ||||||
* | | Enable signup by default | Jacob Vosmaer | 2015-01-14 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'oauth_api_doc' into 'master' | Dmitriy Zaporozhets | 2015-01-13 | 1 | -0/+5 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | OAuth2 API documentation https://dev.gitlab.org/gitlab/gitlabhq/issues/1713 See merge request !1388 | |||||
| * | | OAuth API documentation update | Valery Sizov | 2015-01-12 | 1 | -0/+5 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'dev_gitlab_org/master' into git-http-blacklist | Jacob Vosmaer | 2015-01-08 | 2 | -0/+93 | |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: CHANGELOG | |||||
| * | | Merge branch 'master' into oauth2_provider | Dmitriy Zaporozhets | 2014-12-25 | 1 | -0/+1 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/layouts/nav/_profile.html.haml | |||||
| | * | | Hide rack profiler by default | Dmitriy Zaporozhets | 2014-12-24 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | | Doorkeeper integration | Valery Sizov | 2014-12-24 | 1 | -0/+91 | |
| |/ / | ||||||
| * | | Css/views cleanup after layout restyle | Dmitriy Zaporozhets | 2014-12-21 | 1 | -0/+1 | |
| |/ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | White-list requests from 127.0.0.1 | Jacob Vosmaer | 2015-01-06 | 1 | -0/+1 | |
| | | | | | | | | | | | | On some misconfigured GitLab servers, if you look in production.log it looks like all requests come from 127.0.0.1. To avoid unwanted banning we white-list 127.0.0.1 with this commit. | |||||
* | | Add more comments explaining how we block IPs | Jacob Vosmaer | 2014-12-18 | 1 | -0/+2 | |
| | | ||||||
* | | Another comment fix | Jacob Vosmaer | 2014-12-16 | 1 | -2/+2 | |
| | | ||||||
* | | Fix copy-paste error in comment | Jacob Vosmaer | 2014-12-16 | 1 | -1/+1 | |
| | | ||||||
* | | Improve Redis::Store monkey-patch robustness | Jacob Vosmaer | 2014-12-16 | 1 | -0/+23 | |
| | | ||||||
* | | Block Git HTTP Basic Auth after 10 failed attempts | Jacob Vosmaer | 2014-12-15 | 3 | -0/+40 | |
|/ | ||||||
* | Use the new SIDEKIQ_MEMORY_KILLER_MAX_RSS variable | Jacob Vosmaer | 2014-12-08 | 1 | -1/+1 | |
| | ||||||
* | Disable Sidekiq arguments logging by default | Jacob Vosmaer | 2014-12-01 | 1 | -1/+1 | |
| | ||||||
* | Add 'MemoryKiller' Sidekiq middleware | Jacob Vosmaer | 2014-11-28 | 1 | -0/+1 | |
| | | | | | | | When enabled, this middleware allows Sidekiq to detect that its RSS has exceeded a maximum value, triggering a graceful shutdown. This middleware should be combined with external process supervision that will restart Sidekiq after the graceful shutdown, such as Runit. | |||||
* | Revert "gitlab shell works if multiple rubies installed" | Dmitriy Zaporozhets | 2014-11-18 | 1 | -1/+19 | |
| | | | | This reverts commit 533f4cdf30b38c587f7a91f0dfd898b907ecd944. | |||||
* | gitlab shell works if multiple rubies installed | Ciro Santilli | 2014-11-18 | 1 | -19/+1 | |
| | | | | | | | | | | | | Before this it would fail because git hooks automatically prepend things to the path, which can lead the wrong Ruby version to be called in which dependencies are not installed. To make sure that this is correct, the forked_merge_requests commented out test that depends on this change was uncommented. For that test to pass, it is also necessary to setup the mock server on port 3001 under test_env.rb. | |||||
* | Add email interceptor to prevent mail sending if email sending is disabled. | Marin Jankovski | 2014-10-27 | 1 | -0/+2 | |
| | ||||||
* | Add settings to disable email sending from GitLab. | Marin Jankovski | 2014-10-27 | 1 | -0/+1 | |
| | ||||||
* | Add timezone configuration to gitlab.yml | Sullivan SENECHAL | 2014-10-21 | 2 | -0/+2 | |
| | ||||||
* | Merge branch 'security-api-internal-publicity' into 'master' | Dmitriy Zaporozhets | 2014-10-20 | 1 | -0/+19 | |
|\ | | | | | | | | | | | | | | | Gitlab-shell identification Part of gitlab/gitlabhq#1528 See merge request !1185 | |||||
| * | add gitlab-shell identification | Valery Sizov | 2014-10-15 | 1 | -0/+19 | |
| | | ||||||
* | | Default the LDAP server label to LDAP | Jan-Willem van der Meer | 2014-10-17 | 1 | -1/+1 | |
| | | ||||||
* | | Prevent redeclaration of LDAP strategy | Jan-Willem van der Meer | 2014-10-17 | 1 | -1/+2 | |
| | | ||||||
* | | Only enable LDAP providers if LDAP is enabled | Jan-Willem van der Meer | 2014-10-15 | 2 | -8/+10 | |
| | | ||||||
* | | Use Hash syntax for LDAP server declaration | Jan-Willem van der Meer | 2014-10-14 | 3 | -10/+12 | |
| | | ||||||
* | | Move dynamic omniauth declarations to initializer | Jan-Willem van der Meer | 2014-10-14 | 1 | -0/+5 | |
| | | ||||||
* | | Apply configuration changes for Multiple LDAP servers | Jan-Willem van der Meer | 2014-10-13 | 3 | -16/+36 | |
|/ | ||||||
* | Add option to gitlab config to specify if LDAP server is active directory. | Marin Jankovski | 2014-09-30 | 1 | -0/+1 | |
| | ||||||
* | Add backup upload support to the rake task | Jacob Vosmaer | 2014-09-29 | 1 | -0/+5 | |
| | ||||||
* | Adding ability to configure webhook timeout via gitlab.yml | Wes Gurney | 2014-09-12 | 1 | -0/+1 | |
| | ||||||
* | Move cache setup to config/application.rb | Jacob Vosmaer | 2014-08-29 | 1 | -20/+0 | |
| | | | | | | | | | Before this change we were trying to configure Rails.cache in an initializer. It seems that by the time the initializers are loaded, Rails.cache is already instantiated, so changing the settings does not achieve anything anymore. This was causing Rails to default to a file storage cache instead of the Redis cache, which in turn broke `rake cache:clear`. | |||||
* | Merge branch 'redis_settings' | Dmitriy Zaporozhets | 2014-08-28 | 2 | -1/+21 | |
|\ | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG | |||||
| * | Hide configuration shenanigans in a block | Jacob Vosmaer | 2014-08-27 | 1 | -14/+16 | |
| | | | | | | | | | | I'm feeling paranoid about the scope variables like redis_config_file get defined in. Hiding it in a block to limit the scope. | |||||
| * | Rename resque_url to redis_url_string | Jacob Vosmaer | 2014-08-27 | 1 | -7/+7 | |
| | | ||||||
| * | Store sessions in a Redis namespace | Jacob Vosmaer | 2014-08-26 | 1 | -1/+1 | |
| | | | | | | | | This makes less of a mess of the Redis root. | |||||
| * | Configure Redis cache for all environments | Jacob Vosmaer | 2014-08-26 | 1 | -0/+18 | |
| | | | | | | | | Also add support for connecting to Redis with Unix sockets. | |||||
* | | Expire Rack sessions after 1 week | Jacob Vosmaer | 2014-08-26 | 1 | -0/+1 | |
|/ | ||||||
* | Create one big regular expresion for Rack::Attack | Jacob Vosmaer | 2014-08-22 | 1 | -6/+6 | |
| | ||||||
* | Change rack attack example. | Marin Jankovski | 2014-08-22 | 1 | -2/+10 | |
| | ||||||
* | Use new git max_size in the settings initializer | Jacob Vosmaer | 2014-08-15 | 1 | -1/+1 | |
| |