summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Remove the `:coffee` and `:coffeescript` Haml filtersrs-remove-coffee-filtersRobert Speicher2016-01-111-0/+6
* Optimize LDAP and add a search timeoutDrew Blessing2016-01-112-0/+6
* Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-081-3/+3
|\
| * Merge branch 'issue_3076' into 'master' Drew Blessing2016-01-081-3/+3
| |\
| | * Fix problem with projects ending with .keys #3076Jose Corcuera2016-01-061-3/+3
* | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-081-0/+9
|\ \ \ | |/ /
| * | Add two custom Date/Time conversion formatsRobert Speicher2016-01-071-0/+9
* | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-071-0/+18
|\ \ \ | |/ /
| * | Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-071-0/+18
| |/
* | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-0631-191/+388
|\ \ | |/
| * Track total query/view timings in transactionsYorick Peterse2016-01-041-0/+1
| * Removed tracking of hostnames for metricsYorick Peterse2015-12-311-1/+0
| * Removed tracking of raw SQL queriesYorick Peterse2015-12-311-1/+0
| * Merge branch 'remove-whenever-schedule' into 'master' Robert Speicher2015-12-301-8/+0
| |\
| | * We don't use whenever anymore. Lets remove the schedule fileJeroen van Baarsen2015-12-301-8/+0
| * | Added additional config environmental variables to help Debian packagingGabriel Mazetto2015-12-301-3/+3
| |/
| * reCAPTCHA is configurable through Admin Settings, no reload needed.Gabriel Mazetto2015-12-283-18/+0
| * Merge branch 'relocate-influxdb-settings' into 'master' Yorick Peterse2015-12-282-24/+10
| |\
| | * Move InfluxDB settings to ApplicationSettingrelocate-influxdb-settingsYorick Peterse2015-12-282-24/+10
| * | Fixed syntax in gitlab.yml.exampleYorick Peterse2015-12-281-1/+1
| * | Merge branch 'restart-settings-are-moved-too' into 'master' Dmitriy Zaporozhets2015-12-281-2/+2
| |\ \ | | |/ | |/|
| | * Restart settings are moved too.Sytse Sijbrandij2015-12-281-2/+2
| * | Merge branch 'influxdb' into 'master' Dmitriy Zaporozhets2015-12-282-0/+78
| |\ \
| | * | Added host option for InfluxDBinfluxdbYorick Peterse2015-12-281-0/+1
| | * | Instrument all ActiveRecord model methodsYorick Peterse2015-12-171-0/+21
| | * | Only track method calls above a certain thresholdYorick Peterse2015-12-171-0/+3
| | * | Instrument Gitlab::Shel and Gitlab::GitYorick Peterse2015-12-171-0/+12
| | * | Use custom code for instrumenting method callsYorick Peterse2015-12-171-1/+0
| | * | Storing of application metrics in InfluxDBYorick Peterse2015-12-172-0/+42
| * | | Merge branch 'environment-variables-in-the-app' into 'master' Dmitriy Zaporozhets2015-12-282-1/+10
| |\ \ \
| | * | | Thanks Robert for the corrections in the environment variables docs.environment-variables-in-the-appSytse Sijbrandij2015-12-281-1/+1
| | | |/ | | |/|
| | * | Add documentation and example file for environent variables.Sytse Sijbrandij2015-12-271-0/+9
| | * | Use environment variables to configure GitLab.Sytse Sijbrandij2015-12-271-1/+1
| * | | Add documentation for using reCAPTCHAadd-recaptcha-supportStan Hu2015-12-271-1/+1
| * | | Add support for Google reCAPTCHA in user registration to prevent spammersStan Hu2015-12-273-0/+19
| |/ /
| * | Grace period support for TFAGabriel Mazetto2015-12-241-0/+1
| * | Hotfix for sidekiq-cron being loaded from Settingslogic with defaultsGabriel Mazetto2015-12-222-2/+6
| * | Merge branch 'feature/sidekiq-cron-config' into 'master' Dmitriy Zaporozhets2015-12-224-15/+20
| |\ \
| | * | Sidekiq-cron configuration moved to gitlab.ymlfeature/sidekiq-cron-configGabriel Mazetto2015-12-144-15/+20
| * | | Merge branch 'admin_add_identity' into 'master' Robert Speicher2015-12-211-1/+1
| |\ \ \
| | * | | Allow admin to create new user identitiesDrew Blessing2015-12-151-1/+1
| * | | | Merge branch 'add_email_unlock' into 'master' Robert Speicher2015-12-211-2/+2
| |\ \ \ \
| | * | | | Allow account unlock via emailDrew Blessing2015-12-141-2/+2
| | |/ / /
| * | | | Merge branch 'tduehr/gitlab-ce-cas-support'Douwe Maan2015-12-213-0/+27
| |\ \ \ \
| | * | | | add CAS authentication supporttduehr2015-12-143-0/+27
| | |/ / /
| * | | | Backport JIRA serviceDrew Blessing2015-12-181-1/+1
| | |_|/ | |/| |
| * | | Fixed Rubocop offensesGabriel Mazetto2015-12-152-6/+6
| |/ /
| * | Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-141-45/+21
| |\ \
| | * \ Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-141-34/+21
| | |\ \
| | | * | Migrate CI::Project to ProjectKamil Trzcinski2015-12-111-34/+21
View Lorry Controller Status