summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'git-http-blacklist' into 'master'Jacob Vosmaer2015-01-134-0/+80
|\
| * Merge remote-tracking branch 'dev_gitlab_org/master' into git-http-blacklistJacob Vosmaer2015-01-084-2/+177
| |\
| * | White-list requests from 127.0.0.1Jacob Vosmaer2015-01-062-0/+4
| * | Add more comments explaining how we block IPsJacob Vosmaer2014-12-181-0/+2
| * | Another comment fixJacob Vosmaer2014-12-161-2/+2
| * | Fix copy-paste error in commentJacob Vosmaer2014-12-161-1/+1
| * | Improve Redis::Store monkey-patch robustnessJacob Vosmaer2014-12-161-0/+23
| * | Block Git HTTP Basic Auth after 10 failed attemptsJacob Vosmaer2014-12-154-0/+51
* | | Create ApplicationSettings if does not exist in runtimeDmitriy Zaporozhets2015-01-081-11/+0
* | | Hack for migrating to new settingsDmitriy Zaporozhets2015-01-081-2/+1
* | | Improve application settings and write testsDmitriy Zaporozhets2015-01-081-1/+1
* | | Init ApplicationSettings resource with defaults from config fileDmitriy Zaporozhets2015-01-082-0/+14
| |/ |/|
* | Merge branch 'user_ssh_keys_on_admin' into 'master'Dmitriy Zaporozhets2014-12-301-0/+1
|\ \
| * | Move user key manipulation in admin section to a separate controller.Marin Jankovski2014-12-301-2/+1
| * | Add user key actions to admins.Marin Jankovski2014-12-291-0/+2
* | | Merge branch 'master' into developer_can_push_to_protected_branches_optionMarin Jankovski2014-12-293-1/+172
|\ \ \ | |/ /
| * | Merge pull request #7989 from cirosantilli/match-compare-to-getDmitriy Zaporozhets2014-12-281-1/+2
| |\ \
| | * | Disallow POST to compare: does not create objectsCiro Santilli2014-10-071-1/+2
| * | | Merge branch 'master' into oauth2_providerDmitriy Zaporozhets2014-12-251-0/+1
| |\ \ \
| * | | | Rework oauth2 featureDmitriy Zaporozhets2014-12-251-0/+1
| * | | | Doorkeeper integrationValery Sizov2014-12-243-0/+169
* | | | | Add option to disable/enable developers push to already protected branches.Marin Jankovski2014-12-261-1/+1
| |/ / / |/| | |
* | | | Hide rack profiler by defaultDmitriy Zaporozhets2014-12-241-0/+1
|/ / /
* | | Merge branch 'master' into sidebar-navDmitriy Zaporozhets2014-12-211-5/+3
|\ \ \
| * \ \ Merge pull request #7978 from cirosantilli/edit-preview-route-testDmitriy Zaporozhets2014-12-201-0/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Add tests for tree edit routesCiro Santilli2014-10-071-0/+1
| * | | 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
* | | | | | Css/views cleanup after layout restyleDmitriy Zaporozhets2014-12-211-0/+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