summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7994 from cirosantilli/rm-unneeded-autoload-pathDmitriy Zaporozhets2014-10-221-1/+0
|\
| * Remove unneeded app/finders config.autoload pathCiro Santilli2014-10-071-1/+0
* | Add timezone configuration to gitlab.ymlSullivan SENECHAL2014-10-214-0/+8
* | Merge branch 'security-api-internal-publicity' into 'master'Dmitriy Zaporozhets2014-10-201-0/+19
|\ \
| * | add gitlab-shell identificationValery Sizov2014-10-151-0/+19
| |/
* | Default the LDAP server label to LDAPJan-Willem van der Meer2014-10-171-1/+1
* | Prevent redeclaration of LDAP strategyJan-Willem van der Meer2014-10-171-1/+2
* | Only enable LDAP providers if LDAP is enabledJan-Willem van der Meer2014-10-152-8/+10
* | Merge branch 'feature-multiple-ldap-servers' into 'master'Dmitriy Zaporozhets2014-10-144-53/+112
|\ \
| * | Explain new configuration options.Jan-Willem van der Meer2014-10-141-12/+10
| * | Add valid LDAP server for testingJan-Willem van der Meer2014-10-141-2/+1
| * | Use Hash syntax for LDAP server declarationJan-Willem van der Meer2014-10-144-22/+22
| * | Move dynamic omniauth declarations to initializerJan-Willem van der Meer2014-10-141-0/+5
| * | Apply configuration changes for Multiple LDAP serversJan-Willem van der Meer2014-10-133-16/+36
| * | Add config changes for mutliple LDAP support (EE only)Jan-Willem van der Meer2014-10-131-38/+75
| |/
* | Add a link to libravatar doc in gitlab.yml.example.Marin Jankovski2014-10-141-0/+1
|/
* Merge branch 'remove-annoying-i18n-deprecation' into 'master'Marin Jankovski2014-10-071-1/+1
|\
| * Remove I18n.enforce_available_locales deprecation messageremove-annoying-i18n-deprecationDmitriy Zaporozhets2014-10-011-1/+1
* | Try signing in the user after user confirmation is correct and redirect to da...Marin Jankovski2014-10-021-1/+1
|/
* Merge branch 'add_active_directory_ldap_option' into 'master'Dmitriy Zaporozhets2014-10-012-0/+7
|\
| * Add option to gitlab config to specify if LDAP server is active directory.Marin Jankovski2014-09-302-0/+7
* | Add region to backup upload config in gitlab.ymlJacob Vosmaer2014-09-301-0/+1
|/
* Add backup upload support to the rake taskJacob Vosmaer2014-09-292-0/+13
* Raw implementation of commits stats pageDmitriy Zaporozhets2014-09-261-1/+5
* Rewrite graphs featureDmitriy Zaporozhets2014-09-261-1/+0
* Merge branch 'gitlab_ldap_filter' into 'master'Sytse Sijbrandij2014-09-241-1/+3
|\
| * Add more LDAP user_filter documentationJacob Vosmaer2014-09-241-1/+3
* | Merge pull request #7317 from drpdigitalmedia/masterDmitriy Zaporozhets2014-09-231-0/+3
|\ \
| * | set the collation to utf8_general_ciAlexander Mills2014-08-131-0/+3
* | | Increase unicorn timeout to 60 secondsDmitriy Zaporozhets2014-09-232-2/+2
| |/ |/|
* | Merge branch 'refator-members-logic' of https://dev.gitlab.org/dzaporozhets/g...Dmitriy Zaporozhets2014-09-172-3/+7
|\ \
| * | Move hook models in separate dirDmitriy Zaporozhets2014-09-151-0/+1
| * | Fix STI+polymorphic for Group <-> GroupMemberDmitriy Zaporozhets2014-09-141-2/+1
| * | Huge replace of old users_project and users_group referencesDmitriy Zaporozhets2014-09-141-1/+5
* | | Add dormant New Relic gemJacob Vosmaer2014-09-161-0/+16
* | | Merge branch 'redis_socket' into 'master'Dmitriy Zaporozhets2014-09-151-1/+1
|\ \ \ | |/ / |/| |
| * | Use sockets to connect to RedisJacob Vosmaer2014-09-121-1/+1
* | | Merge pull request #7749 from wesgurn/masterDmitriy Zaporozhets2014-09-132-2/+7
|\ \ \
| * | | Adding ability to configure webhook timeout via gitlab.ymlWes Gurney2014-09-122-2/+7
| |/ /
* | | Use the default Unicorn socket backlog value: 1024Jacob Vosmaer2014-09-121-3/+4
|/ /
* | simplify HTTPS setup detailsBen Bodenmiller2014-09-071-5/+7
* | Disable allow_username_or_email_login in exampleJacob Vosmaer2014-08-291-1/+1
* | Move cache setup to config/application.rbJacob Vosmaer2014-08-292-20/+19
* | Merge branch 'redis_settings'Dmitriy Zaporozhets2014-08-283-11/+21
|\ \
| * | Hide configuration shenanigans in a blockJacob Vosmaer2014-08-271-14/+16
| * | Rename resque_url to redis_url_stringJacob Vosmaer2014-08-271-7/+7
| * | Store sessions in a Redis namespaceJacob Vosmaer2014-08-261-1/+1
| * | Configure Redis cache for all environmentsJacob Vosmaer2014-08-262-10/+18
* | | Expire Rack sessions after 1 weekJacob Vosmaer2014-08-261-0/+1
|/ /
* | make configuration comment spacing consistentBen Bodenmiller2014-08-221-1/+1