home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 12:06:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,973 Commits 48 Branches 340 Tags
7b0feec29deb287d4ebfc2a545ee42fcd4119209
Commit Graph
174 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets c9a2765515 Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable 
Conflicts:
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/api/groups.md
	doc/api/projects.md
	doc/install/installation.md
	lib/api/projects.rb
	spec/requests/api/groups_spec.rb
	spec/requests/api/projects_spec.rb
 2013-10-31 14:29:48 +02:00
Nihad Abbasov 12420a2256 refactor by_username_or_id 2013-10-16 22:31:46 +05:00
Dmitriy Zaporozhets 6fff92e984 Enable confirmable and reconfirmable modules for User 
Now when you want to signup or change existing email you will be forced
to confirm that you really own this email. You get email with link to
follow in order to confirm your email address

Conflicts:
	app/models/user.rb
 2013-10-15 09:56:04 +03:00
Dmitriy Zaporozhets 92768844cf Reverted accidently removed registration module 2013-10-09 13:52:03 +00:00
Dmitriy Zaporozhets f7ef23e412 Send devise emails async 2013-10-09 15:25:31 +03:00
Steven Thonus 65cad57a35 avatar upload on profile page 2013-10-09 09:05:09 +02:00
Yatish Mehta 9d622bd790 Typo:Corrected the typo of sign-in in User Model 2013-10-03 14:34:51 +05:30
Dmitriy Zaporozhets 0c5a9f20b5 Merge branch '6-1-stable' of https://dev.gitlab.org/gitlab/gitlabhq into 6-1-stable-ee 
Conflicts:
	VERSION
	app/controllers/application_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/models/merge_request.rb
	app/models/user.rb
	app/views/groups/_projects.html.haml
	config/routes.rb
	db/schema.rb
	doc/install/installation.md
 2013-09-27 15:24:54 +03:00
Dmitriy Zaporozhets 65b9768ccf Group ownership completely based on users_groups relation now 
Before we have only owner_id to determine group owner
With multiple owners per group we should get rid of owner_id in group.
So from now @group.owner will always be nil but
@group.owners return an actual array of users who can admin this group
 2013-09-26 14:49:22 +03:00
Izaak Alpert 51e6095dd1 Make users theme configurable 
GITLAB-1262

Change-Id: I690cb8ea294df53ebe8405a519c23c501af2c21a

Conflicts:
	app/models/user.rb
	config/initializers/1_settings.rb
	spec/models/user_spec.rb
 2013-09-22 01:05:14 -04:00
Dmitriy Zaporozhets a51562d6d9 Fix setting default values for user 2013-09-14 20:51:16 +03:00
Izaak Alpert 88d4559e62 Removed private scope 
Change-Id: Ia723321a5cb05deb626d34c7d8d78194e049b1f0
 2013-09-11 14:32:24 -04:00
Izaak Alpert 810851f574 Style updates 
Change-Id: Ib4eb533dff5c722fe559330e4aa71b5d5baf6fb8
 2013-09-11 14:04:15 -04:00
Izaak Alpert 5dae40f579 Update to only provide one way to get a default user 
-calling build_user will now apply defaults and only override them if as: :admin is set

Change-Id: Id1d938c0967752ecc14370af54f2d88128d18c44
 2013-09-11 14:04:15 -04:00
Izaak Alpert d4d4a78f83 Update User api to respect default settings 
-API now respects default_projects_limit, default_can_create_group, and default_can_create_team

Change-Id: I059d060d576df1050e5371e707381c5e8c608a7a
 2013-09-11 14:04:15 -04:00
Stephen Holdaway e19526c2ac Fix several_namespaces? to work with multiple ownership of groups 2013-09-12 00:10:45 +12:00
Izaak Alpert 7a56075efa Some of the requested updates, rebase on master 
Change-Id: I305266fe9acbbb5136adeeb52e7e4e1d6629a30a
 2013-09-09 12:04:38 -04:00
Dmitriy Zaporozhets 3707cc119b Refactor Gitlab::Auth 2013-09-04 00:12:00 +03:00
Dmitriy Zaporozhets 6bf117c601 Mode User+LDAP functionality from Gitlab::Auth 2013-09-02 23:35:40 +03:00
Dmitriy Zaporozhets 24e26d8b7a Improve user block/removal from admin area 
Provide UI with explanation what happens when you block or remove user
When remove user - remove all groups where user is an only owner
 2013-08-27 21:39:34 +03:00
Dmitriy Zaporozhets 6545527853 Improve user block logic 
When block user - remove it from joined groups
Dont remove user from own resources (groups, users)
 2013-08-27 12:01:45 +03:00
