Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Collapse)Author
2015-01-14Enable signup by defaultJacob Vosmaer
2015-01-13Merge branch 'oauth_api_doc' into 'master'Dmitriy Zaporozhets
OAuth2 API documentation https://dev.gitlab.org/gitlab/gitlabhq/issues/1713 See merge request !1388
2015-01-13Merge branch 'github_importer'Dmitriy Zaporozhets
Conflicts: app/helpers/projects_helper.rb
2015-01-13Merge branch 'git-http-blacklist' into 'master'Jacob Vosmaer
Git HTTP blacklist See merge request !1328
2015-01-13OAuth API documentation updateValery Sizov
2015-01-10Github ImporterValery Sizov
2015-01-08Create ApplicationSettings if does not exist in runtimeDmitriy Zaporozhets
2015-01-08Hack for migrating to new settingsDmitriy Zaporozhets
2015-01-08Improve application settings and write testsDmitriy Zaporozhets
2015-01-08Merge remote-tracking branch 'dev_gitlab_org/master' into git-http-blacklistJacob Vosmaer
Conflicts: CHANGELOG
2015-01-08Init ApplicationSettings resource with defaults from config fileDmitriy Zaporozhets
2015-01-06White-list requests from 127.0.0.1Jacob Vosmaer
On some misconfigured GitLab servers, if you look in production.log it looks like all requests come from 127.0.0.1. To avoid unwanted banning we white-list 127.0.0.1 with this commit.
2014-12-30Merge branch 'user_ssh_keys_on_admin' into 'master'Dmitriy Zaporozhets
User ssh keys on admin Show user ssh keys on admin user page. See merge request !1362
2014-12-30Move user key manipulation in admin section to a separate controller.Marin Jankovski
2014-12-29Add user key actions to admins.Marin Jankovski
2014-12-29Merge branch 'master' into developer_can_push_to_protected_branches_optionMarin Jankovski
Conflicts: db/schema.rb
2014-12-28Merge pull request #7989 from cirosantilli/match-compare-to-getDmitriy Zaporozhets
Disallow POST to compare as it does not create objects
2014-12-26Add option to disable/enable developers push to already protected branches.Marin Jankovski
2014-12-25Merge branch 'master' into oauth2_providerDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/layouts/nav/_profile.html.haml
2014-12-25Rework oauth2 featureDmitriy Zaporozhets
* improve UI * add authorization * add separate page for oauth applications Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-24Hide rack profiler by defaultDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-24Doorkeeper integrationValery Sizov
2014-12-21Merge branch 'master' into sidebar-navDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/layouts/group.html.haml
2014-12-21Css/views cleanup after layout restyleDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-20Merge pull request #7978 from cirosantilli/edit-preview-route-testDmitriy Zaporozhets
Add tests for tree edit routes
2014-12-18Add more comments explaining how we block IPsJacob Vosmaer
2014-12-16Another comment fixJacob Vosmaer
2014-12-16Fix copy-paste error in commentJacob Vosmaer
2014-12-16Improve Redis::Store monkey-patch robustnessJacob Vosmaer
2014-12-15Block Git HTTP Basic Auth after 10 failed attemptsJacob Vosmaer
2014-12-11Merge branch 'show_files_with_diff_name' into 'master'Dmitriy Zaporozhets
Show files named diff Fixes #1749 See merge request !1318
2014-12-11Merge pull request #8052 from mr-vinn/markdown-previewDmitriy Zaporozhets
Enable Markdown preview for issues, merge requests, milestones, and notes
2014-12-10Do not check for format on blob diff path.Marin Jankovski
2014-12-08Merge branch 'unicorn-advice' into 'master'Sytse Sijbrandij
Unicorn advice See merge request !1314
2014-12-08memory constrained unicorn workersJob van der Voort
2014-12-08advise about unicorn workersJob van der Voort
2014-12-08Use the new SIDEKIQ_MEMORY_KILLER_MAX_RSS variableJacob Vosmaer
2014-12-08Merge branch 'upstream-master' into markdown-previewVinnie Okada
Conflicts: spec/routing/project_routing_spec.rb
2014-12-04Feature: atom feed for user activityDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-01Disable Sidekiq arguments logging by defaultJacob Vosmaer
2014-11-30Move projects import to separate resource. Add bare repo creation to ↵Dmitriy Zaporozhets
repository controller Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-28Add 'MemoryKiller' Sidekiq middlewareJacob Vosmaer
When enabled, this middleware allows Sidekiq to detect that its RSS has exceeded a maximum value, triggering a graceful shutdown. This middleware should be combined with external process supervision that will restart Sidekiq after the graceful shutdown, such as Runit.
2014-11-25Update time zone rake task for production. Resolves #8387Robert Djurasaj
2014-11-18Use new gitlab-shell v2.3.0Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-18Revert "gitlab shell works if multiple rubies installed"Dmitriy Zaporozhets
This reverts commit 533f4cdf30b38c587f7a91f0dfd898b907ecd944.
2014-11-18Merge pull request #8340 from cirosantilli/multi-ruby-install-v2Dmitriy Zaporozhets
Web edit and HTTPS push work if multiple Rubies installed v2
2014-11-18gitlab shell works if multiple rubies installedCiro Santilli
Before this it would fail because git hooks automatically prepend things to the path, which can lead the wrong Ruby version to be called in which dependencies are not installed. To make sure that this is correct, the forked_merge_requests commented out test that depends on this change was uncommented. For that test to pass, it is also necessary to setup the mock server on port 3001 under test_env.rb.
2014-11-13Select namespace where to fork projectDmitriy Zaporozhets
Now you can fork project into group or personal namespace. Also I moved fork logic from ProjectsController to own fork resource Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-31Doc: Unicorn minimum worker_processes is 2Crom (Thibaut CHARLES)
A value of 1 cause http push fail (issue #6978 on GitHub)
2014-10-30Merge pull request #8122 from bbodenmiller/cleanup-time-zoneDmitriy Zaporozhets
cleanup time zone settings