deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4744 commits 6 branches 43 tags 25 MiB
Commit graph

673 commits

Author SHA1 Message Date
Andrew8xx8 6d68923edc human_merge_status replaced by human_merge_status_name 2013-02-20 17:50:29 +04:00
Dmitriy Zaporozhets 155703c613 Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine 
Conflicts:
	app/models/issue.rb
	app/models/merge_request.rb
 2013-02-19 11:01:19 +02:00
Dmitriy Zaporozhets 52028dcd2d Merge pull request #3013 from crystax/master 
Sort groups alphabetically on dashboard page
 2013-02-19 00:51:08 -08:00
Dmitry Moskalchuk f7ae1bce25 Syntax fix of sorting groups/users 2013-02-19 11:13:19 +04:00
Dmitriy Zaporozhets ba937b2b3d Dont show assigned_teams block unless any. Show count in filter 2013-02-18 21:21:24 +02:00
Dmitriy Zaporozhets a29db26cc9 Refactor and restyle team page for project 2013-02-18 21:10:49 +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
Dmitriy Zaporozhets 97de6f851b Fix not-working team memebership permissions change 2013-02-18 16:40:11 +02:00
Dmitriy Zaporozhets 01a7250ba5 Add user to team he creates 2013-02-18 14:35:38 +02:00
Andrew8xx8 0b512af803 Milestone uses StateMachine now 2013-02-18 14:43:50 +04:00
Andrew8xx8 b45e9aefd3 Merge Request uses StateMachine now 2013-02-18 14:43:50 +04:00
Andrew8xx8 8db3920c01 State renamed to merge_status 2013-02-18 14:43:49 +04:00
Dmitry Moskalchuk a9c1b85e08 Sort groups/namespaces by human name 2013-02-16 19:40:33 +04:00
Dmitry Moskalchuk 2a4ef0fe49 Sort groups alphabetically on dashboard page 2013-02-16 19:11:36 +04:00
Dmitriy Zaporozhets fa3cc1dd24 Merge branch 'features/attachment_server' of /home/git/repositories/gitlab/gitlabhq 2013-02-16 12:45:20 +00:00
Dmitriy Zaporozhets f6cc71bc36 Per project protection 2013-02-15 09:51:21 +02:00
Dmitriy Zaporozhets 4821aa6c25 skip protection to aws3 2013-02-15 09:49:35 +02: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 ddea7d1689 Merge branch 'easy-to-find-commit-on-network-graph' of https://github.com/hiroponz/gitlabhq into hiroponz-easy-to-find-commit-on-network-graph 2013-02-12 19:02:05 +02:00
Dmitriy Zaporozhets 06dd530ede Merge branch 'user_delete_account' of /home/git/repositories/gitlab/gitlabhq 2013-02-12 10:53:51 +00:00
Dmitriy Zaporozhets 806b76a168 rename scope to prevent name collision 2013-02-12 11:46:50 +02:00
Dmitriy Zaporozhets a699ebdbcc handle attahcment with send_file 2013-02-11 21:31:19 +02:00
Dmitriy Zaporozhets d64090b8a9 No gitolite in project any more 2013-02-11 19:16:59 +02:00
Marin Jankovski 1b4ba3eb99 Add user delete option. 2013-02-06 12:44:09 +01:00
Sato Hiroyuki 8ff5cf9cd5 Add search box for the commit. 2013-02-05 19:08:09 +09:00
Sato Hiroyuki 81cc1cb87b Enable to display the commit older than 650th commit. 2013-02-05 12:42:30 +09:00
Dmitriy Zaporozhets 27d9ac0fe8 Make gitlab works with gitlab-shell 2013-02-04 15:07:56 +02:00
Dmitriy Zaporozhets 85de55a120 Dont allow gitlab be loaded in iframe 2013-02-02 20:32:13 +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
Sato Hiroyuki 525a8cd3e9 Switchable the main branch on network graph 2013-01-30 09:12:03 +09: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 b68bba441e Fix projects in admin -> user -> show 2013-01-26 12:15:38 +02:00
Dmitriy Zaporozhets 0125b74b3c Fix application crashes after #2772 2013-01-26 12:08:34 +02:00
Andrey Kumanyaev c5cbbea82e rewrite admin users controller (use 1 variable and find by username) 2013-01-25 22:38:24 +04:00
Andrey Kumanyaev df64bdffdf Update user finding (by username) in teams members (team of users) controller 2013-01-25 22:35:31 +04:00
Andrey Kumanyaev e1679d20c7 Update user finding (by username) in teams_members (project team) controller 2013-01-25 22:34:49 +04:00
Andrey Kumanyaev f225ff8674 Update user finding (by username) in admin teams members controller 2013-01-25 22:33:49 +04: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 6743ecec59 Fix redirects. Add link to new team and new group 2013-01-25 16:18:37 +02:00
Dmitriy Zaporozhets 6350b32a3d Fix security issues with teams 2013-01-25 15:51:45 +02:00
Dmitriy Zaporozhets 3ddd9f753c Fix mass-assignment. Dont allow users w/o access to create team 2013-01-25 15:42:41 +02:00
Dmitriy Zaporozhets 5aca1d64e0 Fix project adding to team 2013-01-25 13:56:04 +02:00
Dmitriy Zaporozhets 00e4a479d3 allow/deny user to create group/team 2013-01-25 11:30:49 +02:00
Dmitriy Zaporozhets aa1f1eb680 Merge pull request #2746 from gitlabhq/features/teams 
New feature: Teams
 2013-01-25 00:46:20 -08:00
