OSDN Git Service

wvm/gitlab.git
11 years agoFix removeing project if repo not exists
Dmitriy Zaporozhets [Fri, 25 Jan 2013 11:47:54 +0000 (13:47 +0200)]
Fix removeing project if repo not exists

11 years agoFixing team tests
Dmitriy Zaporozhets [Fri, 25 Jan 2013 09:36:15 +0000 (11:36 +0200)]
Fixing team tests

11 years agoallow/deny user to create group/team
Dmitriy Zaporozhets [Fri, 25 Jan 2013 09:30:49 +0000 (11:30 +0200)]
allow/deny user to create group/team

11 years agocan_create_group, can_create_team boolean fields for user
Dmitriy Zaporozhets [Fri, 25 Jan 2013 09:08:22 +0000 (11:08 +0200)]
can_create_group, can_create_team boolean fields for user

11 years agoMerge pull request #2746 from gitlabhq/features/teams
Dmitriy Zaporozhets [Fri, 25 Jan 2013 08:46:20 +0000 (00:46 -0800)]
Merge pull request #2746 from gitlabhq/features/teams

New feature: Teams

11 years agoFix for broken commit_url in graph
Dmitriy Zaporozhets [Fri, 25 Jan 2013 08:16:20 +0000 (10:16 +0200)]
Fix for broken commit_url in graph

11 years agofix spec
Dmitriy Zaporozhets [Fri, 25 Jan 2013 08:10:12 +0000 (10:10 +0200)]
fix spec

11 years agoImproved search. added filters
Dmitriy Zaporozhets [Fri, 25 Jan 2013 08:07:21 +0000 (10:07 +0200)]
Improved search. added filters

11 years agoRemove simple code duplication in members controllers
Andrey Kumanyaev [Thu, 24 Jan 2013 18:31:28 +0000 (22:31 +0400)]
Remove simple code duplication in members controllers

11 years agoUpdate check If user can assign project to team
Andrey Kumanyaev [Thu, 24 Jan 2013 18:19:18 +0000 (22:19 +0400)]
Update check If user can assign project to team

11 years agoremove unused code
Andrey Kumanyaev [Thu, 24 Jan 2013 18:18:43 +0000 (22:18 +0400)]
remove unused code

11 years agoReject non-owned projects to assign to teams
Dmitriy Zaporozhets [Thu, 24 Jan 2013 12:15:14 +0000 (14:15 +0200)]
Reject non-owned projects to assign to teams

11 years agoDont allow to select a project you have no right to assign
Dmitriy Zaporozhets [Thu, 24 Jan 2013 12:10:17 +0000 (14:10 +0200)]
Dont allow to select a project you have no right to assign

11 years agomove team navs to upper nav
Dmitriy Zaporozhets [Thu, 24 Jan 2013 11:39:00 +0000 (13:39 +0200)]
move team navs to upper nav

11 years agoMake a team and group boxes smaller on dashboard
Dmitriy Zaporozhets [Thu, 24 Jan 2013 09:43:09 +0000 (11:43 +0200)]
Make a team and group boxes smaller on dashboard

11 years agoFix mispelling and ambiguous id in UserTeam.without_project
Dmitriy Zaporozhets [Thu, 24 Jan 2013 09:19:09 +0000 (11:19 +0200)]
Fix mispelling and ambiguous id  in UserTeam.without_project

11 years agoShow only teams we have access to
Dmitriy Zaporozhets [Thu, 24 Jan 2013 08:39:16 +0000 (10:39 +0200)]
Show only teams we have access to

11 years agoFew UI improvements
Dmitriy Zaporozhets [Thu, 24 Jan 2013 08:16:03 +0000 (10:16 +0200)]
Few UI improvements

11 years agofix scope to empty relation
Andrey Kumanyaev [Wed, 23 Jan 2013 23:18:07 +0000 (03:18 +0400)]
fix scope to empty relation

11 years agoSwitch user link to profile link
Andrey Kumanyaev [Wed, 23 Jan 2013 23:00:56 +0000 (03:00 +0400)]
Switch user link to profile link

