OSDN Git Service

wvm/gitlab.git
11 years agoMerge remote-tracking branch 'github/master'
Lennart Rosam [Mon, 28 Jan 2013 12:04:23 +0000 (13:04 +0100)]
Merge remote-tracking branch 'github/master'

11 years agoFix rake task - Update method name
Lennart Rosam [Mon, 28 Jan 2013 11:54:07 +0000 (12:54 +0100)]
Fix rake task - Update method name

11 years agofix tests
Dmitriy Zaporozhets [Mon, 28 Jan 2013 06:59:34 +0000 (08:59 +0200)]
fix tests

11 years agoMerge pull request #2153 from koenpunt/commit-diff-views
Dmitriy Zaporozhets [Sun, 27 Jan 2013 19:41:23 +0000 (11:41 -0800)]
Merge pull request #2153 from koenpunt/commit-diff-views

Added swipe view for image diff

11 years agoUpdated commit diff view with some minor visual modifications
Koen Punt [Sat, 1 Dec 2012 12:49:21 +0000 (13:49 +0100)]
Updated commit diff view with some minor visual modifications
Prepared diff view for multiple view modes

Converted commits.js to coffeescript
image info in separate coffeescript file

Added swipe view mode

Added onion skin viewMode

11 years agoAdd deploy.html for symlink if maintaince
Dmitriy Zaporozhets [Sun, 27 Jan 2013 17:09:40 +0000 (19:09 +0200)]
Add deploy.html for symlink if maintaince

11 years agoMerge pull request #2768 from rlaneve/feature/queued-web-hooks
Dmitriy Zaporozhets [Sun, 27 Jan 2013 16:52:37 +0000 (08:52 -0800)]
Merge pull request #2768 from rlaneve/feature/queued-web-hooks

Updates web hooks to process via queue

11 years agoPager.js to coffee
Dmitriy Zaporozhets [Sun, 27 Jan 2013 16:47:19 +0000 (18:47 +0200)]
Pager.js to coffee

11 years agoMerge pull request #2787 from gitlabhq/features/projects_page
Dmitriy Zaporozhets [Sun, 27 Jan 2013 13:55:22 +0000 (05:55 -0800)]
Merge pull request #2787 from gitlabhq/features/projects_page

Feature: Projects page

11 years agofeature tests
Dmitriy Zaporozhets [Sun, 27 Jan 2013 13:41:35 +0000 (15:41 +0200)]
feature tests

11 years agoFix features
Dmitriy Zaporozhets [Sun, 27 Jan 2013 12:10:42 +0000 (14:10 +0200)]
Fix features

11 years agoFixed dashboard show specs
Dmitriy Zaporozhets [Sun, 27 Jan 2013 11:20:23 +0000 (13:20 +0200)]
Fixed dashboard show specs

11 years agoMake group name a link at header
Dmitriy Zaporozhets [Sun, 27 Jan 2013 11:12:30 +0000 (13:12 +0200)]
Make group name a link at header

11 years agoDashboard to resource
Dmitriy Zaporozhets [Sun, 27 Jan 2013 10:56:20 +0000 (12:56 +0200)]
Dashboard to resource

11 years agoAdd projects page to dashboard. Remove projects pagination on dashboard
Dmitriy Zaporozhets [Sun, 27 Jan 2013 10:34:27 +0000 (12:34 +0200)]
Add projects page to dashboard. Remove projects pagination on dashboard

11 years agoMerge pull request #2784 from AlexDenisov/gitlab_check_environment
Riyad Preukschas [Sat, 26 Jan 2013 19:51:17 +0000 (11:51 -0800)]
Merge pull request #2784 from AlexDenisov/gitlab_check_environment

Missing environment added to 'Try fixing it' block

11 years agoMissed environment added to 'Try fixing it' block
Alex Denisov [Sat, 26 Jan 2013 14:22:48 +0000 (14:22 +0000)]
Missed environment added to 'Try fixing it' block

11 years agoFix projects in admin -> user -> show
Dmitriy Zaporozhets [Sat, 26 Jan 2013 10:15:38 +0000 (12:15 +0200)]
Fix projects in admin -> user -> show

11 years agoFix application crashes after #2772
Dmitriy Zaporozhets [Sat, 26 Jan 2013 10:08:34 +0000 (12:08 +0200)]
Fix application crashes after #2772

11 years agoMerge pull request #2772 from zzet/bugfix/path_and_page-project-member-access-#2745
Dmitriy Zaporozhets [Fri, 25 Jan 2013 21:45:08 +0000 (13:45 -0800)]
Merge pull request #2772 from zzet/bugfix/path_and_page-project-member-access-#2745

fix edit project members access link and page fixes refs #2745

11 years agoMerge pull request #2777 from zzet/add_project_button
Dmitriy Zaporozhets [Fri, 25 Jan 2013 21:42:52 +0000 (13:42 -0800)]
Merge pull request #2777 from zzet/add_project_button

Add assign project to team button on team page

11 years agoDisplay actual user role (admin or not) in team members list
Andrey Kumanyaev [Fri, 25 Jan 2013 21:14:36 +0000 (01:14 +0400)]
Display actual user role (admin or not) in team members list

