summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Use new gems methods.Marin Jankovski2014-03-201-3/+0
|
* Use 2 workers in developmentDmitriy Zaporozhets2014-03-201-0/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* 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
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add ldap check in application_controller and internal apiDmitriy Zaporozhets2014-03-101-1/+14
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Replace backticks with Gitlab::PopenJacob Vosmaer2014-03-031-1/+1
|
* Merge branch 'db_reaping_frequency' into 'master'Dmitriy Zaporozhets2014-03-011-0/+1
|\ | | | | | | DB Reaping Frequency
| * Add reaping_frequency for MySQL production DBJacob Vosmaer2014-02-251-0/+1
| | | | | | | | | | This helped avoid ActiveRecord::ConnectionTimeoutError errors for Sidekiq on GitLab Cloud.
* | Merge pull request #6420 from Seklfreak/add-piwik-supportDmitriy Zaporozhets2014-02-261-0/+4
|\ \ | | | | | | Added Piwik Integration
| * | 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
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Enable SQL queries in mini-profilerDmitriy Zaporozhets2014-02-261-0/+7
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Move services for collecting items to FindersDmitriy Zaporozhets2014-02-251-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Send emails from the authorPierre de La Morinerie2014-02-191-1/+1
|/ | | | | | | | | | | | This changes the email "From" field from "gitlab@example.com" to either: * "John Doe <gitlab@example.com>" if the author of the action is known, * "GitLab <gitlab@example.com>" otherwise. Rationale: this allow mails to appear as if they were sent by the author. It appears in the mailbox more like a real discussion between the sender and the receiver ("John sent: we should refactor this") and less like a robot notifying about something.
* 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
| | | | | | | | | | | | | | | | Emails are used to associate commits with users. The emails are not verified and don't have to be valid email addresses. They are assigned on a first come, first serve basis. Notifications are sent when an email is added.
* | Merge pull request #6258 from zzet/patch-6Dmitriy Zaporozhets2014-02-131-1/+3
|\ \ | |/ |/| Add emoji images to asset load path.
| * 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
| | | | | | | | | | | | | | According to Devise's changelog (https://github.com/plataformatec/devise/blob/master/CHANGELOG.md), Devise.confirm_within was deprecated in favor of Devise.allow_unconfirmed_access_for in version 2.0.0.
| * Merge pull request #5957 from ninech/dont-depend-on-appid-and-appsecretDmitriy Zaporozhets2014-02-011-4/+10
| |\ | | | | | | refactor omniauth configuration method
| | * Merge branch 'master' into dont-depend-on-appid-and-appsecretRaffael Schmid2014-01-234-5/+23
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (238 commits) Version 6.5.1 Fix selectbox when submit MR from fork to origin Fix HELP layout No need for code tag here. Spelling mistake and add links. Warn against RVM. Remove GitHub mention because we also have a GitLab issue tracker now. Replace 6.0-to-6.4.md with 6.0-to-6.5.md Add public assets to gitignore Version 6.5.0 Use 6-5 branch in installation docs Remove deprecated twitter handle. Further explain userPrincipalName settings Update from 6.4 to 6.5 guide Explain how to use AD userPrincipalName for logins More entries to CHANGELOG. Version to rc1 Rephrase LDAP check script output add O'Reilly sponsorship in CHANGELOG Fix select2 css for drop above style Rename "Website url" labels to "Website" ...
| | * | refactor omniauth configuration methodRaffael Schmid2013-12-301-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | This refactoring allows a user to use omniauth providers which do not use ```app_id``` and ```app_secret``` without needing to change the devise configuration.
| * | | Remove python from installation docsDmitriy Zaporozhets2014-01-301-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge pull request #5842 from vikraman/patch-1Jacob Vosmaer2014-01-291-1/+1
| |\ \ \ | | | | | | | | | | Add comment about tls for ldap method
| | * | | Add comment about tls for ldap methodVikraman Choudhury2013-12-131-1/+1
| | | | | | | | | | | | | | | `omniauth-ldap` also supports tls for ldap method
| * | | | Merge pull request #6178 from Popl7/add_group_avatarsDmitriy Zaporozhets2014-01-281-0/+3
| |\ \ \ \ | | | | | | | | | | | | added group avatars
| | * | | | 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
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Upload Limits Better documentation for the upload limit. Please have a hard time when they need to change the upload limits, see https://gitlab.com/gitlab-org/gitlab-ce/issues/5
| | * | | | 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
| | |/ / / | | | | | | | | | | | | | | | Remove empty ErrorsController
| * | | | Fix broken test in spec/models/project_spec.rbJason Hollingsworth2014-01-241-7/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | A test was broken if running on a non-standard port. Made checking for (non-)standard port more robust. Changed gitlab_on_non_standard_port to gitlab_on_standard_port (less negative).
| * | | Merge pull request #6094 from sinm/patch-1Dmitriy Zaporozhets2014-01-221-1/+1
| |\ \ \ | | | | | | | | | | Updated gitlab.yaml.example's issue_closing_pattern to single quotes
| | * | | Updated gitlab.yaml.example's issue_closing_pattern to single quotessinm2014-01-201-1/+1
| | | | | | | | | | | | | | | … (misused double quotes here)
| * | | | 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
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Merge branch 'explain_ldap_check' into 'master'Dmitriy Zaporozhets2014-01-171-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Improve the explanation of the LDAP check script
| | * | | | 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
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Document how to customize password length limits
| | * | | | 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
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #2061 Fix was proposed on twitter by: neic0, in the following tweet: https://twitter.com/neic0/status/423138339806392320
| * | | | It's a bad idea to use hash symbol in a yaml value without quotessinm2014-01-121-1/+1
| |/ / /
View Lorry Controller Status