11 years agoRemove save files with failed test %)
Andrey Kumanyaev [Wed, 23 Jan 2013 21:40:45 +0000 (01:40 +0400)]
Remove save files with failed test %)

11 years agoRemove pending steps (no functional - no tests)
Andrey Kumanyaev [Wed, 23 Jan 2013 20:06:48 +0000 (00:06 +0400)]
Remove pending steps (no functional - no tests)

11 years agofix tests
Andrey Kumanyaev [Wed, 23 Jan 2013 19:39:47 +0000 (23:39 +0400)]
fix tests

11 years agosimple refactoring
Andrey Kumanyaev [Wed, 23 Jan 2013 16:43:23 +0000 (20:43 +0400)]
simple refactoring

11 years agoremove unused autogenerated files
Andrey Kumanyaev [Wed, 23 Jan 2013 16:42:38 +0000 (20:42 +0400)]
remove unused autogenerated files

11 years agoFix little bugs
Andrey Kumanyaev [Wed, 23 Jan 2013 14:14:53 +0000 (18:14 +0400)]
Fix little bugs

11 years agoassign team to project from project page in public section
Andrey Kumanyaev [Wed, 23 Jan 2013 14:14:20 +0000 (18:14 +0400)]
assign team to project from project page in public section

11 years agoupdate all teams code. refactoring and some corrections
Andrey Kumanyaev [Tue, 22 Jan 2013 22:20:27 +0000 (02:20 +0400)]
update all teams code. refactoring and some corrections

11 years agoupdate routes
Andrey Kumanyaev [Tue, 22 Jan 2013 21:03:52 +0000 (01:03 +0400)]
update routes

11 years agoAdd access control in public section to users teams
Andrey Kumanyaev [Tue, 22 Jan 2013 20:58:44 +0000 (00:58 +0400)]
Add access control in public section to users teams

11 years agoremove before_filter from controllers
Andrey Kumanyaev [Tue, 22 Jan 2013 17:29:19 +0000 (21:29 +0400)]
remove before_filter from controllers

11 years agorefactoring user team in public section
Andrey Kumanyaev [Tue, 22 Jan 2013 17:21:07 +0000 (21:21 +0400)]
refactoring user team in public section

11 years agorefactoring project team members controller (corresponding mental model)
Andrey Kumanyaev [Tue, 22 Jan 2013 17:20:39 +0000 (21:20 +0400)]
refactoring project team members controller (corresponding mental model)

11 years agoif project creator was remowed from Gitlab - creator is next admin, who edit this...
Andrey Kumanyaev [Tue, 22 Jan 2013 17:15:05 +0000 (21:15 +0400)]
if project creator was remowed from Gitlab - creator is next admin, who edit this project

