OSDN Git Service
Dmitriy Zaporozhets [Sat, 22 Jun 2013 09:57:05 +0000 (12:57 +0300)]
cache project.team.members
Dmitriy Zaporozhets [Sat, 22 Jun 2013 08:38:47 +0000 (11:38 +0300)]
Colors for author additions/develtions in graph
Dmitriy Zaporozhets [Sat, 22 Jun 2013 08:19:12 +0000 (11:19 +0300)]
Merge branch 'master' into 6-0-dev
Conflicts:
VERSION
db/schema.rb
Dmitriy Zaporozhets [Sat, 22 Jun 2013 08:14:07 +0000 (01:14 -0700)]
Merge pull request #3408 from NARKOZ/patch-2
add db index for authentication_token column in users table
Dmitriy Zaporozhets [Sat, 22 Jun 2013 08:02:31 +0000 (11:02 +0300)]
You should not be able to remove a Group owner
Dmitriy Zaporozhets [Sat, 22 Jun 2013 07:56:51 +0000 (10:56 +0300)]
Send project transfer email to all members. Added specs for project move email
Dmitriy Zaporozhets [Fri, 21 Jun 2013 21:11:06 +0000 (00:11 +0300)]
Show also group members on project page at admin area
Dmitriy Zaporozhets [Fri, 21 Jun 2013 21:06:21 +0000 (00:06 +0300)]
Markdown now support users from groups
Dmitriy Zaporozhets [Fri, 21 Jun 2013 21:02:09 +0000 (00:02 +0300)]
Make it possible to assign/mention users from group members
Dmitriy Zaporozhets [Fri, 21 Jun 2013 20:47:42 +0000 (23:47 +0300)]
prevent document unbind since it breaks rails ujs
Dmitriy Zaporozhets [Fri, 21 Jun 2013 20:36:02 +0000 (23:36 +0300)]
Fix notifications for group projects
Dmitriy Zaporozhets [Fri, 21 Jun 2013 20:21:55 +0000 (23:21 +0300)]
Respect group membership in notification service
Dmitriy Zaporozhets [Fri, 21 Jun 2013 20:19:30 +0000 (23:19 +0300)]
You can setup per-group notification level
Dmitriy Zaporozhets [Fri, 21 Jun 2013 20:17:58 +0000 (23:17 +0300)]
Adding groups to notification settings
Dmitriy Zaporozhets [Fri, 21 Jun 2013 20:17:41 +0000 (23:17 +0300)]
Notifiable concern
Dmitriy Zaporozhets [Fri, 21 Jun 2013 20:17:20 +0000 (23:17 +0300)]
Add notification level to group membership
Dmitriy Zaporozhets [Fri, 21 Jun 2013 19:49:14 +0000 (19:49 +0000)]
Merge branch 'install-guide-improvements' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 21 Jun 2013 19:47:49 +0000 (22:47 +0300)]
Do not create a User <-> Project relation if project is under group
Dmitriy Zaporozhets [Fri, 21 Jun 2013 19:44:40 +0000 (22:44 +0300)]
Use own abilities for namespace class
Dmitriy Zaporozhets [Fri, 21 Jun 2013 19:38:43 +0000 (22:38 +0300)]
User#owned_groups is now respect group membership
Dmitriy Zaporozhets [Fri, 21 Jun 2013 19:34:38 +0000 (22:34 +0300)]
Unbind all document.on click/scroll after page fetch
Dmitriy Zaporozhets [Fri, 21 Jun 2013 19:29:30 +0000 (22:29 +0300)]
Unbind note events to prevent firing twice with turbolinks
Sytse Sijbrandij [Fri, 21 Jun 2013 19:18:20 +0000 (21:18 +0200)]
Merge branch 'master' into install-guide-improvements
Conflicts:
doc/install/installation.md
Dmitriy Zaporozhets [Fri, 21 Jun 2013 19:08:16 +0000 (22:08 +0300)]
Remove $.ready events
Dmitriy Zaporozhets [Fri, 21 Jun 2013 18:50:34 +0000 (21:50 +0300)]
Remove tests for missing method
Dmitriy Zaporozhets [Fri, 21 Jun 2013 13:42:59 +0000 (16:42 +0300)]
Since masters_projects does not cover most of cases now we use authorized_projects for DeployKey read access
Dmitriy Zaporozhets [Fri, 21 Jun 2013 13:36:28 +0000 (16:36 +0300)]
Improve query of authorized_projects. Cache results for authorized_groups, authorized_projects methods
Dmitriy Zaporozhets [Fri, 21 Jun 2013 13:16:05 +0000 (16:16 +0300)]
Remove invalid information from /u/:user page
Dmitriy Zaporozhets [Fri, 21 Jun 2013 06:19:31 +0000 (09:19 +0300)]
Better name for sign in tab
Dmitriy Zaporozhets [Fri, 21 Jun 2013 05:51:15 +0000 (08:51 +0300)]
Fix spell error in sing in
Dmitriy Zaporozhets [Thu, 20 Jun 2013 12:59:39 +0000 (15:59 +0300)]
Dark color for group name at header. Better name for activity
Dmitriy Zaporozhets [Thu, 20 Jun 2013 10:29:17 +0000 (13:29 +0300)]
Fix admin:groups test
Dmitriy Zaporozhets [Thu, 20 Jun 2013 10:14:23 +0000 (13:14 +0300)]
Fix seeds. More projects for dev seeds
Dmitriy Zaporozhets [Thu, 20 Jun 2013 09:06:44 +0000 (12:06 +0300)]
Fix user add to group from admin area
Dmitriy Zaporozhets [Thu, 20 Jun 2013 08:46:54 +0000 (11:46 +0300)]
Classic (mars) theme will be default for 6.0
Dmitriy Zaporozhets [Thu, 20 Jun 2013 08:32:59 +0000 (11:32 +0300)]
New logo/color for login screen
Dmitriy Zaporozhets [Thu, 20 Jun 2013 06:51:09 +0000 (09:51 +0300)]
Update docs from 5.2 to 5.3
Dmitriy Zaporozhets [Wed, 19 Jun 2013 20:03:43 +0000 (23:03 +0300)]
Add < 1200px support for project filter on dashboard
Dmitriy Zaporozhets [Wed, 19 Jun 2013 19:55:49 +0000 (22:55 +0300)]
Move from table to list for Hooks page
Dmitriy Zaporozhets [Wed, 19 Jun 2013 19:52:57 +0000 (22:52 +0300)]
Fixed sub navs spinach tests for project
Dmitriy Zaporozhets [Wed, 19 Jun 2013 19:44:57 +0000 (22:44 +0300)]
Squash project settings navs
Dmitriy Zaporozhets [Wed, 19 Jun 2013 18:58:52 +0000 (21:58 +0300)]
Dont show remove/modify controls for personal project owner
Dmitriy Zaporozhets [Wed, 19 Jun 2013 16:57:32 +0000 (19:57 +0300)]
Version to 5.3
Dmitriy Zaporozhets [Wed, 19 Jun 2013 16:54:10 +0000 (19:54 +0300)]
Restore users assoc with project
Dmitriy Zaporozhets [Wed, 19 Jun 2013 16:50:28 +0000 (16:50 +0000)]
Merge branch 'improve/dash_projects_page' of /home/git/repositories/gitlab/gitlabhq into 6-0-dev
Dmitriy Zaporozhets [Wed, 19 Jun 2013 16:50:14 +0000 (16:50 +0000)]
Merge branch 'remove/root_namespace' of /home/git/repositories/gitlab/gitlabhq into 6-0-dev
Dmitriy Zaporozhets [Wed, 19 Jun 2013 16:48:48 +0000 (19:48 +0300)]
Migrate global project taks. Removed more teams related functionality
Dmitriy Zaporozhets [Wed, 19 Jun 2013 16:38:43 +0000 (19:38 +0300)]
Fix random failing tests with project teams
Dmitriy Zaporozhets [Wed, 19 Jun 2013 15:32:08 +0000 (18:32 +0300)]
Remove Global namespace from options. Prepared file for migration of global projects
Dmitriy Zaporozhets [Wed, 19 Jun 2013 15:24:18 +0000 (18:24 +0300)]
Remove dash projects search test
Dmitriy Zaporozhets [Wed, 19 Jun 2013 14:48:43 +0000 (17:48 +0300)]
Remove second search. More compact list. Additional filter
Dmitriy Zaporozhets [Wed, 19 Jun 2013 12:40:33 +0000 (15:40 +0300)]
Annotated
Dmitriy Zaporozhets [Wed, 19 Jun 2013 10:52:25 +0000 (13:52 +0300)]
Filter projects on dashboard
Dmitriy Zaporozhets [Wed, 19 Jun 2013 05:39:46 +0000 (05:39 +0000)]
Merge branch 'remove/user_teams' of /home/git/repositories/gitlab/gitlabhq into 6-0-dev
Dmitriy Zaporozhets [Tue, 18 Jun 2013 19:06:20 +0000 (22:06 +0300)]
Remove teams specs
Dmitriy Zaporozhets [Tue, 18 Jun 2013 18:54:31 +0000 (21:54 +0300)]
More userteam links removed. Removed teams spinach tests
Dmitriy Zaporozhets [Tue, 18 Jun 2013 18:44:04 +0000 (21:44 +0300)]
Remove team factories and few links
Dmitriy Zaporozhets [Tue, 18 Jun 2013 18:31:17 +0000 (11:31 -0700)]
Merge pull request #4325 from zzet/patch-1
Remove unused but slow code
Dmitriy Zaporozhets [Tue, 18 Jun 2013 18:22:34 +0000 (21:22 +0300)]
Remove all team resources except models. Move models to deprecated directory
Dmitriy Zaporozhets [Tue, 18 Jun 2013 18:05:43 +0000 (21:05 +0300)]
Version to 6.0.0.pre
Dmitriy Zaporozhets [Tue, 18 Jun 2013 16:34:32 +0000 (19:34 +0300)]
Merge branch 'feature/users_groups' into 6-0-dev
Dmitriy Zaporozhets [Tue, 18 Jun 2013 15:58:33 +0000 (18:58 +0300)]
Prevent page crash if failed to parse graphs data
Dmitriy Zaporozhets [Tue, 18 Jun 2013 15:39:18 +0000 (18:39 +0300)]
Fixin tests
Dmitriy Zaporozhets [Tue, 18 Jun 2013 14:32:33 +0000 (17:32 +0300)]
Update admin area with new group memberships
Dmitriy Zaporozhets [Tue, 18 Jun 2013 14:09:04 +0000 (17:09 +0300)]
Proper naming for project members page
Dmitriy Zaporozhets [Tue, 18 Jun 2013 13:56:31 +0000 (16:56 +0300)]
Add owner to group members after group create
Dmitriy Zaporozhets [Mon, 17 Jun 2013 18:00:59 +0000 (21:00 +0300)]
Restyle project members page to fit both group and personal projects
Dmitriy Zaporozhets [Mon, 17 Jun 2013 16:59:41 +0000 (19:59 +0300)]
Update authorized/owned resources with new group permissions
Dmitriy Zaporozhets [Mon, 17 Jun 2013 14:55:43 +0000 (17:55 +0300)]
Show group members on project team page
Dmitriy Zaporozhets [Mon, 17 Jun 2013 14:03:56 +0000 (17:03 +0300)]
Fix UsersGroup specs
Dmitriy Zaporozhets [Mon, 17 Jun 2013 14:00:24 +0000 (17:00 +0300)]
Fix spinach group
Dmitriy Zaporozhets [Mon, 17 Jun 2013 13:51:43 +0000 (16:51 +0300)]
Added UsersGroup scaffold. Simplify adding people to group
Dmitriy Zaporozhets [Mon, 17 Jun 2013 12:38:19 +0000 (15:38 +0300)]
Project Team now supports a non-group projects
Dmitriy Zaporozhets [Mon, 17 Jun 2013 11:55:41 +0000 (14:55 +0300)]
Use project.team over project.users
Dmitriy Zaporozhets [Mon, 17 Jun 2013 11:17:32 +0000 (14:17 +0300)]
Add UsersGroup relation to be respected by abilities and Project#team
Dmitriy Zaporozhets [Mon, 17 Jun 2013 10:41:35 +0000 (13:41 +0300)]
UsersGroup specs. Fixed db/schema
Dmitriy Zaporozhets [Mon, 17 Jun 2013 10:26:58 +0000 (13:26 +0300)]
Added UsersGroup validations. Added ability to add UsersGroup to group via UI
Dmitriy Zaporozhets [Mon, 17 Jun 2013 10:07:16 +0000 (13:07 +0300)]
create UsersGroup entity. Modify ability to check group owners instead one owner
Dmitriy Zaporozhets [Tue, 18 Jun 2013 14:43:49 +0000 (17:43 +0300)]
Use navless layout for snippets page
Dmitriy Zaporozhets [Mon, 17 Jun 2013 10:29:50 +0000 (13:29 +0300)]
Fix Issue.open_for
Yves Senn [Mon, 17 Jun 2013 13:05:10 +0000 (06:05 -0700)]
Merge pull request #4279 from barendt/patch-2
Fix paths to the Contents Markdown pages
Andrew Kumanyaev [Mon, 17 Jun 2013 11:52:54 +0000 (15:52 +0400)]
Remove unused, but slow code
Dmitriy Zaporozhets [Mon, 17 Jun 2013 08:57:37 +0000 (11:57 +0300)]
Fixed tests. Fixed overrided scope. Better usability for milestone view
Dmitriy Zaporozhets [Mon, 17 Jun 2013 06:32:09 +0000 (23:32 -0700)]
Merge pull request #4269 from dosire/scrum-view-for-milestone
Scrum view style milestone view.
Sytse Sijbrandij [Sun, 16 Jun 2013 20:06:33 +0000 (22:06 +0200)]
Fix spelling error and make sure you never log in as git user so you never have to logout to run sudo.
Dmitriy Zaporozhets [Sat, 15 Jun 2013 10:10:43 +0000 (13:10 +0300)]
FIx userteams tests
Nihad Abbasov [Tue, 26 Mar 2013 14:34:32 +0000 (07:34 -0700)]
add db index for authentication_token column in users table
Dmitriy Zaporozhets [Fri, 14 Jun 2013 16:58:16 +0000 (19:58 +0300)]
Fix MR feature
Dmitriy Zaporozhets [Fri, 14 Jun 2013 14:19:26 +0000 (17:19 +0300)]
Check for existing MR only for opened/reopened MR
Dmitriy Zaporozhets [Fri, 14 Jun 2013 13:30:48 +0000 (16:30 +0300)]
Add imported boolean to project. Prevent shell from creating repo after it was imported
Dmitriy Zaporozhets [Fri, 14 Jun 2013 12:20:22 +0000 (05:20 -0700)]
Merge pull request #4314 from Undev/feature/redesign_forms
Switch form from table to plain form without member list
Dmitriy Zaporozhets [Fri, 14 Jun 2013 12:17:47 +0000 (15:17 +0300)]
IMprove MR validation logic
Sytse Sijbrandij [Fri, 14 Jun 2013 12:13:14 +0000 (14:13 +0200)]
Implement (style) suggestions.
Dmitriy Zaporozhets [Fri, 14 Jun 2013 12:03:22 +0000 (15:03 +0300)]
Prevent creating several open merge requests for same branches
Dmitriy Zaporozhets [Fri, 14 Jun 2013 11:42:55 +0000 (14:42 +0300)]
Refactor grack auth module. Add git over http wiki support
Andrey Kumanyaev [Fri, 14 Jun 2013 11:08:21 +0000 (15:08 +0400)]
Switch for from table to plain form without member list
Dmitriy Zaporozhets [Fri, 14 Jun 2013 09:58:12 +0000 (12:58 +0300)]
Fix mailer test
Dmitriy Zaporozhets [Fri, 14 Jun 2013 05:37:55 +0000 (08:37 +0300)]
Fix tab tests. Prevent 500 if user.last_sign_in_at is nil
Dmitriy Zaporozhets [Thu, 13 Jun 2013 19:58:27 +0000 (22:58 +0300)]
Move project nav checks to helper
Dmitriy Zaporozhets [Thu, 13 Jun 2013 18:09:26 +0000 (18:09 +0000)]
Merge branch 'feature/password_expire' of /home/git/repositories/gitlab/gitlabhq