Dmitriy Zaporozhets ac8247b46d Improved search. added filters 2013-01-25 10:07:21 +02:00
Andrey Kumanyaev d839f6c525 Remove simple code duplication in members controllers 2013-01-24 22:31:49 +02:00
Andrey Kumanyaev e52fec9cd9 Update check If user can assign project to team 2013-01-24 22:31:49 +02:00
Andrey Kumanyaev 6d713e84e1 remove unused code 2013-01-24 22:31:49 +02:00
Dmitriy Zaporozhets 7403afea97 Reject non-owned projects to assign to teams 2013-01-24 22:31:49 +02:00
Dmitriy Zaporozhets b4967b3703 Dont allow to select a project you have no right to assign 2013-01-24 22:31:49 +02:00
Dmitriy Zaporozhets ca752e64fb Fix mispelling and ambiguous id in UserTeam.without_project 2013-01-24 22:31:49 +02:00
Dmitriy Zaporozhets ca105d0462 Show only teams we have access to 2013-01-24 22:31:49 +02:00
Dmitriy Zaporozhets 645f960475 Few UI improvements 2013-01-24 22:31:49 +02:00
Andrey Kumanyaev 690db9693f fix tests 2013-01-24 22:31:48 +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 18bd1c9d30 update all teams code. refactoring and some corrections 2013-01-24 22:31:25 +02:00
Andrey Kumanyaev 7534154b44 Add access control in public section to users teams 2013-01-24 22:31:25 +02:00
Andrey Kumanyaev dcea52203d remove before_filter from controllers 2013-01-24 22:31:25 +02:00
Andrey Kumanyaev f87b76a805 refactoring user team in public section 2013-01-24 22:31:25 +02:00
Andrey Kumanyaev f6f414ce3b refactoring project team members controller (corresponding mental model) 2013-01-24 22:31:25 +02:00
Andrey Kumanyaev ccf8fa4fa2 if project creator was remowed from Gitlab - creator is next admin, who edit this project 2013-01-24 22:31:25 +02:00
Andrey Kumanyaev 4ce715a360 Fix using context of Projects::UpdateContext (in admin section error, in public section - to next step if moving controlers) 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 a7667ffc14 Repair members management of teams 2013-01-24 22:31:24 +02:00
Andrey Kumanyaev b7470440ff Move team project management to own controller 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 9d318db48f Added the correct hierarchy of controllers for the administrative part 2013-01-24 22:31:24 +02:00
Andrey Kumanyaev b9a7bcb6a4 add teams application controller 2013-01-24 22:31:24 +02:00
Andrey Kumanyaev 3c6e144608 add dashboard teams block 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
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
Dmitriy Zaporozhets af7dcda1cb Fix project creation 2013-01-18 22:23:11 +02:00
Dmitriy Zaporozhets 6f05ea4f6e Improve CreateContext call. Fixed test 2013-01-18 20:21:13 +02:00
GitLab 232d61d598 Refactor project creation. Added logout link to profile page 2013-01-17 17:35:57 +02:00
Marin Jankovski 296cdd591f Add optional signup. 2013-01-18 11:57:31 +01:00
Riyad Preukschas bda7fe38d0 Merge branch 'master' into discussions 2013-01-15 00:53:00 +01:00
Riyad Preukschas 3022786948 Merge commit 'master' into discussions 
Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb
 2013-01-15 00:52:25 +01:00
Dmitriy Zaporozhets f716c0a1dd profjects filter with_push to project model 2013-01-14 09:44:27 +02:00
Dmitriy Zaporozhets 8543313bf5 Few more filters for admin / projects 2013-01-14 09:37:29 +02:00
Dmitriy Zaporozhets 68bfcd0521 Add public filter to admin projects 2013-01-13 17:25:18 +02:00
Dmitriy Zaporozhets 122acb2254 fix unauth for public 2013-01-13 17:25:18 +02:00
Dmitriy Zaporozhets 4c6224aad1 Public git read-only access via http 2013-01-13 17:25:18 +02:00
Riyad Preukschas fd836f5490 Update empty error messages and warn if not viewing the most recent wiki page 2013-01-11 21:04:21 +01:00
Riyad Preukschas 167f26b90d Add an ordering scope to Wiki 2013-01-11 20:04:14 +01:00
Alex Denisov 97d17cf835 Event filters stores at cookies. 2013-01-09 19:30:20 +00:00
Dmitriy Zaporozhets c7bb3a1f72 sidekiq 2013-01-09 08:14:05 +03:00
Dmitriy Zaporozhets aa97ff7fde Fixed tree logs for branches with slash. Fixed remember of path when switch branch 2013-01-09 09:34:26 +02:00
Dmitriy Zaporozhets cc64f2a814 Common filtering for dashboard and group. Share partial search result partial 2013-01-07 20:52:43 +02:00
Dmitriy Zaporozhets baf591cc27 Fix network test and snippets expired 2013-01-05 23:49:01 +02:00
Dmitriy Zaporozhets eded4bfa95 Raise exception and show message to user if repo missing satellite 2013-01-05 23:09:26 +02:00