11 years agoFix using context of Projects::UpdateContext (in admin section error, in public secti...
Andrey Kumanyaev [Tue, 22 Jan 2013 17:14:00 +0000 (21:14 +0400)]
Fix using context of Projects::UpdateContext (in admin section error, in public section - to next step if moving controlers)

11 years agomove Team_members controller into project (conflicts with team/members controller)
Andrey Kumanyaev [Mon, 21 Jan 2013 19:55:55 +0000 (23:55 +0400)]
move Team_members controller into project (conflicts with team/members controller)

11 years agosave autogenerated files
Andrey Kumanyaev [Sun, 20 Jan 2013 21:07:28 +0000 (01:07 +0400)]
save autogenerated files

11 years agorepair rspec (remove and rename files)
Andrey Kumanyaev [Sun, 20 Jan 2013 21:07:17 +0000 (01:07 +0400)]
repair rspec (remove and rename files)

11 years agoRepair admin section tests
Andrey Kumanyaev [Sun, 20 Jan 2013 21:06:11 +0000 (01:06 +0400)]
Repair admin section tests

11 years agoRemove old data
Andrey Kumanyaev [Sun, 20 Jan 2013 21:05:51 +0000 (01:05 +0400)]
Remove old data

11 years agoRepair members management of teams
Andrey Kumanyaev [Sun, 20 Jan 2013 21:04:53 +0000 (01:04 +0400)]
Repair members management of teams

11 years agoMove team project management to own controller
Andrey Kumanyaev [Sun, 20 Jan 2013 21:03:29 +0000 (01:03 +0400)]
Move team project management to own controller

11 years agosave generated files
Andrey Kumanyaev [Sun, 20 Jan 2013 11:25:45 +0000 (15:25 +0400)]
save generated files

11 years agoMove admin team members management to own controller
Andrey Kumanyaev [Sun, 20 Jan 2013 11:25:16 +0000 (15:25 +0400)]
Move admin team members management to own controller

11 years agoAdded the correct hierarchy of controllers for the administrative part
Andrey Kumanyaev [Sun, 20 Jan 2013 11:20:50 +0000 (15:20 +0400)]
Added the correct hierarchy of controllers for the administrative part

11 years agoAdmin rename team page is fixed
Andrey Kumanyaev [Sun, 20 Jan 2013 08:08:46 +0000 (12:08 +0400)]
Admin rename team page is fixed

11 years agofix simples errors in tests
Andrey Kumanyaev [Sun, 20 Jan 2013 07:46:15 +0000 (11:46 +0400)]
fix simples errors in tests

11 years agoRename Team class to ProjectTeam
Andrey Kumanyaev [Sat, 19 Jan 2013 18:52:55 +0000 (22:52 +0400)]
Rename Team class to ProjectTeam

11 years agosave commit
Andrey Kumanyaev [Sat, 19 Jan 2013 17:58:13 +0000 (21:58 +0400)]
save commit

11 years agocommit user team helper
Andrey Kumanyaev [Sat, 19 Jan 2013 17:55:59 +0000 (21:55 +0400)]
commit user team helper

11 years agoadd user team factories
Andrey Kumanyaev [Sat, 19 Jan 2013 17:53:03 +0000 (21:53 +0400)]
add user team factories

11 years agoupdate projects show css selector
Andrey Kumanyaev [Sat, 19 Jan 2013 17:51:42 +0000 (21:51 +0400)]
update projects show css selector

11 years agoadd into user decorator (presenter) to full user name
Andrey Kumanyaev [Sat, 19 Jan 2013 17:51:01 +0000 (21:51 +0400)]
add into user decorator (presenter) to full user name

11 years agoupdate stylesheets (for teams block)
Andrey Kumanyaev [Sat, 19 Jan 2013 17:50:03 +0000 (21:50 +0400)]
update stylesheets (for teams block)

11 years agoadd teams application controller
Andrey Kumanyaev [Sat, 19 Jan 2013 17:49:15 +0000 (21:49 +0400)]
add teams application controller

11 years agoadd dashboard teams block
Andrey Kumanyaev [Sat, 19 Jan 2013 17:48:46 +0000 (21:48 +0400)]
add dashboard teams block

11 years agoTeam projects public section
Andrey Kumanyaev [Sat, 19 Jan 2013 17:48:05 +0000 (21:48 +0400)]
Team projects public section

11 years agoTeam members public section
Andrey Kumanyaev [Sat, 19 Jan 2013 17:47:08 +0000 (21:47 +0400)]
Team members public section

11 years agoTeam core management
Andrey Kumanyaev [Sat, 19 Jan 2013 17:43:07 +0000 (21:43 +0400)]
Team core management

11 years agomerge into public
Andrey Kumanyaev [Sat, 19 Jan 2013 17:33:38 +0000 (21:33 +0400)]
merge into public

11 years agoAdd ability to teams
Andrey Kumanyaev [Sat, 19 Jan 2013 17:32:55 +0000 (21:32 +0400)]
Add ability to teams

11 years agoAdd teams into Public sections
Andrey Kumanyaev [Sat, 19 Jan 2013 17:32:09 +0000 (21:32 +0400)]
Add teams into Public sections

11 years agoAdmin teams section added
Andrey Kumanyaev [Sat, 19 Jan 2013 17:11:11 +0000 (21:11 +0400)]
Admin teams section added

11 years agoAdded UserTeam core models (team and m-t-m relationships) and updated other models
Andrey Kumanyaev [Sat, 19 Jan 2013 17:06:50 +0000 (21:06 +0400)]
Added UserTeam core models (team and m-t-m relationships) and updated other models

11 years agoUser can create group
Dmitriy Zaporozhets [Thu, 24 Jan 2013 15:47:09 +0000 (17:47 +0200)]
User can create group

11 years agoMerge pull request #2706 from jfut/gh-issue-2602
Dmitriy Zaporozhets [Wed, 23 Jan 2013 18:14:28 +0000 (10:14 -0800)]
Merge pull request #2706 from jfut/gh-issue-2602

Remove relative_url_root from path. Fixes #2602

11 years agoMerge pull request #2709 from hiroponz/improve-network-graph-2
Dmitriy Zaporozhets [Wed, 23 Jan 2013 18:13:40 +0000 (10:13 -0800)]
Merge pull request #2709 from hiroponz/improve-network-graph-2

Improve network graph

11 years agoMerge pull request #2712 from aus/patch-1
Dmitriy Zaporozhets [Wed, 23 Jan 2013 18:12:28 +0000 (10:12 -0800)]
Merge pull request #2712 from aus/patch-1

Revise projects/new text

11 years agoMerge pull request #2715 from cjwprostar/help-fix
Dmitriy Zaporozhets [Wed, 23 Jan 2013 18:11:29 +0000 (10:11 -0800)]
Merge pull request #2715 from cjwprostar/help-fix

Update Markdown example to use username

11 years agoUpdate Markdown example to use username
Chris Waguespack [Wed, 23 Jan 2013 15:58:38 +0000 (09:58 -0600)]
Update Markdown example to use username

Update the Markdown example in the Help pages to use username instead of user.

11 years agoRevise projects/new text
Austin Robertson [Wed, 23 Jan 2013 14:47:19 +0000 (08:47 -0600)]
Revise projects/new text

The previous text implied projects can only be private. Projects can now be private or public.

11 years agoImprove network graph
Sato Hiroyuki [Wed, 23 Jan 2013 12:34:19 +0000 (21:34 +0900)]
Improve network graph

11 years agoRemove relative_url_root from path. Fixes #2602
Jun Futagawa [Wed, 23 Jan 2013 08:29:46 +0000 (17:29 +0900)]
Remove relative_url_root from path. Fixes #2602

Files and Commits render a 404 when running with relative_url_root.

11 years agoMerge pull request #2695 from earzur/hotfix/fix_import_refactoring
Dmitriy Zaporozhets [Wed, 23 Jan 2013 06:38:59 +0000 (22:38 -0800)]
Merge pull request #2695 from earzur/hotfix/fix_import_refactoring

[import] - fix project import after refactoring

11 years ago[import] - fix project import after refactoring
Erwan Arzur [Tue, 22 Jan 2013 18:07:11 +0000 (19:07 +0100)]
[import] - fix project import after refactoring

11 years agoMerge branch 'features/profile_page'
Dmitriy Zaporozhets [Tue, 22 Jan 2013 17:55:01 +0000 (19:55 +0200)]
Merge branch 'features/profile_page'

11 years agochangelog
Dmitriy Zaporozhets [Tue, 22 Jan 2013 17:54:45 +0000 (19:54 +0200)]
changelog

11 years agoFix routing. Finalize user show page
Dmitriy Zaporozhets [Tue, 22 Jan 2013 17:45:13 +0000 (19:45 +0200)]
Fix routing. Finalize user show page

11 years agobase implementation
Dmitriy Zaporozhets [Tue, 22 Jan 2013 17:05:01 +0000 (19:05 +0200)]
base implementation

11 years agoMerge branch 'features/help_with_index'
Dmitriy Zaporozhets [Tue, 22 Jan 2013 15:58:40 +0000 (17:58 +0200)]
Merge branch 'features/help_with_index'

11 years agoHelp with index
Dmitriy Zaporozhets [Tue, 22 Jan 2013 15:58:09 +0000 (17:58 +0200)]
Help with index

11 years agofix tests
Valeriy Sizov [Tue, 22 Jan 2013 15:25:35 +0000 (17:25 +0200)]
fix tests

11 years agoremove length of issue content
Valeriy Sizov [Tue, 22 Jan 2013 15:15:22 +0000 (17:15 +0200)]
remove length of issue content

according to #2677

11 years agoremove length of snippet content
Valeriy Sizov [Tue, 22 Jan 2013 15:10:00 +0000 (17:10 +0200)]
remove length of snippet content

11 years agoMerge pull request #2684 from rk4an/patch-1
Riyad Preukschas [Tue, 22 Jan 2013 12:36:18 +0000 (04:36 -0800)]
Merge pull request #2684 from rk4an/patch-1

Fix typo in gitlab.yml.example

11 years agoUpdate config/gitlab.yml.example
Erkan [Tue, 22 Jan 2013 09:04:02 +0000 (10:04 +0100)]
Update config/gitlab.yml.example

11 years agoUse subproccess instead subshell for git calls
Dmitriy Zaporozhets [Tue, 22 Jan 2013 08:35:58 +0000 (10:35 +0200)]
Use subproccess instead subshell for git calls

11 years agodone with 4.1. Version to 4.2.0pre :)
Dmitriy Zaporozhets [Mon, 21 Jan 2013 14:36:55 +0000 (16:36 +0200)]
done with 4.1. Version to 4.2.0pre :)

