Dmitriy Zaporozhets
130f60d55b
a bit of restyling. Replace some images with icons. Simplify note form
2013-01-31 11:22:06 +02:00
Dmitriy Zaporozhets
193a5624b2
add path and path_with_namespace to api project entity
2013-01-31 09:11:35 +02:00
Dmitriy Zaporozhets
563c55eb7e
fix pagination issue
2013-01-31 08:55:31 +02:00
Dmitriy Zaporozhets
8c50707dd4
Merge pull request #2823 from hiroponz/switchable-branch-on-network-graph
...
Switchable the main branch on network graph
2013-01-30 22:21:19 -08:00
Dmitriy Zaporozhets
1fdeb9e030
Merge branch 'refactor/css' of dev.gitlabhq.com:gitlab/gitlabhq
2013-01-30 17:28:48 +00:00
Dmitriy Zaporozhets
bfd00caff3
Few usability improvments
2013-01-30 17:13:05 +02:00
Dmitriy Zaporozhets
560985b0f6
Fixed link_to_member
2013-01-30 17:07:44 +02:00
Dmitriy Zaporozhets
b096ee3275
a bit of split up for gitlab-bootstrap
2013-01-30 17:01:58 +02:00
Dmitriy Zaporozhets
b742f47e89
remove old alert messages
2013-01-30 16:53:18 +02:00
Dmitriy Zaporozhets
e2fb18a3ec
replace right with pull-right
2013-01-30 16:40:43 +02:00
Dmitriy Zaporozhets
7d593c5446
Merge pull request #2837 from xudiera/master
...
Fixed a grammar mistake in alert-message.block-message
2013-01-30 06:32:02 -08:00
Sato Hiroyuki
525a8cd3e9
Switchable the main branch on network graph
2013-01-30 09:12:03 +09:00
Dmitriy Zaporozhets
7ba4f2dcfa
few styling for buttons
2013-01-29 22:57:15 +02:00
Dmitriy Zaporozhets
fb617c61b9
refactor buttons pt2
2013-01-29 22:29:21 +02:00
Dmitriy Zaporozhets
033aa1a885
refactor buttons pt1
2013-01-29 22:18:19 +02:00
Carlos Xudiera
cdd5543173
Fixed a grammar mistake in alert-message.block-message
2013-01-29 12:58:34 -05:00
Dmitriy Zaporozhets
7121a58eb9
Advanced logging for post-receive worker
2013-01-29 11:32:05 +02:00
Dmitriy Zaporozhets
f72dc7f779
dont escape images inside links for gfm. Fixes #2701
2013-01-29 11:00:56 +02:00
Dmitriy Zaporozhets
1c931fb814
fix key observer tests
2013-01-28 23:03:38 +02:00
Dmitriy Zaporozhets
299a9a1040
keys to gitolite via sidekiq now
2013-01-28 21:02:10 +02:00
Dmitriy Zaporozhets
8b54b7233e
Async perform for add/remove team members
2013-01-28 17:39:02 +02:00
Dmitriy Zaporozhets
1c5876eb7b
Do gitolite calls async. Remove satellite with project remove
2013-01-28 17:22:45 +02:00
Dmitriy Zaporozhets
e0b5e26035
Merge pull request #2153 from koenpunt/commit-diff-views
...
Added swipe view for image diff
2013-01-27 11:41:23 -08:00
Koen Punt
e33debc214
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
2013-01-27 18:27:32 +01:00
Dmitriy Zaporozhets
552e42f634
Merge pull request #2768 from rlaneve/feature/queued-web-hooks
...
Updates web hooks to process via queue
2013-01-27 08:52:37 -08:00
Dmitriy Zaporozhets
ce0ec05c63
Pager.js to coffee
2013-01-27 18:47:19 +02:00
Dmitriy Zaporozhets
070f49fdc5
Make group name a link at header
2013-01-27 13:12:30 +02: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
Dmitriy Zaporozhets
71e89df5e0
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
2013-01-25 13:45:08 -08:00
Andrey Kumanyaev
890e774ddc
Display actual user role (admin or not) in team members list
2013-01-26 01:14:36 +04:00
Andrey Kumanyaev
b280c2f361
Edit create new team text
2013-01-26 00:38:21 +04:00
Andrey Kumanyaev
45917935ef
fix copied code. Add assign projects button.
2013-01-26 00:37:55 +04:00
Andrey Kumanyaev
75a02e090a
simple cleanup code %)
2013-01-25 23:19:31 +04: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
ef85202f71
fix links in admin group view page (user links)
2013-01-25 22:37:38 +04:00
Andrey Kumanyaev
916165dfc4
username is default param to User
2013-01-25 22:35:58 +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
Ryan LaNeve
8a65229b35
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.)
2013-01-25 10:42:57 -05:00
Dmitriy Zaporozhets
74e329064a
teams refactoring and cleanup pt.1
2013-01-25 16:36:14 +02:00
Dmitriy Zaporozhets
1c88fbb391
show new group, new team links in profile
2013-01-25 16:25:43 +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
70e05801b1
fix User.potential_team_members
2013-01-25 15:36:10 +02:00
Dmitriy Zaporozhets
8016a7bd33
fix 1145
2013-01-25 14:18:23 +02:00
Dmitriy Zaporozhets
5aca1d64e0
Fix project adding to team
2013-01-25 13:56:04 +02:00
Dmitriy Zaporozhets
20a4742efd
Fixing team tests
2013-01-25 11:36:15 +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
097e6053ef
Fix for broken commit_url in graph
2013-01-25 10:16:20 +02: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
11b7b93cf7
move team navs to upper nav
2013-01-24 22:31:49 +02:00
Dmitriy Zaporozhets
b5dd9e6775
Make a team and group boxes smaller on dashboard
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
1a917bc954
fix scope to empty relation
2013-01-24 22:31:49 +02:00
Andrey Kumanyaev
2befa8fe30
Switch user link to profile link
2013-01-24 22:31:49 +02:00
Andrey Kumanyaev
690db9693f
fix tests
2013-01-24 22:31:48 +02:00
Andrey Kumanyaev
eb99feb4a7
simple refactoring
2013-01-24 22:31:48 +02:00
Andrey Kumanyaev
a5ce8696a6
remove unused autogenerated files
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
497f7ab5ba
save autogenerated files
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
cca9935970
save generated files
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
2984716870
Admin rename team page is fixed
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
6d1c566ec9
Rename Team class to ProjectTeam
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
c5f427b0a4
save commit
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
a987f1469e
commit user team helper
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
3a0d4865f6
update projects show css selector
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
b6458ae3b3
add into user decorator (presenter) to full user name
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
c098ac6430
update stylesheets (for teams block)
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
