summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'show_files_with_diff_name' into 'master'Dmitriy Zaporozhets2014-12-111-1/+1
|\
| * Do not check for format on blob diff path.Marin Jankovski2014-12-101-1/+1
* | Merge pull request #8052 from mr-vinn/markdown-previewDmitriy Zaporozhets2014-12-111-4/+1
|\ \ | |/ |/|
| * Merge branch 'upstream-master' into markdown-previewVinnie Okada2014-12-0710-17/+50
| |\
| * | Use GET instead of POST for Markdown previewsVinnie Okada2014-10-161-1/+1
| * | Add Markdown preview to more formsVinnie Okada2014-10-151-4/+1
* | | Merge branch 'unicorn-advice' into 'master'Sytse Sijbrandij2014-12-081-7/+7
|\ \ \
| * | | memory constrained unicorn workersJob van der Voort2014-12-081-4/+2
| * | | advise about unicorn workersJob van der Voort2014-12-081-7/+9
| | |/ | |/|
* | | Use the new SIDEKIQ_MEMORY_KILLER_MAX_RSS variableJacob Vosmaer2014-12-081-1/+1
|/ /
* | Feature: atom feed for user activityDmitriy Zaporozhets2014-12-041-1/+2
* | Disable Sidekiq arguments logging by defaultJacob Vosmaer2014-12-011-1/+1
* | Move projects import to separate resource. Add bare repo creation to reposito...Dmitriy Zaporozhets2014-11-301-3/+2
* | Add 'MemoryKiller' Sidekiq middlewareJacob Vosmaer2014-11-281-0/+1
* | Update time zone rake task for production. Resolves #8387Robert Djurasaj2014-11-251-1/+1
* | Use new gitlab-shell v2.3.0Dmitriy Zaporozhets2014-11-181-0/+3
* | Revert "gitlab shell works if multiple rubies installed"Dmitriy Zaporozhets2014-11-183-4/+20
* | Merge pull request #8340 from cirosantilli/multi-ruby-install-v2Dmitriy Zaporozhets2014-11-183-20/+4
|\ \
| * | gitlab shell works if multiple rubies installedCiro Santilli2014-11-183-20/+4
* | | Select namespace where to fork projectDmitriy Zaporozhets2014-11-131-5/+6
|/ /
* | Doc: Unicorn minimum worker_processes is 2Crom (Thibaut CHARLES)2014-10-301-0/+1
* | Merge pull request #8122 from bbodenmiller/cleanup-time-zoneDmitriy Zaporozhets2014-10-301-5/+0
|\ \
| * | cleanup time zone settingsBen Bodenmiller2014-10-211-5/+0
* | | Add email interceptor to prevent mail sending if email sending is disabled.Marin Jankovski2014-10-271-0/+2
* | | Add settings to disable email sending from GitLab.Marin Jankovski2014-10-272-0/+3
* | | Merge pull request #7994 from cirosantilli/rm-unneeded-autoload-pathDmitriy Zaporozhets2014-10-221-1/+0
|\ \ \ | |/ / |/| |
| * | Remove unneeded app/finders config.autoload pathCiro Santilli2014-10-071-1/+0
* | | Add timezone configuration to gitlab.ymlSullivan SENECHAL2014-10-214-0/+8
* | | Merge branch 'security-api-internal-publicity' into 'master'Dmitriy Zaporozhets2014-10-201-0/+19
|\ \ \
| * | | add gitlab-shell identificationValery Sizov2014-10-151-0/+19
| |/ /
* | | Default the LDAP server label to LDAPJan-Willem van der Meer2014-10-171-1/+1
* | | Prevent redeclaration of LDAP strategyJan-Willem van der Meer2014-10-171-1/+2
| |/ |/|
* | Only enable LDAP providers if LDAP is enabledJan-Willem van der Meer2014-10-152-8/+10
* | Merge branch 'feature-multiple-ldap-servers' into 'master'Dmitriy Zaporozhets2014-10-144-53/+112
|\ \
| * | Explain new configuration options.Jan-Willem van der Meer2014-10-141-12/+10
| * | Add valid LDAP server for testingJan-Willem van der Meer2014-10-141-2/+1
| * | Use Hash syntax for LDAP server declarationJan-Willem van der Meer2014-10-144-22/+22
| * | Move dynamic omniauth declarations to initializerJan-Willem van der Meer2014-10-141-0/+5
| * | Apply configuration changes for Multiple LDAP serversJan-Willem van der Meer2014-10-133-16/+36
| * | Add config changes for mutliple LDAP support (EE only)Jan-Willem van der Meer2014-10-131-38/+75
| |/
* | Add a link to libravatar doc in gitlab.yml.example.Marin Jankovski2014-10-141-0/+1
|/
* Merge branch 'remove-annoying-i18n-deprecation' into 'master'Marin Jankovski2014-10-071-1/+1
|\
| * Remove I18n.enforce_available_locales deprecation messageremove-annoying-i18n-deprecationDmitriy Zaporozhets2014-10-011-1/+1
* | Try signing in the user after user confirmation is correct and redirect to da...Marin Jankovski2014-10-021-1/+1
|/
* Merge branch 'add_active_directory_ldap_option' into 'master'Dmitriy Zaporozhets2014-10-012-0/+7
|\
| * Add option to gitlab config to specify if LDAP server is active directory.Marin Jankovski2014-09-302-0/+7
* | Add region to backup upload config in gitlab.ymlJacob Vosmaer2014-09-301-0/+1
|/
* Add backup upload support to the rake taskJacob Vosmaer2014-09-292-0/+13
* Raw implementation of commits stats pageDmitriy Zaporozhets2014-09-261-1/+5
* Rewrite graphs featureDmitriy Zaporozhets2014-09-261-1/+0