Commit graph

379 commits

Author SHA1 Message Date
Sebastian Ziebell c8b92a4be2 Merge branch 'master' into fixes/api 2013-02-14 17:02:16 +01:00
Dmitriy Zaporozhets 2ea12ff663 Merge branch 'unicorn-app-dir-fix' of https://github.com/mikew/gitlabhq into mikew-unicorn-app-dir-fix
Conflicts:
	config/unicorn.rb.example
2013-02-13 15:11:26 +02:00
Sebastian Ziebell 375caeefcf Merge branch 'master' into fixes/api 2013-02-13 10:31:06 +01:00
Sebastian Ziebell 449380265a Merge branch 'master' into fixes/api 2013-02-12 10:17:57 +01:00
Yuri Feldman 2d0c3e4c6d Fix for incorrect routing to the Compare controller 2013-02-12 19:28:48 +11:00
Dmitriy Zaporozhets d64090b8a9 No gitolite in project any more 2013-02-11 19:16:59 +02:00
Dmitriy Zaporozhets 7a88bf0978 Fix gitlab:check 2013-02-11 09:58:02 +02:00
Sebastian Ziebell 8045a81bcf Merge branch 'master' into fixes/api 2013-02-08 10:32:42 +01:00
Dmitriy Zaporozhets cdcf69d0d9 gitlab;shell init script 2013-02-07 10:06:39 +02:00
Dmitriy Zaporozhets 867945d193 Improving installation docs 2013-02-05 13:02:58 +02:00
Dmitriy Zaporozhets 27d9ac0fe8 Make gitlab works with gitlab-shell 2013-02-04 15:07:56 +02:00
Dmitriy Zaporozhets e6002bdaff Ability to manage and remove group as owner outside of admin area 2013-02-01 19:04:11 +02:00
Felix Gilcher c72910a8bf log fatal errors that we catch
In case we rescue from a fatal error, we want the error and the backtrace to
the error logged, so we can debug later on. This change injects the configured
logger from the rails app to the grape API and logs error as well as backtrace
in a rails-like fashion.
2013-02-01 10:23:23 +00:00
Mike Wyatt 5e28710692 remove hardcoded app_dir from unicorn.rb.example 2013-01-31 18:33:11 -03:30
Dmitriy Zaporozhets afdb09de80 Merge pull request #2711 from fbehrens/patch-1
Update config/database.yml.postgresql
2013-01-31 02:54:48 -08:00
Sato Hiroyuki 525a8cd3e9 Switchable the main branch on network graph 2013-01-30 09:12:03 +09:00
Dmitriy Zaporozhets 7121a58eb9 Advanced logging for post-receive worker 2013-01-29 11:32:05 +02:00
Dmitriy Zaporozhets 6b01196fb2 Dashboard to resource 2013-01-27 12:56:20 +02:00
Dmitriy Zaporozhets bd3b677b86 Add projects page to dashboard. Remove projects pagination on dashboard 2013-01-27 12:34:27 +02:00
Dmitriy Zaporozhets 0125b74b3c Fix application crashes after #2772 2013-01-26 12:08:34 +02:00
Andrey Kumanyaev 6efda51cc5 fix edit project members access link and page fixes refs #2745 2013-01-25 21:20:15 +04:00
Dmitriy Zaporozhets 74e329064a teams refactoring and cleanup pt.1 2013-01-25 16:36:14 +02:00
Dmitriy Zaporozhets ca752e64fb Fix mispelling and ambiguous id in UserTeam.without_project 2013-01-24 22:31:49 +02:00
Andrey Kumanyaev d721863382 Fix little bugs 2013-01-24 22:31:48 +02:00
Andrey Kumanyaev 31d84d71d3 assign team to project from project page in public section 2013-01-24 22:31:48 +02:00
Andrey Kumanyaev 7658f8c151 update routes 2013-01-24 22:31:25 +02:00
Andrey Kumanyaev 1dd0feacc7 move Team_members controller into project (conflicts with team/members controller) 2013-01-24 22:31:25 +02:00
Andrey Kumanyaev 17a8ee57fe Remove old data 2013-01-24 22:31:25 +02:00
Andrey Kumanyaev b7470440ff Move team project management to own controller 2013-01-24 22:31:24 +02:00
Andrey Kumanyaev cca9935970 save generated files 2013-01-24 22:31:24 +02:00
Andrey Kumanyaev 9804b7df68 Move admin team members management to own controller 2013-01-24 22:31:24 +02:00
Andrey Kumanyaev a96cf3ad09 Team projects public section 2013-01-24 22:31:24 +02:00
Andrey Kumanyaev ea6f46cb87 Team members public section 2013-01-24 22:31:24 +02:00
Andrey Kumanyaev 695becc4cb Add teams into Public sections 2013-01-24 22:31:23 +02:00
Andrey Kumanyaev 82499a4cbf Admin teams section added 2013-01-24 22:31:23 +02:00
Dmitriy Zaporozhets f6c482c06f User can create group 2013-01-24 17:47:09 +02:00
fbehrens b614e3b5cb Update config/database.yml.postgresql
This was necessary following the installation guide for ubuntu 10.4 with postgres
2013-01-23 15:32:31 +01:00
Dmitriy Zaporozhets 96d97c4857 Fix routing. Finalize user show page 2013-01-22 19:45:13 +02:00
Dmitriy Zaporozhets 70690e1971 base implementation 2013-01-22 19:05:01 +02:00
Erkan 0ab906d5de Update config/gitlab.yml.example 2013-01-22 10:04:02 +01:00
Dmitriy Zaporozhets cd8a302997 Fix application crash on help page 2013-01-20 14:17:56 +02:00
Riyad Preukschas 47e510e14f Small fixes 2013-01-19 15:26:55 +01:00
Riyad Preukschas 8a5b770c36 Reorder help routes 2013-01-19 15:26:23 +01:00
Riyad Preukschas 8db80f1f6d Rename help#public_area to help#public_access 2013-01-19 15:24:51 +01:00
Marin Jankovski 296cdd591f Add optional signup. 2013-01-18 11:57:31 +01:00
Cyril 9db7c16a1e Fix default settings when they are boolean.
error is that ```enabled ||= true``` always evaluates to true.
Change all initialization of bool settings to use the same syntax:
```setting = true if setting.nil?```
2013-01-18 00:00:02 +01:00
Riyad Preukschas 9f1e9f11f1 Merge pull request #2346 from sodabrew/omniauth_configs
Allow the OmniAuth provider args parameter to be passed through
2013-01-16 15:58:53 -08:00
Riyad Preukschas 76329a46a3 Fix settings 2013-01-16 23:54:48 +01:00
Riyad Preukschas eea43c9412 Merge branch 'check_gitlab_in_git_group' of https://github.com/VonC/gitlabhq into VonC-check_gitlab_in_git_group 2013-01-16 23:20:47 +01:00
Riyad Preukschas 0dd8a26a3a Fix satellite path settings 2013-01-16 17:00:38 +01:00