Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Create ApplicationSettings if does not exist in runtime | Dmitriy Zaporozhets | 2015-01-08 | 1 | -11/+0 |
* | Hack for migrating to new settings | Dmitriy Zaporozhets | 2015-01-08 | 1 | -2/+1 |
* | Improve application settings and write tests | Dmitriy Zaporozhets | 2015-01-08 | 1 | -1/+1 |
* | Init ApplicationSettings resource with defaults from config file | Dmitriy Zaporozhets | 2015-01-08 | 2 | -0/+14 |
* | Merge branch 'user_ssh_keys_on_admin' into 'master' | Dmitriy Zaporozhets | 2014-12-30 | 1 | -0/+1 |
|\ | |||||
| * | Move user key manipulation in admin section to a separate controller. | Marin Jankovski | 2014-12-30 | 1 | -2/+1 |
| * | Add user key actions to admins. | Marin Jankovski | 2014-12-29 | 1 | -0/+2 |
* | | Merge branch 'master' into developer_can_push_to_protected_branches_option | Marin Jankovski | 2014-12-29 | 3 | -1/+172 |
|\ \ | |/ | |||||
| * | Merge pull request #7989 from cirosantilli/match-compare-to-get | Dmitriy Zaporozhets | 2014-12-28 | 1 | -1/+2 |
| |\ | |||||
| | * | Disallow POST to compare: does not create objects | Ciro Santilli | 2014-10-07 | 1 | -1/+2 |
| * | | Merge branch 'master' into oauth2_provider | Dmitriy Zaporozhets | 2014-12-25 | 1 | -0/+1 |
| |\ \ | |||||
| * | | | Rework oauth2 feature | Dmitriy Zaporozhets | 2014-12-25 | 1 | -0/+1 |
| * | | | Doorkeeper integration | Valery Sizov | 2014-12-24 | 3 | -0/+169 |
* | | | | Add option to disable/enable developers push to already protected branches. | Marin Jankovski | 2014-12-26 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Hide rack profiler by default | Dmitriy Zaporozhets | 2014-12-24 | 1 | -0/+1 |
|/ / | |||||
* | | Merge branch 'master' into sidebar-nav | Dmitriy Zaporozhets | 2014-12-21 | 1 | -5/+3 |
|\ \ | |||||
| * \ | Merge pull request #7978 from cirosantilli/edit-preview-route-test | Dmitriy Zaporozhets | 2014-12-20 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | Add tests for tree edit routes | Ciro Santilli | 2014-10-07 | 1 | -0/+1 |
| * | | | Merge branch 'show_files_with_diff_name' into 'master' | Dmitriy Zaporozhets | 2014-12-11 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Do not check for format on blob diff path. | Marin Jankovski | 2014-12-10 | 1 | -1/+1 |
| * | | | | Merge pull request #8052 from mr-vinn/markdown-preview | Dmitriy Zaporozhets | 2014-12-11 | 1 | -4/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Merge branch 'upstream-master' into markdown-preview | Vinnie Okada | 2014-12-07 | 10 | -17/+50 |
| | |\ \ \ | |||||
| | * | | | | Use GET instead of POST for Markdown previews | Vinnie Okada | 2014-10-16 | 1 | -1/+1 |
| | * | | | | Add Markdown preview to more forms | Vinnie Okada | 2014-10-15 | 1 | -4/+1 |
* | | | | | | Css/views cleanup after layout restyle | Dmitriy Zaporozhets | 2014-12-21 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Merge branch 'unicorn-advice' into 'master' | Sytse Sijbrandij | 2014-12-08 | 1 | -7/+7 |
|\ \ \ \ \ | |||||
| * | | | | | memory constrained unicorn workers | Job van der Voort | 2014-12-08 | 1 | -4/+2 |
| * | | | | | advise about unicorn workers | Job van der Voort | 2014-12-08 | 1 | -7/+9 |
| | |/ / / | |/| | | | |||||
* | | | | | Use the new SIDEKIQ_MEMORY_KILLER_MAX_RSS variable | Jacob Vosmaer | 2014-12-08 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Feature: atom feed for user activity | Dmitriy Zaporozhets | 2014-12-04 | 1 | -1/+2 |
* | | | | Disable Sidekiq arguments logging by default | Jacob Vosmaer | 2014-12-01 | 1 | -1/+1 |
* | | | | Move projects import to separate resource. Add bare repo creation to reposito... | Dmitriy Zaporozhets | 2014-11-30 | 1 | -3/+2 |
* | | | | Add 'MemoryKiller' Sidekiq middleware | Jacob Vosmaer | 2014-11-28 | 1 | -0/+1 |
* | | | | Update time zone rake task for production. Resolves #8387 | Robert Djurasaj | 2014-11-25 | 1 | -1/+1 |
* | | | | Use new gitlab-shell v2.3.0 | Dmitriy Zaporozhets | 2014-11-18 | 1 | -0/+3 |
* | | | | Revert "gitlab shell works if multiple rubies installed" | Dmitriy Zaporozhets | 2014-11-18 | 3 | -4/+20 |
* | | | | Merge pull request #8340 from cirosantilli/multi-ruby-install-v2 | Dmitriy Zaporozhets | 2014-11-18 | 3 | -20/+4 |
|\ \ \ \ | |||||
| * | | | | gitlab shell works if multiple rubies installed | Ciro Santilli | 2014-11-18 | 3 | -20/+4 |
* | | | | | Select namespace where to fork project | Dmitriy Zaporozhets | 2014-11-13 | 1 | -5/+6 |
|/ / / / | |||||
* | | | | Doc: Unicorn minimum worker_processes is 2 | Crom (Thibaut CHARLES) | 2014-10-30 | 1 | -0/+1 |
* | | | | Merge pull request #8122 from bbodenmiller/cleanup-time-zone | Dmitriy Zaporozhets | 2014-10-30 | 1 | -5/+0 |
|\ \ \ \ | |||||
| * | | | | cleanup time zone settings | Ben Bodenmiller | 2014-10-21 | 1 | -5/+0 |
* | | | | | Add email interceptor to prevent mail sending if email sending is disabled. | Marin Jankovski | 2014-10-27 | 1 | -0/+2 |
* | | | | | Add settings to disable email sending from GitLab. | Marin Jankovski | 2014-10-27 | 2 | -0/+3 |
* | | | | | Merge pull request #7994 from cirosantilli/rm-unneeded-autoload-path | Dmitriy Zaporozhets | 2014-10-22 | 1 | -1/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Remove unneeded app/finders config.autoload path | Ciro Santilli | 2014-10-07 | 1 | -1/+0 |
| | |_|/ | |/| | | |||||
* | | | | Add timezone configuration to gitlab.yml | Sullivan SENECHAL | 2014-10-21 | 4 | -0/+8 |
* | | | | Merge branch 'security-api-internal-publicity' into 'master' | Dmitriy Zaporozhets | 2014-10-20 | 1 | -0/+19 |
|\ \ \ \ | |||||
| * | | | | add gitlab-shell identification | Valery Sizov | 2014-10-15 | 1 | -0/+19 |
| |/ / / | |||||
* | | | | Default the LDAP server label to LDAP | Jan-Willem van der Meer | 2014-10-17 | 1 | -1/+1 |