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 |
|
|
Dmitriy Zaporozhets
|
e3d7ce2cc4
|
Tests are fixed now
|
2013-01-05 12:12:02 +02:00 |
|
|
Dmitriy Zaporozhets
|
ef5b36eaaf
|
Fixed protected branches and file edit
|
2013-01-04 21:45:30 +02:00 |
|
|
Dmitriy Zaporozhets
|
dccd8b6eaa
|
Continue refactoring. Use repostory and team
|
2013-01-04 08:43:25 +02:00 |
|
|
Dmitriy Zaporozhets
|
39ba934c0a
|
REpostiry, Team models
|
2013-01-03 21:09:18 +02:00 |
|
|
Riyad Preukschas
|
7335f366dc
|
Fix comment and reply buttons
|
2013-01-02 20:49:27 +01:00 |
|
|
Dmitriy Zaporozhets
|
ccf0686b01
|
Fix api specs. Use id instead path
|
2013-01-02 19:46:06 +02:00 |
|
|
Dmitriy Zaporozhets
|
d431e43392
|
Fix few bugs and tests after refactoring ownership logic
|
2013-01-02 19:32:34 +02:00 |
|
|
Dmitriy Zaporozhets
|
00a1f5bc2c
|
Project has now correct owner and creator. Increased test coverage
|
2013-01-02 19:00:00 +02:00 |
|
|
Dmitriy Zaporozhets
|
d075df56d3
|
Improve perfomance of removeing group
|
2012-12-30 14:26:19 +02:00 |
|
|
Dmitriy Zaporozhets
|
f45345edb3
|
Fix project destroy timeout from admin area. Added 30 ssh keys to dev seeds
|
2012-12-30 14:09:43 +02:00 |
|
|
Dmitriy Zaporozhets
|
a16533a04a
|
Add groups to search autocomplete. Use alphabetically scope for users order
|
2012-12-30 13:50:23 +02:00 |
|
|
Dmitriy Zaporozhets
|
e37a043df7
|
Get rid of skipping callbacks in production code. Dont trigger gitolite more than once on import in group
|
2012-12-30 13:37:33 +02:00 |
|
|
Andrey Kumanyaev
|
98044f0f14
|
Code duplication removed from controllers
|
2012-12-26 20:30:11 +04:00 |
|
|
Andrey Kumanyaev
|
1e3d238910
|
Replace short loop variable from "p" to "project"
|
2012-12-26 19:52:15 +04:00 |
|
|
Andrey Kumanyaev
|
25c5763780
|
Add functional in user section
|
2012-12-26 19:52:15 +04:00 |
|
|
Andrey Kumanyaev
|
9c574464a6
|
Add functional in admin section
|
2012-12-26 19:52:15 +04:00 |
|
|
Riyad Preukschas
|
db2c15369c
|
Merge branch 'master' into discussions
Conflicts:
app/assets/stylesheets/main.scss
app/models/project.rb
app/views/notes/_common_form.html.haml
app/views/notes/_per_line_form.html.haml
lib/gitlab/markdown.rb
spec/models/note_spec.rb
|
2012-12-23 01:03:57 +01:00 |
|
|
Dmitriy Zaporozhets
|
a7b572d0ab
|
Fixed #2333
|
2012-12-22 11:59:05 +02:00 |
|
|
Dmitriy Zaporozhets
|
a47032bc29
|
Merge branch 'gh-issue-1509' of https://github.com/koenpunt/gitlabhq into koenpunt-gh-issue-1509
Conflicts:
vendor/assets/javascripts/branch-graph.js
|
2012-12-21 13:07:34 +02:00 |
|
|
Riyad Preukschas
|
19eb637419
|
Update uses of Gitolite.config.foo settings
|
2012-12-20 16:54:28 +01:00 |
|
|
Dmitriy Zaporozhets
|
2f7effe804
|
Refactor issues, Remove ajax
|
2012-12-19 06:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
f2db188dbe
|
Processing with note events. reformated dashboard for more events to handle
|
2012-12-14 21:39:55 +02:00 |
|
|
Dmitriy Zaporozhets
|
678e5355a3
|
Create events on comments and milestone
|
2012-12-14 19:33:33 +02:00 |
|
|
Dmitriy Zaporozhets
|
190e483fb4
|
Rework of milestones
|
2012-12-14 08:34:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
b01f8b63c2
|
added NamespacedProject role. Extended project info displayed for admin. Fixed project limit
|
2012-12-14 08:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
1d156c9c8e
|
Fix project lookup. Show error if project transfer fails
|
2012-12-13 19:20:37 +02:00 |
|
|
Dmitriy Zaporozhets
|
ca936d2784
|
Improve CI integration for merge requests
|
2012-12-11 06:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
bf13579b92
|
Make admin sorting more obvious
|
2012-12-10 06:14:05 +03:00 |
|
Koen Punt
|
4b2ecbc420
|
Updated branch-graph, abstracted some code in seperate functions
Removed unused Raphael.fn.popup
|
2012-12-07 22:05:17 +01:00 |
|
|
Koen Punt
|
e1282d507f
|
BranchGraph now loads async
Centralized keyboard and drag events for BranchGraph
|
2012-12-07 19:06:46 +01:00 |
|
|
Dmitriy Zaporozhets
|
cc0295b789
|
Only owner can remove project
|
2012-12-05 06:14:05 +03:00 |
|
|
Riyad Preukschas
|
c4a7824a8c
|
Fix wall notes
|
2012-12-03 22:51:56 +01:00 |
|
|
Riyad Preukschas
|
494ae87840
|
Refactor discussion reply
|
2012-12-03 22:51:56 +01:00 |
|
|
Riyad Preukschas
|
06ea122840
|
Refactor diff notes creation
|
2012-12-03 22:51:56 +01:00 |
|
|
Riyad Preukschas
|
5c2f6d7f05
|
Update notes views to support discussions
|
2012-12-03 22:51:55 +01:00 |
|
|
Riyad Preukschas
|
a58385247d
|
Add discussions for merge requests to notes controller
|
2012-12-03 22:51:55 +01:00 |
|
|
Riyad Preukschas
|
9b919939a3
|
Fix parameter passing and wording for per line notes
|
2012-12-03 22:51:55 +01:00 |
|
|
Dmitriy Zaporozhets
|
d8398921eb
|
Dont allow select block user as new team member
|
2012-12-04 15:22:22 +02:00 |
|
|
Dmitriy Zaporozhets
|
ba74fa1413
|
Remove some bugs. Add warnings for renaming group. Add ability to cahnge group owner.
|
2012-12-03 21:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
7f6bbf06f8
|
Fix bug getting started message when navigate to personal projects w/o them exist
|
2012-12-04 11:18:41 +02:00 |
|
|
Dmitriy Zaporozhets
|
46bf3a0949
|
Refactored profile to resource. Added missing flash notice on successfull updated. Update username via ajax
|
2012-12-02 13:29:24 +02:00 |
|
|
Dmitriy Zaporozhets
|
c177593e2c
|
Merge pull request #2059 from dolanor/feature-rewording-blocked-users
Rewording for the account being blocked
|
2012-11-30 12:50:06 -08:00 |
|
|
Dmitriy Zaporozhets
|
c38b9a2f80
|
Filter projects on dashboard
|
2012-11-30 13:40:34 +02:00 |
|
|
Dmitriy Zaporozhets
|
aaa1c94239
|
Manage team from groups page. Phase 1
|
2012-11-29 20:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
9df6f7bfad
|
authorized_projects and authorized_groups methods for user
|
2012-11-29 17:17:01 +02:00 |
|
|
Dmitriy Zaporozhets
|
1d889a79fb
|
Fix group duplication on dashboard and project order in group
|
2012-11-29 16:43:09 +02:00 |
|