summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-impersonation-issue' into 'master'Robert Speicher2016-04-251-3/+3
* Merge branch 'variables-build-log' into 'master' Robert Speicher2016-02-091-1/+1
* Merge branch 'expand-git-instrumentation' into 'master'Yorick Peterse2016-02-021-2/+20
* Merge branch 'instrument-gitlab-git-repository' into 'master' Douwe Maan2016-01-261-0/+1
* Merge branch 'sentry-integration' into 'master' Robert Speicher2016-01-201-0/+19
* Merge branch 'fix-gravator-default-url' into 'master' Robert Speicher2016-01-181-8/+14
* Merge branch 'no-mail-during-dev-bootstrap' into 'master' Jacob Vosmaer2016-01-151-0/+2
|\
| * Don't send (fake) email during dev bootstrapno-mail-during-dev-bootstrapJacob Vosmaer2016-01-151-0/+2
* | Merge branch 'import-gh-wiki' into 'master' Douwe Maan2016-01-141-1/+1
|\ \
| * | Remove unnecessary brackets on WIKI_SLUG_ID route constraintsDouglas Barbosa Alexandre2016-01-141-1/+1
| * | Relax constraints for wiki slugDouglas Barbosa Alexandre2016-01-141-1/+1
* | | Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master' Douwe Maan2016-01-141-0/+6
|\ \ \ | |/ / |/| |
| * | Minor improvements, unsubscribe from email footerZeger-Jan van de Weg2016-01-091-1/+1
| * | Unsubscribe from thread through link in email footerZeger-Jan van de Weg2016-01-091-0/+6
* | | Minor improvements in build arfifacts browserci/view-build-artifactsGrzegorz Bizon2016-01-141-2/+2
* | | Improve readability of artifacts `Metadata` related codeGrzegorz Bizon2016-01-141-3/+2
* | | Simplify implementation of build artifacts browser (refactoring)Grzegorz Bizon2016-01-141-0/+1
* | | Disable `:format` in artifacts browser pathGrzegorz Bizon2016-01-141-1/+1
* | | Move artifacts controller level upGrzegorz Bizon2016-01-141-7/+3
* | | Add view action to artifacts controllerGrzegorz Bizon2016-01-141-1/+2
* | | Move build artifacts implementation to separate controllerGrzegorz Bizon2016-01-141-1/+9
* | | Broadcast Messages can now be editedRobert Speicher2016-01-131-1/+1
* | | Merge branch 'fix/reference_filter_uri_decode_error_for_master' into 'master' Douwe Maan2016-01-131-1/+1
|\ \ \
| * | | Use CGI.escape instead of URI.escape, because URI is obsoleted.Jason Lee2016-01-121-1/+1
| | |/ | |/|
* | | Revert "Remove the `:coffee` and `:coffeescript` Haml filters"Robert Speicher2016-01-121-6/+0
|/ /
* | 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
View Lorry Controller Status