summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
...
* | 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
|\ \
| * | Fix and improve help renderingSullivan SENECHAL2015-04-032-1/+2
* | | Remove sidekiq-limit_fetch because it require Redis 2.6.no-limit-fetchDouwe Maan2015-04-031-2/+0
* | | Merge branch 'custom-email-reply-to' into 'master'Douwe Maan2015-04-032-0/+2
|\ \ \ | |_|/ |/| |
| * | Add ability to configure Reply-To address in gitlab.ymlStan Hu2015-04-032-0/+2
* | | Merge branch 'configurable-attachment-size' into 'master'Douwe Maan2015-04-031-0/+1
|\ \ \ | |_|/ |/| |
| * | Support configurable attachment size via Application SettingsStan Hu2015-04-021-0/+1
| |/
* | Limit number of concurrent archive_repo jobs to 2.Douwe Maan2015-03-311-0/+2
|/
* Missing dot.Achilleas Pipinellis2015-03-301-1/+1
* Update documentation on issue closing pattern.Achilleas Pipinellis2015-03-301-1/+1
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-291-131/+0
|\
| * update acts-as-taggable-onNihad Abbasov2015-03-291-131/+0
* | Merge branch 'remove_external_trackers_from_yml' into 'master'Dmitriy Zaporozhets2015-03-291-29/+0
|\ \ | |/ |/|
| * We've moved external trackers to service, remove from gitlab.yml.Marin Jankovski2015-03-271-29/+0
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-271-0/+5
|\ \ | |/ |/|
| * Add autocomplete controllerDmitriy Zaporozhets2015-03-261-0/+5
* | Add a note about not adding new setting options to gitlab.yml.Marin Jankovski2015-03-261-0/+5
|/
* Reduce Rack Attack false positives by clearing out auth failure count uponStan Hu2015-03-242-0/+4
* Restyle oauth accounts at profile page and add ability to unlink accountimprove-profileDmitriy Zaporozhets2015-03-211-1/+5
* Fix typo.Marin Jankovski2015-03-201-1/+1
* Change the name of the key used for bitbucket importer.Marin Jankovski2015-03-201-1/+1
* Fix commits routingDmitriy Zaporozhets2015-03-201-2/+1
* Fix commits routing for branches with slashfix-commits-routingDmitriy Zaporozhets2015-03-201-11/+20
* Revert "Increase timeout for Git-over-HTTP requests."Dmitriy Zaporozhets2015-03-192-12/+16
* Remove signout flash message because it also makes no sense.remove-signin-flashDmitriy Zaporozhets2015-03-191-2/+2
* Remove success signin message by deviseDmitriy Zaporozhets2015-03-181-1/+1
* Extend the commit calendar to show the actual commits for a dateHannes Rosenögger2015-03-181-1/+4
* Merge branch 'issue_subscription' into 'master'Dmitriy Zaporozhets2015-03-171-0/+4
|\
| * testsValery Sizov2015-03-161-2/+2
| * SubscriptionValery Sizov2015-03-151-0/+4
View Lorry Controller Status