Commit Graph

149 Commits

Author SHA1 Message Date
Dmitriy Zaporozhets fd1661468f Remove can_create_team code from user 2013-08-21 12:31:47 +03:00
Johannes Schleifenbaum cd19f82e51 Fix typos 2013-07-29 12:47:06 +02: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
babatakao 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
Dmitriy Zaporozhets 1882baa1aa Feature: Deploy keys between projects 2013-05-06 15:10:55 +03:00
Dmitriy Zaporozhets 0f2798d498 Merge branch 'feature/refactoring_scopes_pr' of https://github.com/Undev/gitlabhq into Undev-feature/refactoring_scopes_pr
Conflicts:
	db/schema.rb
2013-04-09 20:37:04 +03:00
Dmitriy Zaporozhets 98b7717df7 Remove user decorator 2013-04-04 10:53:39 +03:00
Dmitriy Zaporozhets 9f4fde04f5 Dont show project limit sidebar if user can own 100+ more projects 2013-04-03 18:36:37 +03:00
Andrey Kumanyaev 41bbbb6df0 Update model methods 2013-04-03 06:20:52 +04:00
Dmitriy Zaporozhets d55ade1686 notification scaffold 2013-03-27 19:04:29 +02:00
Dmitriy Zaporozhets 5f14a6bcf8 annotated 2013-03-27 18:26:37 +02:00
Dmitriy Zaporozhets 4b3950456d notification level for user 2013-03-26 10:48:07 +02:00
Dmitriy Zaporozhets 9d92433a7c login with both email or username 2013-03-25 16:10:14 +02:00
Andrew8xx8 9e2525cbd0 Association form user to snippets added 2013-03-24 23:09:59 +04:00
Dmitriy Zaporozhets 21b1fee92c reannotated 2013-03-15 15:16:02 +02:00
Dmitriy Zaporozhets 8cad1c9f4c add dark solarized theme for code preview 2013-03-15 15:09:34 +02:00
Dmitriy Zaporozhets 1587caa3e4 Use name+username in team -> new 2013-03-13 19:24:30 +02:00
Dmitriy Zaporozhets f22488f726 Merge pull request #3143 from Undev/state-machine-3
State machine 3
2013-03-05 05:38:16 -08:00
Dmitriy Zaporozhets 9bb35e7e59 Prevent app crash if team owner removed 2013-03-05 09:27:06 +02:00
Andrew8xx8 0d9a6fe7b1 User's blocked field refactored to use state machine 2013-03-04 18:52:30 +04:00
Dmitriy Zaporozhets 15c0e58a49 remove unused code related to gitolite 2013-02-26 11:11:43 +02:00
Dmitriy Zaporozhets c08f19f275 email validation added 2013-02-26 11:09:32 +02:00
Dmitriy Zaporozhets bfc359ca61 Fix project filter for MR on dashboard 2013-02-19 09:43:41 +02:00
Dmitriy Zaporozhets e049e18780 Merge pull request #2991 from raphendyr/username_change_disablation
Add option to disable username changing
2013-02-18 09:59:24 -08:00
Marin Jankovski 1734611181 Count owned projects, not just personal 2013-02-18 13:15:35 +01:00
Jaakko Kantojärvi ba65f2910b Add option to disable username changing
This option allows to disable users from changing their username.

This is very usefull in environments using strong internal authentication methods like ldap, pam or shibboleth.

You can allow users to change theyr username in these environments, but then new users (users loging in first time) is blocked from gitlab is her username exists.
2013-02-14 17:58:56 +02:00
Dmitriy Zaporozhets ed3f44085e Redesign Admin -> user -> show page 2013-02-13 19:14:35 +02:00
Dmitriy Zaporozhets 6b24c375cb style admin -> users page. Search by username too 2013-02-13 17:28:28 +02:00
Andrew8xx8 b5db541338 All scopes must be in lambdas 2013-02-12 11:16:45 +04:00