summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Do not allow password reset for ldap user.Marin Jankovski2014-03-181-1/+1
* Add retry feature to project importDmitriy Zaporozhets2014-03-121-0/+2
* Add ldap check in application_controller and internal apiDmitriy Zaporozhets2014-03-101-1/+14
* Replace backticks with Gitlab::PopenJacob Vosmaer2014-03-031-1/+1
* Merge branch 'db_reaping_frequency' into 'master'Dmitriy Zaporozhets2014-03-011-0/+1
|\
| * Add reaping_frequency for MySQL production DBJacob Vosmaer2014-02-251-0/+1
* | Merge pull request #6420 from Seklfreak/add-piwik-supportDmitriy Zaporozhets2014-02-261-0/+4
|\ \
| * | Added Piwik supportSebastian Winkler2014-02-231-0/+4
| |/
* | Add default settings to test env. Removed wrong comment for rack_profilerDmitriy Zaporozhets2014-02-262-1/+5
* | Enable SQL queries in mini-profilerDmitriy Zaporozhets2014-02-261-0/+7
* | Move services for collecting items to FindersDmitriy Zaporozhets2014-02-251-2/+2
* | Send emails from the authorPierre de La Morinerie2014-02-191-1/+1
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-02-141-0/+1
|\
| * Add email aliases for usersJason Hollingsworth2014-02-131-0/+1
* | Merge pull request #6258 from zzet/patch-6Dmitriy Zaporozhets2014-02-131-1/+3
|\ \ | |/ |/|
| * Add emoji images to asset load path.Andrew Kumanyaev2014-02-061-1/+3
* | code refactor as per standardsGitLab2014-02-111-1/+1
* | merge with upstream masterGitLab2014-02-0621-108/+195
|\ \ | |/
| * Change Devise.confirm_within to Devise.allow_unconfirmed_access_forAthos Ribeiro2014-02-031-2/+2
| * Merge pull request #5957 from ninech/dont-depend-on-appid-and-appsecretDmitriy Zaporozhets2014-02-011-4/+10
| |\
| | * Merge branch 'master' into dont-depend-on-appid-and-appsecretRaffael Schmid2014-01-234-5/+23
| | |\
| | * | refactor omniauth configuration methodRaffael Schmid2013-12-301-4/+10
| * | | Remove python from installation docsDmitriy Zaporozhets2014-01-301-1/+0
| * | | Merge pull request #5842 from vikraman/patch-1Jacob Vosmaer2014-01-291-1/+1
| |\ \ \
| | * | | Add comment about tls for ldap methodVikraman Choudhury2013-12-131-1/+1
| * | | | Merge pull request #6178 from Popl7/add_group_avatarsDmitriy Zaporozhets2014-01-281-0/+3
| |\ \ \ \
| | * | | | added group avatarsSteven Thonus2014-01-281-0/+3
| * | | | | People keep adding http:// in front of the host.dosire2014-01-271-1/+1
| * | | | | Merge branch 'upload-limits' into 'master'Dmitriy Zaporozhets2014-01-271-1/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Reword the git explanation.dosire2014-01-271-3/+3
| | * | | | Git over ssh and http are different things.dosire2014-01-221-2/+2
| | * | | | More explanation for upload limits.dosire2014-01-221-0/+1
| | | |_|/ | | |/| |
| * | | | Merge branch 'fix/routing' of /mnt/ebs/repositories/jhworth.developer/gitlab-ceDmitriy Zaporozhets2014-01-271-2/+0
| |\ \ \ \
| | * | | | Add files to path blacklist.Jason Hollingsworth2014-01-241-2/+0
| | |/ / /
| * | | | Fix broken test in spec/models/project_spec.rbJason Hollingsworth2014-01-241-7/+3
| |/ / /
| * | | Merge pull request #6094 from sinm/patch-1Dmitriy Zaporozhets2014-01-221-1/+1
| |\ \ \
| | * | | Updated gitlab.yaml.example's issue_closing_pattern to single quotessinm2014-01-201-1/+1
| * | | | Further explain userPrincipalName settingsJacob Vosmaer2014-01-211-1/+2
| * | | | Explain how to use AD userPrincipalName for loginsJacob Vosmaer2014-01-211-0/+3
| * | | | Refactor search autocomplete. Use ajax for sourceDmitriy Zaporozhets2014-01-181-0/+1
| * | | | Merge branch 'explain_ldap_check' into 'master'Dmitriy Zaporozhets2014-01-171-2/+2
| |\ \ \ \
| | * | | | Explain that `limit` only applies to the checkJacob Vosmaer2014-01-161-2/+2
| * | | | | Fix typo in LDAP explanation commentJacob Vosmaer2014-01-171-1/+1
| * | | | | Explain allow_username_or_email_login LDAP settingJacob Vosmaer2014-01-171-0/+5
| |/ / / /
| * | | | Merge branch 'custom_password_length' into 'master'Dmitriy Zaporozhets2014-01-161-0/+6
| |\ \ \ \
| | * | | | Add instructions for custom password length limitsJacob Vosmaer2014-01-131-0/+6
| * | | | | Always ask for email with github omniauthJeroen van Baarsen2014-01-151-1/+2
| | |/ / / | |/| | |
| * | | | It's a bad idea to use hash symbol in a yaml value without quotessinm2014-01-121-1/+1
| |/ / /
| * | | Fixed the I18n deprecation warningJeroen van Baarsen2014-01-091-0/+1
| * | | Add support for various archive formats.Jason Hollingsworth2014-01-021-1/+1
| | |/ | |/|