11 years agoEdit create new team text
Andrey Kumanyaev [Fri, 25 Jan 2013 20:38:21 +0000 (00:38 +0400)]
Edit create new team text

11 years agofix copied code. Add assign projects button.
Andrey Kumanyaev [Fri, 25 Jan 2013 20:37:55 +0000 (00:37 +0400)]
fix copied code. Add assign projects button.

11 years agosimple cleanup code %)
Andrey Kumanyaev [Fri, 25 Jan 2013 19:19:31 +0000 (23:19 +0400)]
simple cleanup code %)

11 years agorewrite admin users controller (use 1 variable and find by username)
Andrey Kumanyaev [Fri, 25 Jan 2013 18:38:24 +0000 (22:38 +0400)]
rewrite admin users controller (use 1 variable and find by username)

11 years agofix links in admin group view page (user links)
Andrey Kumanyaev [Fri, 25 Jan 2013 18:37:38 +0000 (22:37 +0400)]
fix links in admin group view page (user links)

11 years agousername is default param to User
Andrey Kumanyaev [Fri, 25 Jan 2013 18:35:58 +0000 (22:35 +0400)]
username is default param to User

11 years agoUpdate user finding (by username) in teams members (team of users) controller
Andrey Kumanyaev [Fri, 25 Jan 2013 18:35:31 +0000 (22:35 +0400)]
Update user finding (by username) in teams members (team of users) controller

11 years agoUpdate user finding (by username) in teams_members (project team) controller
Andrey Kumanyaev [Fri, 25 Jan 2013 18:34:49 +0000 (22:34 +0400)]
Update user finding (by username) in teams_members (project team) controller

11 years agoUpdate user finding (by username) in admin teams members controller
Andrey Kumanyaev [Fri, 25 Jan 2013 18:33:49 +0000 (22:33 +0400)]
Update user finding (by username) in admin teams members controller

11 years agofix edit project members access link and page fixes refs #2745
Andrey Kumanyaev [Fri, 25 Jan 2013 17:20:15 +0000 (21:20 +0400)]
fix edit project members access link and page fixes refs #2745

11 years agoMerge pull request #2769 from hiroponz/fix-not-showing-tooltip
Dmitriy Zaporozhets [Fri, 25 Jan 2013 16:24:22 +0000 (08:24 -0800)]
Merge pull request #2769 from hiroponz/fix-not-showing-tooltip

Fix not showing tooltip on network graph

11 years agoFix not showing tooltip on network graph
Sato Hiroyuki [Fri, 25 Jan 2013 15:52:11 +0000 (00:52 +0900)]
Fix not showing tooltip on network graph

11 years agoUpdates project to process web hooks async via sidekiq.
Ryan LaNeve [Thu, 24 Jan 2013 20:15:24 +0000 (15:15 -0500)]
Updates project to process web hooks async via sidekiq.

A new queue of "project_web_hook" is used to process web hooks asynchronously, allowing each to succeed/fail (and be retried) independently.

(Basically, project web hooks now process the same as system hooks.)

11 years agorefactor add to team
Dmitriy Zaporozhets [Fri, 25 Jan 2013 15:26:00 +0000 (17:26 +0200)]
refactor add to team

11 years agoFix teams + gitolite access
Dmitriy Zaporozhets [Fri, 25 Jan 2013 15:18:27 +0000 (17:18 +0200)]
Fix teams + gitolite access

11 years agoteams refactoring and cleanup pt.1
Dmitriy Zaporozhets [Fri, 25 Jan 2013 14:36:14 +0000 (16:36 +0200)]
teams refactoring and cleanup pt.1

11 years agoshow new group, new team links in profile
Dmitriy Zaporozhets [Fri, 25 Jan 2013 14:25:43 +0000 (16:25 +0200)]
show new group, new team links in profile

11 years agoFix redirects. Add link to new team and new group
Dmitriy Zaporozhets [Fri, 25 Jan 2013 14:18:37 +0000 (16:18 +0200)]
Fix redirects. Add link to new team and new group

11 years agoFix security issues with teams
Dmitriy Zaporozhets [Fri, 25 Jan 2013 13:51:45 +0000 (15:51 +0200)]
Fix security issues with teams

11 years agoFix mass-assignment. Dont allow users w/o access to create team
Dmitriy Zaporozhets [Fri, 25 Jan 2013 13:42:41 +0000 (15:42 +0200)]
Fix mass-assignment. Dont allow users w/o access to create team

11 years agofix User.potential_team_members
Dmitriy Zaporozhets [Fri, 25 Jan 2013 13:36:10 +0000 (15:36 +0200)]
fix User.potential_team_members

11 years agofix 1145
Dmitriy Zaporozhets [Fri, 25 Jan 2013 12:18:23 +0000 (14:18 +0200)]
fix 1145

11 years agoFix project adding to team
Dmitriy Zaporozhets [Fri, 25 Jan 2013 11:56:04 +0000 (13:56 +0200)]
Fix project adding to team

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