| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Try signing in the user after user confirmation is correct and redirect to ↵ | Marin Jankovski | 2014-10-02 | 1 | -1/+1 |
| | | | | | dashboard, otherwise redirect to signin page | ||||
| * | Merge branch 'add_active_directory_ldap_option' into 'master' | Dmitriy Zaporozhets | 2014-10-01 | 2 | -0/+7 |
| |\ | | | | | | | | | | | | | | | Add active directory ldap option Fixes #1557 See merge request !1139 | ||||
| | * | Add option to gitlab config to specify if LDAP server is active directory. | Marin Jankovski | 2014-09-30 | 2 | -0/+7 |
| | | | |||||
| * | | Add region to backup upload config in gitlab.yml | Jacob Vosmaer | 2014-09-30 | 1 | -0/+1 |
| |/ | |||||
| * | Add backup upload support to the rake task | Jacob Vosmaer | 2014-09-29 | 2 | -0/+13 |
| | | |||||
| * | Raw implementation of commits stats page | Dmitriy Zaporozhets | 2014-09-26 | 1 | -1/+5 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Rewrite graphs feature | Dmitriy Zaporozhets | 2014-09-26 | 1 | -1/+0 |
| | | | | | | | | | * remove commits stats page (will be replaced by graphs) * remove additions/deletions from graph because of bad performance * keep graph logic in gitlab Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Merge branch 'gitlab_ldap_filter' into 'master' | Sytse Sijbrandij | 2014-09-24 | 1 | -1/+3 |
| |\ | | | | | | | | | | | Add more LDAP user_filter documentation See merge request !1115 | ||||
| | * | Add more LDAP user_filter documentation | Jacob Vosmaer | 2014-09-24 | 1 | -1/+3 |
| | | | |||||
| * | | Merge pull request #7317 from drpdigitalmedia/master | Dmitriy Zaporozhets | 2014-09-23 | 1 | -0/+3 |
| |\ \ | | | | | | | set the collation to utf8_general_ci | ||||
| | * | | set the collation to utf8_general_ci | Alexander Mills | 2014-08-13 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I get problems with strange characters in merge requests unless the collation is set to utf8_general_ci set the collation to utf8_general_ci I get problems with strange characters in merge requests unless the collation is set to utf8_general_ci set the collation to utf8_general_ci I get problems with strange characters in merge requests unless the collation is set to utf8_general_ci | ||||
| * | | | Increase unicorn timeout to 60 seconds | Dmitriy Zaporozhets | 2014-09-23 | 2 | -2/+2 |
| | |/ |/| | |||||
| * | | Merge branch 'refator-members-logic' of ↵ | Dmitriy Zaporozhets | 2014-09-17 | 2 | -3/+7 |
| |\ \ | | | | | | | | | | https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre | ||||
| | * | | Move hook models in separate dir | Dmitriy Zaporozhets | 2014-09-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | Fix STI+polymorphic for Group <-> GroupMember | Dmitriy Zaporozhets | 2014-09-14 | 1 | -2/+1 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | Huge replace of old users_project and users_group references | Dmitriy Zaporozhets | 2014-09-14 | 1 | -1/+5 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Add dormant New Relic gem | Jacob Vosmaer | 2014-09-16 | 1 | -0/+16 |
| | | | | | | | | | | | | | The gem can be enabled and configured via environment variables. | ||||
| * | | | Merge branch 'redis_socket' into 'master' | Dmitriy Zaporozhets | 2014-09-15 | 1 | -1/+1 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | Use sockets to connect to Redis See merge request !1088 | ||||
| | * | | Use sockets to connect to Redis | Jacob Vosmaer | 2014-09-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #7749 from wesgurn/master | Dmitriy Zaporozhets | 2014-09-13 | 2 | -2/+7 |
| |\ \ \ | | | | | | | | | Adding ability to configure webhook timeout via gitlab.yml | ||||
| | * | | | Adding ability to configure webhook timeout via gitlab.yml | Wes Gurney | 2014-09-12 | 2 | -2/+7 |
| | |/ / | |||||
| * | | | Use the default Unicorn socket backlog value: 1024 | Jacob Vosmaer | 2014-09-12 | 1 | -3/+4 |
| |/ / | |||||
| * | | simplify HTTPS setup details | Ben Bodenmiller | 2014-09-07 | 1 | -5/+7 |
| | | | | | | | | | also adds comment about updating nginx files during upgrades | ||||
| * | | Disable allow_username_or_email_login in example | Jacob Vosmaer | 2014-08-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | The example LDAP configuration in gitlab.yml enables the allow_username_or_email_login setting. Because the effect of this setting is somewhat counterintuitive, I propose we make 'false' the example default. The settings initializer already sets this setting to 'false'. | ||||
| * | | Move cache setup to config/application.rb | Jacob Vosmaer | 2014-08-29 | 2 | -20/+19 |
| | | | | | | | | | | | | | | | | | | | 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 | 3 | -11/+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 | 2 | -10/+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 |
| |/ / | |||||
| * | | make configuration comment spacing consistent | Ben Bodenmiller | 2014-08-22 | 1 | -1/+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 |
| | | | |||||
| * | | Merge pull request #7281 from skv-headless/diff-unfold | Dmitriy Zaporozhets | 2014-08-15 | 1 | -1/+3 |
| |\ \ | | | | | | | unfold commits | ||||
| | * | | diff unfold | skv | 2014-08-14 | 1 | -1/+3 |
| | |/ | |||||
| * | | Mention username option for developers in gitlab.yml | Dmitriy Zaporozhets | 2014-08-14 | 1 | -0/+5 |
| |/ | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Disable debug assets | Jan-Willem van der Meer | 2014-08-12 | 1 | -1/+1 |
| | | | | | | It's good for debugging javacsript, but creates massive amounts of http request by adding each javascript individually. Only turn it on while debugging js code. | ||||
| * | Dont stub gitlab-shell calls. Make test environment closer to real one | Dmitriy Zaporozhets | 2014-07-31 | 1 | -0/+6 |
| | | |||||
| * | Add create/update to Labels controller | Dmitriy Zaporozhets | 2014-07-30 | 1 | -1/+1 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Log Sidekiq arguments | Jacob Vosmaer | 2014-07-28 | 1 | -0/+4 |
| | | |||||
| * | Merge branch 'test_regex_with_rubular' into 'master' | Sytse Sijbrandij | 2014-07-27 | 1 | -0/+1 |
| |\ | | | | | | | | | | | Add a tip on how to test regular expressions See merge request !994 | ||||
| | * | Add a tip on how to test regular expressions | Jacob Vosmaer | 2014-07-25 | 1 | -0/+1 |
| | | | |||||
| * | | Most starred projects page for Explore area | Dmitriy Zaporozhets | 2014-07-25 | 1 | -0/+1 |
| |/ | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into ↵ | Dmitriy Zaporozhets | 2014-07-24 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | | | | | cirosantilli-star Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG | ||||
| | * | Add project stars. | Ciro Santilli | 2014-07-17 | 1 | -0/+1 |
| | | | |||||
| * | | Merge pull request #7316 from ayr-ton/master | Dmitriy Zaporozhets | 2014-07-23 | 2 | -0/+2 |
| |\ \ | | | | | | | Add support to set satellites timeout | ||||
| | * | | Add support to set satellites timeout | Ayrton Araújo | 2014-07-21 | 2 | -0/+2 |
| | |/ | |||||
| * | | Refactor explore area | Dmitriy Zaporozhets | 2014-07-23 | 1 | -5/+13 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |