summaryrefslogtreecommitdiff
path: root/app/controllers/groups_controller.rb
Commit message (Collapse)AuthorAgeFilesLines
* Projects on group page should be sorted by last activity instead of ↵fix-group-projects-sortDmitriy Zaporozhets2016-04-141-0/+1
| | | | | | id/created_at Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' into issue_12658Douwe Maan2016-03-211-1/+1
|\ | | | | | | | | | | | | | | | | # 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
| * Use the configured Kaminari "per page" defaultrs-use-kaminari-defaultRobert Speicher2016-03-191-1/+1
| |
* | Fix "Shared projects" tabDouwe Maan2016-03-201-2/+2
| |
* | Tweaks, refactoring, and specsDouwe Maan2016-03-201-14/+5
| |
* | Improve group visibility level featureZeger-Jan van de Weg2016-03-181-11/+0
| |
* | Code fixesFelipe Artur2016-03-171-2/+2
| |
* | Merge 4009-external-users into issue_12658Felipe Artur2016-03-161-3/+7
|\ \ | |/
| * Merge branch 'share-project-ce' into 'master' Dmitriy Zaporozhets2016-03-141-1/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Add share project from group lockDmitriy Zaporozhets2016-03-111-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Show shared projects on group pageDmitriy Zaporozhets2016-03-111-0/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Move group activity feed to separate page for consistency with dashboard and ↵Dmitriy Zaporozhets2016-03-101-2/+4
| |/ | | | | | | | | | | project pages Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Code improvements and add Create group serviceFelipe Artur2016-03-161-3/+1
| |
* | Prevent projects to have higher visibility than groupsFelipe Artur2016-03-101-1/+1
| | | | | | | | | | | | Prevent Groups to have smaller visibility than projects Add default_group_visibility_level to configuration Code improvements
* | Code improvementsFelipe Artur2016-03-101-2/+2
| |
* | Add permission level to groupsFelipe Artur2016-03-101-1/+1
|/
* Add projects list sort dropdown to group pageDmitriy Zaporozhets2016-03-041-2/+4
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* MR feedbackJosh Frye2016-02-091-1/+1
|
* Extract events rendering to own action.Josh Frye2016-02-091-10/+14
|
* Starred, All, and Trending on explore are paged also group projects. Need ↵Josh Frye2016-02-091-2/+9
| | | | ajax filter.
* Various filter fixesJosh Frye2016-02-041-0/+1
|
* Merge branch 'events-performance' into 'master' Robert Speicher2016-01-271-5/+1
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Don't pluck project IDs for eventsYorick Peterse2016-01-261-5/+1
| | | | | | | | | | 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.
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-01-271-4/+5
|\ \ | | | | | | | | | fix/unexistent-group-500
| * | Make the `/groups` route behave as expectedrs-groups-indexRobert Speicher2016-01-231-4/+5
| |/ | | | | | | | | | | | | | | | | | | | | | | | | 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
* | update fix based on feedbackJames Lopez2016-01-271-2/+1
| |
* | fix for failing specJames Lopez2016-01-261-1/+2
| |
* | feature and fix for 500 on group missingJames Lopez2016-01-261-0/+1
|/
* Refactor duplciate code for groups_controller.rb and ↵Dmitriy Zaporozhets2015-11-171-17/+3
| | | | | | slack_service/note_message.rb Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Allow groups to appear in the search results if the group owner allows itValery Sizov2015-11-051-3/+3
|
* Make group deleted text consistent with group created and updated textsteuneboon2015-10-121-1/+1
|
* Fix typo(missing quote) when deleting groupsteuneboon2015-10-121-1/+1
|
* Merge branch 'public_profiles' into 'master'Dmitriy Zaporozhets2015-09-141-1/+1
|\ | | | | | | | | | | | | | | | | | | 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
| * Skip auth for group page but return auth for other group pagesDmitriy Zaporozhets2015-09-141-1/+1
| |
* | Move partial to right place and fix tests.Douwe Maan2015-09-081-1/+1
| |
* | Clean up overlap between dashboard and explore.Douwe Maan2015-09-081-0/+4
|/ | | | | - 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.
* Raise alert when group is deleted.Achilleas Pipinellis2015-07-301-1/+1
| | | | This change was made to match the project deletion.
* Mention group and project name in flash messages upon create, update and delete.Achilleas Pipinellis2015-07-301-3/+3
|
* Fix consistency issue in sidebars of Project and Group Settings.Nicolas2015-06-241-0/+2
| | | | Fixes #2277.
* Wrap group removal into serviceDmitriy Zaporozhets2015-06-031-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add helpers for header title and sidebar, and move setting those from ↵Douwe Maan2015-05-011-3/+5
| | | | controllers to layouts.
* Add a page title to every page.Douwe Maan2015-04-301-11/+2
|
* Fixed the Rails/ActionFilter copJeroen van Baarsen2015-04-201-8/+8
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Move group members index from `/members` to `/group_members`.Douwe Maan2015-03-151-14/+1
|
* Use same constant for amount of items per pageDmitriy Zaporozhets2015-03-121-2/+2
|
* group controller refactoringValery Sizov2015-03-121-7/+1
|
* Fix event loading with associationsDmitriy Zaporozhets2015-02-181-4/+11
|
* DB performance improvements to GitLabDmitriy Zaporozhets2015-02-181-6/+11
|
* Merge branch 'project-path' into 'master'Dmitriy Zaporozhets2014-12-241-1/+1
|\ | | | | | | | | | | | | | | Project path Fixes gitlab/gitlabhq#1781, gitlab/gitlabhq#1763 See merge request !1337
| * Set group path during creationDmitriy Zaporozhets2014-12-221-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>