summaryrefslogtreecommitdiff
path: root/app/models/user.rb
Commit message (Collapse)AuthorAgeFilesLines
* Sanitize user attrs on model levelDmitriy Zaporozhets2013-07-101-0/+10
|
* Force user password change for users created by adminDmitriy Zaporozhets2013-06-131-0/+4
|
* Force admin to change password after first sign-inDmitriy Zaporozhets2013-06-131-2/+5
|
* Add path blacklistDmitriy Zaporozhets2013-06-121-0/+1
|
* Merge pull request #4206 from babatakao/authorize_all_teams_to_adminDmitriy Zaporozhets2013-06-061-2/+6
|\ | | | | Authorize all teams to admin: fix 500 error on showing team page.
| * Authorize all teams to admin: fix 500 error on showing team page.babatakao2013-06-051-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Selectable deploy keys contain master projectsbabatakao2013-06-051-2/+4
|/
* Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into ↵Dmitriy Zaporozhets2013-06-041-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Association form user to snippets addedAndrew8xx82013-03-241-0/+1
| |
* | Add api to collect owned user projects. Api deploy_key.create: Enable deploy ↵Dmitriy Zaporozhets2013-06-031-0/+4
| | | | | | | | key if it exist in other owned project
* | Merge branch 'add-defaults-create-group-team' of ↵Dmitriy Zaporozhets2013-05-271-0/+8
|\ \ | | | | | | | | | | | | | | | | | | https://github.com/dmedvinsky/gitlabhq into dmedvinsky-add-defaults-create-group-team Conflicts: config/gitlab.yml.example
| * | Add settings for user permission defaultsDmitry Medvinsky2013-05-161-0/+8
| | | | | | | | | | | | | | | | | | “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.
* | | Dont allow LDAP users to change password inside GitLabDmitriy Zaporozhets2013-05-241-0/+4
|/ /
* | Dont show fork button in personal projects. Point to fork if already forked ↵Dmitriy Zaporozhets2013-05-081-0/+14
| | | | | | | | project
* | Feature: Deploy keys between projectsDmitriy Zaporozhets2013-05-061-1/+1
| |
* | Merge branch 'feature/refactoring_scopes_pr' of ↵Dmitriy Zaporozhets2013-04-091-81/+30
|\ \ | | | | | | | | | | | | | | | | | | https://github.com/Undev/gitlabhq into Undev-feature/refactoring_scopes_pr Conflicts: db/schema.rb
| * | Update model methodsAndrey Kumanyaev2013-04-031-81/+30
| | |
* | | Remove user decoratorDmitriy Zaporozhets2013-04-041-0/+4
| | |
* | | Dont show project limit sidebar if user can own 100+ more projectsDmitriy Zaporozhets2013-04-031-1/+5
|/ /
* | notification scaffoldDmitriy Zaporozhets2013-03-271-7/+7
| |
* | annotatedDmitriy Zaporozhets2013-03-271-0/+1
| |
* | notification level for userDmitriy Zaporozhets2013-03-261-0/+7
| |
* | login with both email or usernameDmitriy Zaporozhets2013-03-251-0/+17
|/
* reannotatedDmitriy Zaporozhets2013-03-151-2/+2
|
* add dark solarized theme for code previewDmitriy Zaporozhets2013-03-151-1/+1
|
* Use name+username in team -> newDmitriy Zaporozhets2013-03-131-0/+4
|
* Merge pull request #3143 from Undev/state-machine-3Dmitriy Zaporozhets2013-03-051-14/+20
|\ | | | | State machine 3
| * User's blocked field refactored to use state machineAndrew8xx82013-03-041-14/+20
| |
* | Prevent app crash if team owner removedDmitriy Zaporozhets2013-03-051-12/+35
|/
* remove unused code related to gitoliteDmitriy Zaporozhets2013-02-261-11/+0
|
* email validation addedDmitriy Zaporozhets2013-02-261-0/+1
|
* Fix project filter for MR on dashboardDmitriy Zaporozhets2013-02-191-1/+1
|
* Merge pull request #2991 from raphendyr/username_change_disablationDmitriy Zaporozhets2013-02-181-0/+4
|\ | | | | Add option to disable username changing
| * Add option to disable username changingJaakko Kantojärvi2013-02-141-0/+4
| | | | | | | | | | | | | | | | 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.
* | Count owned projects, not just personalMarin Jankovski2013-02-181-1/+1
|/
* Redesign Admin -> user -> show pageDmitriy Zaporozhets2013-02-131-0/+4
|
* style admin -> users page. Search by username tooDmitriy Zaporozhets2013-02-131-1/+1
|
* All scopes must be in lambdasAndrew8xx82013-02-121-4/+4
|
* add path and path_with_namespace to api project entityDmitriy Zaporozhets2013-01-311-0/+2
|
* username is default param to UserAndrey Kumanyaev2013-01-251-0/+5
|
* Fix security issues with teamsDmitriy Zaporozhets2013-01-251-0/+11
|
* Fix mass-assignment. Dont allow users w/o access to create teamDmitriy Zaporozhets2013-01-251-1/+1
|
* fix User.potential_team_membersDmitriy Zaporozhets2013-01-251-1/+1
|
* allow/deny user to create group/teamDmitriy Zaporozhets2013-01-251-1/+1
|
* Remove simple code duplication in members controllersAndrey Kumanyaev2013-01-241-0/+1
|
* Added UserTeam core models (team and m-t-m relationships) and updated other ↵Andrey Kumanyaev2013-01-241-12/+23
| | | | models
* User can create groupDmitriy Zaporozhets2013-01-241-1/+1
|
* Reporter cant create MR. Show user authorized projects in Admin areaDmitriy Zaporozhets2013-01-211-3/+3
|
* Refactor project creation. Added logout link to profile pageGitLab2013-01-171-5/+6
|
* Add optional signup.Marin Jankovski2013-01-181-1/+1
|
View Lorry Controller Status