summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Fix config template from parse errorsStan Hu2015-05-031-3/+3
* Merge branch 'master' into 'master'Achilleas Pipinellis2015-05-031-0/+3
|\
| * Update config.yml.examplewin322015-05-021-1/+4
* | Merge branch 'restrict-signups-to-domains' into 'master'Dmitriy Zaporozhets2015-05-031-0/+1
|\ \
| * | Add application setting to restrict user signups to e-mail domainsStan Hu2015-05-021-0/+1
* | | Make Reply-To config apply to change e-mail confirmation and other notificationsStan Hu2015-05-011-6/+1
|/ /
* | Merge branch 'fix-commit-data-url-generation' into 'master'Douwe Maan2015-04-281-1/+1
|\ \
| * | Fix bug where commit data would not appear in some subdirectoriesStan Hu2015-04-261-1/+1
* | | Merge branch 'rs-issue-2269' into 'master'Dmitriy Zaporozhets2015-04-281-11/+9
|\ \ \
| * | | Set default_url_options in test environments tooRobert Speicher2015-04-251-11/+9
| |/ /
* | | Add new admin settingsVinnie Okada2015-04-261-1/+0
|/ /
* | Merge branch 'atom-feeds-everywhere' into 'master'Dmitriy Zaporozhets2015-04-241-3/+3
|\ \
| * | Add atom feed for project activity.Douwe Maan2015-04-231-3/+3
* | | Add default_url_options initializerRobert Speicher2015-04-231-0/+13
|/ /
* | Merge branch 'rs-rails-env-predicates' into 'master'Dmitriy Zaporozhets2015-04-231-1/+1
|\ \
| * | Fix two places where we should be using `Rails.env.development?`rs-rails-env-predicatesRobert Speicher2015-04-201-1/+1
| |/
* | Merge branch 'master' into new-sidebarDmitriy Zaporozhets2015-04-231-0/+1
|\ \
| * \ Merge branch 'rs-reply-hotkey' into 'master'Dmitriy Zaporozhets2015-04-221-0/+1
| |\ \ | | |/ | |/|
| | * rails g jasmine_rails:installRobert Speicher2015-04-181-0/+1
* | | Start applying new layout to snippets pagesDmitriy Zaporozhets2015-04-221-1/+2
|/ /
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-04-201-2/+2
|\ \
| * | Fix Resource Owner Password Authentication FlowRoshan Gautam2015-04-171-2/+2
| |/
* | Loosen help page parameter constraints for categoryRobert Speicher2015-04-151-1/+1
* | Add constraints to help#show route parametersRobert Speicher2015-04-151-1/+1
* | Add Markdown to Mime typesRobert Speicher2015-04-151-0/+2
* | Revert "Fix and improve help rendering"Robert Speicher2015-04-152-2/+1
|/
* Merge branch 'ldap-block_auto_created_users' into 'master'Dmitriy Zaporozhets2015-04-152-0/+6
|\
| * Clarify config var and add to LDAP docs.ldap-block_auto_created_usersDouwe Maan2015-04-141-1/+3
| * Add config var to block auto-created LDAP users.Douwe Maan2015-04-142-0/+4
* | Merge branch 'invitation' into 'master'Dmitriy Zaporozhets2015-04-151-0/+15
|\ \
| * | Let invites be declined.Douwe Maan2015-04-141-0/+1
| * | Let membership invitations be resent.Douwe Maan2015-04-141-0/+5
| * | Add invites controller.Douwe Maan2015-04-141-0/+9
* | | Merge branch 'google-code-import' into 'master'Douwe Maan2015-04-151-0/+9
|\ \ \ | |_|/ |/| |
| * | Allow user map to be specified.Douwe Maan2015-04-141-0/+3
| * | Allow projects to be imported from Google Code.Douwe Maan2015-04-031-0/+6
* | | Merge branch 'dir-traversal' into 'master'Dmitriy Zaporozhets2015-04-141-4/+4
|\ \ \ | |_|/ |/| |
| * | Fix directory traversal vulnerability around uploads routes.Douwe Maan2015-04-101-4/+4
* | | Merge branch 'ldap_migration'Dmitriy Zaporozhets2015-04-132-2/+13
|\ \ \
| * | | Call your existing LDAP server 'main'Jacob Vosmaer2015-04-132-4/+9
| * | | Simplify legacy LDAP config interpretationJacob Vosmaer2015-04-131-2/+3
| * | | fix ldap identitiesValery Sizov2015-04-111-1/+6
| |/ /
* | | Merge branch 'shell-version-warning' into 'master'Dmitriy Zaporozhets2015-04-131-0/+7
|\ \ \
| * | | Warn when gitlab-shell version doesn't match requirement.shell-version-warningDouwe Maan2015-04-061-0/+7
* | | | Merge branch 'public-deploy-keys' into 'master'Dmitriy Zaporozhets2015-04-131-1/+3
|\ \ \ \
| * | | | Allow admin to create public deploy keys that are accessible to any project.Douwe Maan2015-04-031-1/+3
| | |_|/ | |/| |
* | | | Use `\A` and `\z` in regexes instead of `^` and `$`.Douwe Maan2015-04-101-1/+1
| |_|/ |/| |
* | | Add lib/gitlab.rb to autoload non-conventional pathsRobert Speicher2015-04-091-0/+2
* | | Revert "Preload lib/"Robert Speicher2015-04-091-5/+0
| |/ |/|
* | Merge remote-tracking branch 'github.com/master'Douwe Maan2015-04-042-1/+2
|\ \
View Lorry Controller Status