11 years agoAdd warning if user own projet but not in team. Also show loading when merge MR
Dmitriy Zaporozhets [Mon, 21 Jan 2013 13:05:18 +0000 (15:05 +0200)]
Add warning if user own projet but not in team. Also show loading when merge MR

11 years agoReporter cant create MR. Show user authorized projects in Admin area
Dmitriy Zaporozhets [Mon, 21 Jan 2013 12:16:48 +0000 (14:16 +0200)]
Reporter cant create MR. Show user authorized projects in Admin area

11 years agoMerge pull request #2673 from AlexDenisov/submodule_rendering_bug
Dmitriy Zaporozhets [Mon, 21 Jan 2013 10:23:23 +0000 (02:23 -0800)]
Merge pull request #2673 from AlexDenisov/submodule_rendering_bug

Render submodule bugfix

11 years agoRender empty string instead of nil
Alex Denisov [Mon, 21 Jan 2013 09:48:25 +0000 (09:48 +0000)]
Render empty string instead of nil

11 years agogitlab 4.1rc
Dmitriy Zaporozhets [Mon, 21 Jan 2013 07:06:25 +0000 (09:06 +0200)]
gitlab 4.1rc

11 years agoFix application crash on help page
Dmitriy Zaporozhets [Sun, 20 Jan 2013 12:17:56 +0000 (14:17 +0200)]
Fix application crash on help page

11 years agoUpdate text on help#public_access page
Riyad Preukschas [Sat, 19 Jan 2013 14:23:05 +0000 (15:23 +0100)]
Update text on help#public_access page

11 years agoFix public/projects#index page
Riyad Preukschas [Sat, 19 Jan 2013 14:22:41 +0000 (15:22 +0100)]
Fix public/projects#index page

11 years agoSmall fixes
Riyad Preukschas [Sat, 19 Jan 2013 00:47:57 +0000 (01:47 +0100)]
Small fixes

11 years agoRedo help#help_pages partial
Riyad Preukschas [Sat, 19 Jan 2013 00:35:16 +0000 (01:35 +0100)]
Redo help#help_pages partial

11 years agoReorder help routes
Riyad Preukschas [Sat, 19 Jan 2013 00:34:11 +0000 (01:34 +0100)]
Reorder help routes

11 years agoFix public layout
Riyad Preukschas [Sat, 19 Jan 2013 00:33:27 +0000 (01:33 +0100)]
Fix public layout