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 |
|
|
Andrey Kumanyaev
|
911f6eb106
|
merge into public
|
2013-01-24 22:31:24 +02:00 |
|
|
Andrey Kumanyaev
|
7d3efec7d1
|
Add ability to teams
|
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 |
|
|
Andrey Kumanyaev
|
8a86fe7bb0
|
Added UserTeam core models (team and m-t-m relationships) and updated other models
|
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
|
62cb514070
|
Merge pull request #2712 from aus/patch-1
Revise projects/new text
|
2013-01-23 10:12:28 -08:00 |
|
Chris Waguespack
|
8ec36ca056
|
Update Markdown example to use username
Update the Markdown example in the Help pages to use username instead of user.
|
2013-01-23 09:58:38 -06:00 |
|
Austin Robertson
|
d3c34ef8af
|
Revise projects/new text
The previous text implied projects can only be private. Projects can now be private or public.
|
2013-01-23 08:47:19 -06: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
|
e0fb0703c4
|
Merge branch 'features/help_with_index'
|
2013-01-22 17:58:40 +02:00 |
|
|
Dmitriy Zaporozhets
|
2be107d0d9
|
Help with index
|
2013-01-22 17:58:09 +02:00 |
|
Valeriy Sizov
|
745c0dfa57
|
remove length of issue content
according to #2677
|
2013-01-22 17:15:22 +02:00 |
|
|
Valeriy Sizov
|
69ec189ad2
|
remove length of snippet content
|
2013-01-22 17:10:00 +02:00 |
|
|
Dmitriy Zaporozhets
|
ee43e9248c
|
Add warning if user own projet but not in team. Also show loading when merge MR
|
2013-01-21 15:05:18 +02:00 |
|
|
Dmitriy Zaporozhets
|
d1e63c7df2
|
Reporter cant create MR. Show user authorized projects in Admin area
|
2013-01-21 14:16:48 +02:00 |
|
Alex Denisov
|
e78e067204
|
Render empty string instead of nil
|
2013-01-21 09:48:25 +00:00 |
|
Riyad Preukschas
|
d9270337c1
|
Update text on help#public_access page
|
2013-01-19 15:27:03 +01:00 |
|
|
Riyad Preukschas
|
607a38dd00
|
Fix public/projects#index page
|
2013-01-19 15:27:00 +01:00 |
|
|
Riyad Preukschas
|
75447fb044
|
Redo help#help_pages partial
|
2013-01-19 15:26:40 +01:00 |
|
|
Riyad Preukschas
|
8a5b770c36
|
Reorder help routes
|
2013-01-19 15:26:23 +01:00 |
|
|
Riyad Preukschas
|
bba88e84a9
|
Fix public layout
|
2013-01-19 15:24:56 +01:00 |
|
|
Riyad Preukschas
|
8db80f1f6d
|
Rename help#public_area to help#public_access
|
2013-01-19 15:24:51 +01:00 |
|
|
Riyad Preukschas
|
359703c696
|
Fix public cloning option text on projects#edit page
|
2013-01-19 15:24:37 +01:00 |
|
|
Riyad Preukschas
|
7e6a5800b6
|
Fix text on groups#show page
|
2013-01-19 15:24:07 +01:00 |
|
|
Dmitriy Zaporozhets
|
cfe8983272
|
Remove link to non-existing page. Fixes #2620
|
2013-01-19 12:50:44 +02:00 |
|
|
Dmitriy Zaporozhets
|
3a1022e381
|
Increase Issue description size to 10k. Fixes #2545
|
2013-01-19 12:09:23 +02:00 |
|
|
Dmitriy Zaporozhets
|
569a88a456
|
raise exception if gitolite is broken
|
2013-01-19 11:58:36 +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 |
|
|
Dmitriy Zaporozhets
|
bf753e99e7
|
Improve link to comment targets on dashboard
|
2013-01-17 22:54:02 +02:00 |
|
|
Dmitriy Zaporozhets
|
4bb1664aae
|
Merge pull request #2649 from tjeezy/patch-1
Eliminate horizontal shifting on diff body heights
|
2013-01-17 12:38:58 -08:00 |
|
|
Dmitriy Zaporozhets
|
2e9c0e2b47
|
switch to use link_to_member to prevent 500 if user is a project owner but does not have membership and leave comment
|
2013-01-17 22:35:45 +02:00 |
|
TJ Koblentz
|
f65713dfa6
|
Eliminate horizontal shifting on diff body heights
|
2013-01-17 11:35:35 -08:00 |
|
|
Dmitriy Zaporozhets
|
b08bb20979
|
Fix assign-to-me filter for project issues
|
2013-01-17 13:11:53 +02:00 |
|
|
GitLab
|
9115a4f92f
|
Remove satellites when moving namespace
|
2013-01-17 12:21:52 +02:00 |
|
|
Riyad Preukschas
|
9bc829d397
|
Fix markdown for note events
|
2013-01-16 23:03:21 +01:00 |
|
|
Riyad Preukschas
|
16b5417842
|
Use image Urls for Emoji in GFM
Fixes #2617
|
2013-01-16 22:39:45 +01:00 |
|
|
Riyad Preukschas
|
640d51f4b6
|
Fix GFM in events
Fixes #2563
|
2013-01-16 18:09:49 +01:00 |
|
|
Dmitriy Zaporozhets
|
729088a7af
|
Owner can enable public mode for project
|
2013-01-16 16:54:01 +02:00 |
|
|
Dmitriy Zaporozhets
|
08426d336d
|
Merge pull request #2538 from jouve/app_helper
clean application_helper a bit
|
2013-01-16 04:59:29 -08:00 |
|
|
Dmitriy Zaporozhets
|
211c06e419
|
Fix few test and notify for commit author
|
2013-01-15 13:37:20 +02:00 |
|
|
Dmitriy Zaporozhets
|
f598cc7897
|
change logic on line_code
|
2013-01-15 11:12:17 +02: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 |
|
|
Riyad Preukschas
|
74e48f070f
|
Smaller fixes
|
2013-01-15 00:27:26 +01:00 |
|
|
Dmitriy Zaporozhets
|
a36926216f
|
line numbers for blame
|
2013-01-14 20:55:57 +02:00 |
|
|
Dmitriy Zaporozhets
|
23e338852c
|
Dont set @project variable in list. Remove a bit of duplication in dash and group
|
2013-01-14 10:09:01 +02: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
|
b55ed840e6
|
Update wiki pages
* Properly name columns in Pages and History views
* Link to Authors
* Make views more consistent
|
2013-01-11 20:20:11 +01:00 |
|
|
Riyad Preukschas
|
b3bfb75252
|
Fix link_to_member to not be bold by default
|
2013-01-11 20:16:37 +01:00 |
|
|
Riyad Preukschas
|
167f26b90d
|
Add an ordering scope to Wiki
|
2013-01-11 20:04:14 +01:00 |
|
|
Riyad Preukschas
|
5aada8cc2a
|
Move wiki delete button to the edit page
|
2013-01-11 20:03:43 +01:00 |
|
MrHammy
|
c913f40ca4
|
Update app/views/wikis/pages.html.haml
Changed the link in the pages of the wiki to the direct link instead of the first created page
|
2013-01-11 13:40:29 +01:00 |
|
Martin Bastien
|
f97ae2ff85
|
Fix for archive download (method path missing)
|
2013-01-10 15:55:34 -05:00 |
|
|
Dmitriy Zaporozhets
|
9152ab7955
|
Fix missing image for last push
|
2013-01-10 20:20:56 +02:00 |
|
|
Dmitriy Zaporozhets
|
e25656d09b
|
Improve wiki typography
|
2013-01-10 18:09:12 +02:00 |
|
|
Dmitriy Zaporozhets
|
dd20da1bff
|
Fix pager loading on every page in application
|
2013-01-10 17:38:37 +02:00 |
|
|
Dmitriy Zaporozhets
|
abc2bdc3aa
|
Remove unused images. More use of font-awesome icons
|
2013-01-10 08:43:25 +02:00 |
|
|
Dmitriy Zaporozhets
|
c2982c9a31
|
sidekiq.log in admin area. Improved admin dashboard
|
2013-01-10 08:43:25 +02:00 |
|
Cyril
|
8a3bbbdb88
|
clean app helper
* remove unused method
* simplify gravatar_icon
|
2013-01-10 01:46:23 +01:00 |
|
|
Alex Denisov
|
d7bc121474
|
replace javascript:void with preventDefault
|
2013-01-09 21:02:41 +00:00 |
|
|
Alex Denisov
|
5133fe8efb
|
dashboard js -> coffee
|
2013-01-09 19:30:20 +00:00 |
|
|
Alex Denisov
|
3cc0458312
|
Reloading of events via ajax instead of page reloading.
|
2013-01-09 19:30:20 +00:00 |
|
|
AlexDenisov
|
0d9f73fa1e
|
JavaScript removed from dashboard#index template.
|
2013-01-09 19:30:20 +00:00 |
|
|
Alex Denisov
|
97d17cf835
|
Event filters stores at cookies.
|
2013-01-09 19:30:20 +00:00 |
|
|
Alex Denisov
|
b255c3c44b
|
Tests on events filtering added
|
2013-01-09 19:30:20 +00:00 |
|
|
Dmitriy Zaporozhets
|
71bd956866
|
email via sidekiq. start and stop rake tasks
|
2013-01-09 08:44:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
c7bb3a1f72
|
sidekiq
|
2013-01-09 08:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
31e3dc600a
|
Fix routing specs
|
2013-01-09 09:47:25 +02:00 |
|
|
Dmitriy Zaporozhets
|
80e79f33af
|
Merge pull request #2516 from jouve/fix_json_exemples_in_help
fix exemple js data in help/web_hook
|
2013-01-08 23:43:43 -08: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 |
|
|
Cyril
|
0a0d2ecf85
|
fix exemple js data in help/web_hook
|
2013-01-08 15:34:15 +01:00 |
|
|
Dmitriy Zaporozhets
|
b6568db1bc
|
Fix minor style issue for compare
|
2013-01-08 12:23:33 +02:00 |
|
|
Dmitriy Zaporozhets
|
f9528bfb86
|
a bit of restyling for issues and merge request lists
|
2013-01-08 08:14:05 +03: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
|
fb470e8e2a
|
Validate username uniq in scope of namespace
|
2013-01-07 17:36:24 +02:00 |
|
|
Dmitriy Zaporozhets
|
8d8c161a7f
|
Speedup dashboard via loading events with ajax
|
2013-01-07 14:36:01 +02:00 |
|
|
Dmitriy Zaporozhets
|
6c777ff823
|
Improve milestone show page
|
2013-01-07 14:08:03 +02:00 |
|
|
Dmitriy Zaporozhets
|
676a9a7e28
|
Fix xss vulnerability
|
2013-01-07 11:32:12 +02:00 |
|
|
Dmitriy Zaporozhets
|
1665a06fdd
|
Added cleanup to help rake
|
2013-01-06 00:30:38 +02:00 |
|
|
Dmitriy Zaporozhets
|
68eb394824
|
Green button when we create new item, blue when save or some primary action
|
2013-01-06 00:08:02 +02:00 |
|
|
Dmitriy Zaporozhets
|
baf591cc27
|
Fix network test and snippets expired
|
2013-01-05 23:49:01 +02:00 |
|
|
Dmitriy Zaporozhets
|
891bc414b1
|
Fix merge_request js -> ci_path
|
2013-01-05 23:26:14 +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
|
eaa8cd28d0
|
Merge branch 'mergerequest-to-coffee' of https://github.com/koenpunt/gitlabhq into koenpunt-mergerequest-to-coffee
|
2013-01-05 22:54:48 +02:00 |
|
|
Dmitriy Zaporozhets
|
f33ada855c
|
Merge pull request #2226 from jouve/username
add username to team_member page
|
2013-01-05 12:33:39 -08:00 |
|
|
Dmitriy Zaporozhets
|
9f1a4acf62
|
Merge pull request #2207 from koenpunt/system-to-fileutils
replaced system() calls with FileUtils.* methods
|
2013-01-05 10:03:13 -08:00 |
|
|
Dmitriy Zaporozhets
|
1724f45f46
|
Remove unused styles. Restyled Issues a bit
|
2013-01-05 14:49:08 +02:00 |
|
|
Dmitriy Zaporozhets
|
de05a598b3
|
Update to rails 3.2.10. Use simplercov in spinach too
|
2013-01-05 13:30:42 +02:00 |
|
|
Dmitriy Zaporozhets
|
5a214ee6f1
|
Remove unused methods
|
2013-01-05 13:11:15 +02:00 |
|
|
Dmitriy Zaporozhets
|
e3d7ce2cc4
|
Tests are fixed now
|
2013-01-05 12:12:02 +02:00 |
|
Koen Punt
|
a1566a9c86
|
Converted merge_requests.js to coffeescript and updated code
|
2013-01-05 02:53:34 +01:00 |
|
|
Dmitriy Zaporozhets
|
e16cebac3e
|
Fixed styles, ProjectHook specs etc
|
2013-01-05 00:35:38 +02:00 |
|