4d69cb9d94
Allow to disable user request access to groups/projects
2016-07-20 14:38:21 +02:00
36d48120f6
merge master into issue_3359_3
2016-06-29 11:04:18 -03:00
8447c6b180
Insert notification settings dropdown into groups
2016-06-22 10:44:20 -03:00
92e183542f
Insert notification settings dropdown into groups
2016-06-22 10:38:42 -03:00
ec3f4f5bf0
Projects on group page should be sorted by last activity instead of id/created_at
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-14 11:00:24 +02:00
ae7b2ef62c
Merge branch 'master' into issue_12658
...
# Conflicts:
# app/models/issue.rb
# app/views/projects/_home_panel.html.haml
# app/views/shared/projects/_project.html.haml
# db/schema.rb
# spec/models/project_spec.rb
2016-03-21 23:22:21 +01:00
3058a8fa4c
Fix "Shared projects" tab
2016-03-20 21:30:08 +01:00
8db1292139
Tweaks, refactoring, and specs
2016-03-20 21:04:07 +01:00
085538c2bd
Use the configured Kaminari "per page" default
2016-03-19 17:37:54 -04:00
b959ae553b
Improve group visibility level feature
2016-03-18 16:58:04 -03:00
0a7f716119
Code fixes
2016-03-17 19:42:46 -03:00
44c127447b
Merge 4009-external-users into issue_12658
2016-03-16 20:16:42 -03:00
ec20fdf366
Code improvements and add Create group service
2016-03-16 19:44:33 -03:00
d324bf8434
Merge branch 'share-project-ce' into 'master'
...
Bring from EE: Share Project with Group
- [x] Models and migrations
- [x] Logic, UI
- [x] Tests
- [x] Documentation
- [x] Share with group lock
- [x] Api feature
- [x] Api docs
- [x] Api tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
For #12831
cc @DouweM @rspeicher @vsizov
See merge request !3186
2016-03-14 16:38:52 +00:00
9a95b15552
Add share project from group lock
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-11 19:03:19 +01:00
f8163c81e7
Show shared projects on group page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-11 18:42:16 +01:00
c3e70280df
Prevent projects to have higher visibility than groups
...
Prevent Groups to have smaller visibility than projects
Add default_group_visibility_level to configuration
Code improvements
2016-03-10 10:38:36 -03:00
5551ccd720
Code improvements
2016-03-10 10:38:36 -03:00
f2a9ee258e
Add permission level to groups
2016-03-10 10:38:36 -03:00
e3efce9237
Move group activity feed to separate page for consistency with dashboard and project pages
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-10 14:29:38 +01:00
2c431f89b1
Add projects list sort dropdown to group page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-04 19:26:10 +01:00
120dca0f35
MR feedback
2016-02-09 10:10:41 -05:00
8b4e9720d9
Extract events rendering to own action.
2016-02-09 10:10:41 -05:00
30e022a2fe
Starred, All, and Trending on explore are paged also group projects. Need ajax filter.
2016-02-09 10:10:41 -05:00
2ad094132d
Various filter fixes
2016-02-04 13:03:41 -05:00
bba7e786a6
Merge branch 'events-performance' into 'master'
...
Improve performance of retrieving last update times for events
See 75195eefcca4cb3961986c90c8e837da02f30134 and
https://gitlab.com/gitlab-org/gitlab-ce/issues/12415#note_3387317
for the juicy details.
Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12415
See merge request !2613
2016-01-27 21:20:16 +00:00
afde800b25
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/unexistent-group-500
2016-01-27 11:35:13 +01:00
eef9c9d447
update fix based on feedback
2016-01-27 10:44:24 +01:00
d6a186135f
fix for failing spec
2016-01-26 15:43:09 +01:00
89aeed183c
feature and fix for 500 on group missing
2016-01-26 12:16:47 +01:00
128a6411d2
Don't pluck project IDs for events
...
By instead using a sub-query we save ourselves the overhead of loading
any data into memory only to pass it on to another query.
2016-01-26 10:51:53 +01:00
a7c4d0da8c
Make the `/groups` route behave as expected
...
The route is supposed to redirect the Groups#index request based on
whether or not a user was logged in. If they are, we redirect them to
their groups dashboard; if they're not, we redirect them to the public
Explore page.
But due to overly aggressive `before_action`s that weren't excluding the
`index` action, the request always resulted in a 404, whether a user was
logged in or not.
Closes #12660
2016-01-23 16:10:13 -08:00
3cebe9e780
Refactor duplciate code for groups_controller.rb and slack_service/note_message.rb
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-17 11:03:18 +01:00
6051c28fc0
Allow groups to appear in the search results if the group owner allows it
2015-11-05 13:18:51 +02:00
5479797f0a
Make group deleted text consistent with group created and updated texts
2015-10-12 14:37:56 +02:00
d6a523d785
Fix typo(missing quote) when deleting groups
2015-10-12 14:37:07 +02:00
b35d5a6a16
Merge branch 'public_profiles' into 'master'
...
Make all group public
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1219#
Internal issue - https://dev.gitlab.org/gitlab/gitlabhq/issues/1361
See merge request !1247
2015-09-14 15:28:42 +00:00
4c060074b7
Skip auth for group page but return auth for other group pages
2015-09-14 11:05:23 +02:00
1489d225d6
Move partial to right place and fix tests.
2015-09-08 15:14:14 +01:00
5d785457db
Clean up overlap between dashboard and explore.
...
- Split up SnippetsController into separate dashboard and explore sections.
- Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not.
2015-09-08 14:49:20 +01:00
feb2865fba
Raise alert when group is deleted.
...
This change was made to match the project deletion.
2015-07-30 14:11:26 +03:00
0fac66f84d
Mention group and project name in flash messages upon create, update and delete.
2015-07-30 01:22:16 +03:00
a521e88fc0
Fix consistency issue in sidebars of Project and Group Settings.
...
Fixes #2277 .
2015-06-24 18:05:16 +02:00
61cfd1d273
Wrap group removal into service
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-03 14:07:20 +02:00
92fd3ccee0
Add helpers for header title and sidebar, and move setting those from controllers to layouts.
2015-05-01 10:39:16 +02:00
26ad250989
Add a page title to every page.
2015-04-30 19:12:15 +02:00
5a4ebfb47a
Fixed the Rails/ActionFilter cop
...
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-04-20 15:39:37 +02:00
224187ffb9
Move group members index from `/members` to `/group_members`.
2015-03-15 13:51:11 +01:00
f0cbbd70bb
Use same constant for amount of items per page
2015-03-12 15:37:00 -07:00
0b38c3e041
group controller refactoring
2015-03-12 17:08:48 +02:00
Felipe Artur
Dmitriy Zaporozhets
Douwe Maan
Robert Speicher
Zeger-Jan van de Weg
Josh Frye
Robert Speicher
James Lopez
Yorick Peterse
Valery Sizov
teuneboon
Douwe Maan
Achilleas Pipinellis
Nicolas
Jeroen van Baarsen
Valery Sizov