Dmitriy Zaporozhets 8dd37afe34 Reannotate 2013-08-21 12:34:02 +03:00
Dmitriy Zaporozhets fd1661468f Remove can_create_team code from user 2013-08-21 12:31:47 +03:00
Dmitriy Zaporozhets 9ff730254a Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	db/schema.rb
 2013-08-12 13:47:02 +03:00
Dmitriy Zaporozhets 99efbc8cee Do ldap permissions update every hour 2013-08-09 15:54:58 +03:00
Johannes Schleifenbaum cd19f82e51 Fix typos 2013-07-29 12:47:06 +02:00
Dmitriy Zaporozhets b50bc135d0 Add shared projects to User#authorized_projects 2013-07-11 12:02:25 +03:00
Dmitriy Zaporozhets 223d264051 Sanitize user attrs on model level 2013-07-10 13:48:03 +03:00
Dmitriy Zaporozhets 03586c6c79 Fix User#can_create_project? 2013-07-09 20:51:49 +03:00
Dmitriy Zaporozhets db03bfa868 Apply user project limit only for personal projects. We should not include group projects for user limit 2013-06-26 14:41:03 +03:00
Dmitriy Zaporozhets 19d628dd23 Set default order to authorized_project and authorized_groups 2013-06-22 13:39:34 +03:00
Dmitriy Zaporozhets 0273b79b92 User#owned_groups is now respect group membership 2013-06-21 22:38:43 +03:00
Dmitriy Zaporozhets d0efe2c07c Since masters_projects does not cover most of cases now we use authorized_projects for DeployKey read access 2013-06-21 16:42:59 +03:00
Dmitriy Zaporozhets b1dbabdec3 Improve query of authorized_projects. Cache results for authorized_groups, authorized_projects methods 2013-06-21 16:36:28 +03:00
Dmitriy Zaporozhets 38a9fc4f47 Classic (mars) theme will be default for 6.0 2013-06-20 11:46:54 +03:00
Dmitriy Zaporozhets 6e35aceff2 Annotated 2013-06-19 15:40:33 +03:00
Dmitriy Zaporozhets 439f399bec Remove all team resources except models. Move models to deprecated directory 2013-06-18 21:22:34 +03:00
Dmitriy Zaporozhets 7d57b96ee0 Update authorized/owned resources with new group permissions 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets 6838304a85 Force user password change for users created by admin 2013-06-13 21:06:27 +03:00
Dmitriy Zaporozhets fbf6989903 Force admin to change password after first sign-in 2013-06-13 20:06:33 +03:00
Dmitriy Zaporozhets 995e656add Add path blacklist 2013-06-12 22:11:35 +03:00
Dmitriy Zaporozhets 470f9064fa Merge pull request #4206 from babatakao/authorize_all_teams_to_admin 
Authorize all teams to admin: fix 500 error on showing team page.
 2013-06-06 07:14:50 -07:00
babatakao 86a262de1a Authorize all teams to admin: fix 500 error on showing team page. 
500 error was occured in the following steps:

1. user1 creates new team "team1".
2. Assign team1 to project1.
3. Sign in as admin. This admin is not a member of team1.
4. Open project1 team setting page (/project1/team).
5. Click "team1" link in "Assigned teams" area.
6. 500 error.

Fixed this issue.
 2013-06-05 15:41:33 +09:00
babatakaoandbaba 37a90d5f76 Selectable deploy keys contain master projects 2013-06-05 02:59:30 +09:00
Dmitriy Zaporozhets bcc4e4dc7e Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist 
Conflicts:
	Gemfile.lock
	app/models/ability.rb
	app/models/project.rb
	app/views/snippets/_form.html.haml
	db/schema.rb
	features/steps/shared/paths.rb
	spec/factories.rb
	spec/models/project_spec.rb
 2013-06-04 18:36:22 +03:00
Dmitriy Zaporozhets 50e8d6c0c0 Add api to collect owned user projects. Api deploy_key.create: Enable deploy key if it exist in other owned project 2013-06-03 19:49:04 +03:00
Dmitriy Zaporozhets ec1055076c Merge branch 'add-defaults-create-group-team' of https://github.com/dmedvinsky/gitlabhq into dmedvinsky-add-defaults-create-group-team 
Conflicts:
	config/gitlab.yml.example
 2013-05-27 15:17:06 +03:00
Dmitriy Zaporozhets 7cb86eb335 Dont allow LDAP users to change password inside GitLab 2013-05-24 17:12:27 +03:00
Dmitry Medvinsky 22279bc558 Add settings for user permission defaults 
“Can create groups” and “Can create teams” had hardcoded defaults to
`true`. Sometimes it is desirable to prohibit these for newly created
users by default.
 2013-05-16 18:02:22 +04:00
Dmitriy Zaporozhets de12eba25c Dont show fork button in personal projects. Point to fork if already forked project 2013-05-08 19:40:31 +03:00