Commit Graph

296 Commits

Author SHA1 Message Date
GitLab Bot c00e3e49ef Add latest changes from gitlab-org/gitlab@master 2022-01-08 00:14:32 +00:00
GitLab Bot ecc11e5d60 Add latest changes from gitlab-org/gitlab@master 2021-12-10 15:10:24 +00:00
GitLab Bot 15f5da601b Add latest changes from gitlab-org/gitlab@master 2021-12-09 12:15:43 +00:00
GitLab Bot 6dd9e3644e Add latest changes from gitlab-org/gitlab@master 2021-12-07 12:10:33 +00:00
GitLab Bot 1c27dcaf69 Add latest changes from gitlab-org/gitlab@master 2021-11-24 00:12:33 +00:00
GitLab Bot f50cb4f63f Add latest changes from gitlab-org/gitlab@master 2021-10-27 15:13:41 +00:00
GitLab Bot e5d3d8c323 Add latest changes from gitlab-org/gitlab@master 2021-10-25 12:10:19 +00:00
GitLab Bot ae27cd3c88 Add latest changes from gitlab-org/gitlab@master 2021-09-15 12:11:13 +00:00
GitLab Bot 6a0a4a80f7 Add latest changes from gitlab-org/gitlab@master 2021-08-26 12:10:28 +00:00
GitLab Bot bc578c5f89 Add latest changes from gitlab-org/gitlab@master 2021-08-18 18:10:08 +00:00
GitLab Bot d35de87f96 Add latest changes from gitlab-org/gitlab@master 2021-06-15 06:10:17 +00:00
GitLab Bot 94668f5cca Add latest changes from gitlab-org/gitlab@master 2021-06-15 00:10:11 +00:00
GitLab Bot 81f257d72e Add latest changes from gitlab-org/gitlab@master 2021-06-14 15:09:48 +00:00
GitLab Bot 68c476dbd8 Add latest changes from gitlab-org/gitlab@master 2021-05-17 15:10:15 +00:00
GitLab Bot 0ae8428c8e Add latest changes from gitlab-org/gitlab@master 2021-05-11 21:10:21 +00:00
GitLab Bot d3a97bfbd2 Add latest changes from gitlab-org/gitlab@master 2021-05-03 06:10:30 +00:00
GitLab Bot b81fd57f3d Add latest changes from gitlab-org/gitlab@master 2021-04-22 09:09:45 +00:00
GitLab Bot a8324cd026 Add latest changes from gitlab-org/gitlab@master 2021-03-26 21:09:22 +00:00
GitLab Bot 472a7da0e5 Add latest changes from gitlab-org/gitlab@master 2021-03-19 09:08:53 +00:00
GitLab Bot c7cb372557 Add latest changes from gitlab-org/gitlab@master 2021-03-01 09:11:01 +00:00
GitLab Bot 6cbb93596d Add latest changes from gitlab-org/gitlab@master 2021-02-03 15:09:24 +00:00
GitLab Bot ff89c3c372 Add latest changes from gitlab-org/gitlab@master 2021-01-26 15:08:58 +00:00
GitLab Bot e32167eb63 Add latest changes from gitlab-org/gitlab@master 2020-12-15 21:09:53 +00:00
GitLab Bot 33827e3a53 Add latest changes from gitlab-org/gitlab@master 2020-11-23 15:09:37 +00:00
GitLab Bot 9ebfef6a3c Add latest changes from gitlab-org/gitlab@master 2020-11-04 15:08:41 +00:00
GitLab Bot d43cf10712 Add latest changes from gitlab-org/gitlab@master 2020-11-03 09:09:07 +00:00
GitLab Bot a1908447b7 Add latest changes from gitlab-org/gitlab@master 2020-10-26 15:08:40 +00:00
GitLab Bot 731d58455c Add latest changes from gitlab-org/gitlab@master 2020-10-19 06:09:08 +00:00
GitLab Bot c083f926c5 Add latest changes from gitlab-org/gitlab@master 2020-10-15 21:09:12 +00:00
GitLab Bot c02e2a5ef6 Add latest changes from gitlab-org/gitlab@master 2020-10-09 00:08:41 +00:00
GitLab Bot 6ab9cdec26 Add latest changes from gitlab-org/gitlab@master 2020-10-06 12:08:38 +00:00
GitLab Bot a51e52bf5b Add latest changes from gitlab-org/gitlab@master 2020-08-26 03:10:11 +00:00
GitLab Bot ce493944f4 Add latest changes from gitlab-org/gitlab@master 2020-06-19 18:08:39 +00:00
GitLab Bot 45ccc5610c Add latest changes from gitlab-org/gitlab@master 2020-06-15 00:08:43 +00:00
GitLab Bot f6905d2ed2 Add latest changes from gitlab-org/gitlab@master 2020-06-10 18:09:15 +00:00
GitLab Bot 607646ef52 Add latest changes from gitlab-org/gitlab@master 2020-06-03 12:08:21 +00:00
GitLab Bot e35f91f05b Add latest changes from gitlab-org/gitlab@master 2020-05-18 15:08:15 +00:00
GitLab Bot 5e99b288a0 Add latest changes from gitlab-org/gitlab@master 2020-05-14 03:07:52 +00:00
GitLab Bot 2e26679b96 Add latest changes from gitlab-org/gitlab@master 2020-05-07 03:09:46 +00:00
GitLab Bot a9ced7da44 Add latest changes from gitlab-org/gitlab@master 2020-04-09 12:09:24 +00:00
GitLab Bot 988b28ec1a Add latest changes from gitlab-org/gitlab@master 2020-03-02 12:07:57 +00:00
GitLab Bot cd3e2c7b93 Add latest changes from gitlab-org/gitlab@master 2020-02-19 12:09:13 +00:00
GitLab Bot c8f773a859 Add latest changes from gitlab-org/gitlab@master 2020-01-30 21:08:47 +00:00
GitLab Bot cd4cb29b2c Add latest changes from gitlab-org/gitlab@master 2019-12-03 12:06:34 +00:00
GitLab Bot 190e204dec Add latest changes from gitlab-org/gitlab@master 2019-11-17 12:06:19 +00:00
GitLab Bot cf85de264d Add latest changes from gitlab-org/gitlab@master 2019-11-06 21:06:44 +00:00
GitLab Bot d64e3a8b28 Add latest changes from gitlab-org/gitlab@master 2019-10-29 12:06:40 +00:00
GitLab Bot 914ea32e0e Add latest changes from gitlab-org/gitlab@master 2019-10-16 09:07:51 +00:00
GitLab Bot b4e072cbaf Add latest changes from gitlab-org/gitlab@master 2019-10-11 06:06:27 +00:00
GitLab Bot b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
Brett Walker 3489dc3d72 Allow disabling group/project email notifications
- Adds UI to configure in group and project settings
- Removes notification configuration for users when
disabled at group or project level
2019-08-15 17:37:36 +00:00
Brett Walker 1c24ebb0f4 Remove backend use of manual_sorting feature flag 2019-07-31 13:52:06 -05:00
Sean McGivern 98152f17ea Merge branch 'bw-enable-default-manual-sorting' into 'master'
Default manual_sorting feature flag to on

See merge request gitlab-org/gitlab-ce!30788
2019-07-24 10:41:47 +00:00
Fabio Papa d279cc5a7a Add subgroup_creation_level to the list of allowed group params
For both groups_controller and admin/groups_controller
2019-07-19 11:55:46 -07:00
Brett Walker 81f1028801 Default manual_sorting feature flag to on 2019-07-16 09:20:53 -05:00
Heinrich Lee Yu aeb67dd489 Upgrade to Rails 5.2
Updates changed method names and fixes spec failures
2019-07-12 10:15:31 +08:00
Fabian Schneider b5952294ce Revert "Include subgroups in shared_projects"
This reverts commit 4bed2daef935bb4097988e0eff4830fc13a23c37.
2019-07-01 11:17:47 +00:00
Rajat Jain 6f448bd17d Bring Manual Ordering on Issue List
On all the issue lists -- Group, Project and Dashboard -- this
change adds a new option for managing the lists.

"Manual Ordering" option is added which when flipped on will allow
an user to drag and drop issues around to create a relative ordering
among them.
2019-06-26 08:29:23 +00:00
Gosia Ksionek 64858317ad Add part of needed code
Add columns to store project creation settings

Add project creation level column in groups
 and default project creation column in application settings

Remove obsolete line from schema

Update migration with project_creation_level column existence check

Rename migrations to avoid conflicts

Update migration methods

Update migration method
2019-04-05 18:49:46 +00:00
Illya Klymov ffbc66cc0b Redirect to edit page on group transfer failure 2019-04-03 11:29:35 +03:00
Gilbert Roulot 6ab102a2f8 Security Dashboard as default view for groups
Add a supporting code to separate groups#show
and groups#details which is required for the
proper implementation of the Group Overview
content and Security Dashboard option for it
2019-03-14 12:55:46 +00:00
Rubén Dávila 24226b9fe2 Update last_activity_on for Users on some main GET endpoints
In order to have an accurate date about the last activity of a User
we need to update the last_activity_on field when the User is visiting
some basic pages of GitLab like pages related to Dashboards, Projects,
Issues and Merge Requests
2019-02-05 09:55:31 -05:00
Mario de la Ossa 49c74068ae
Save sorting preference for Issues/MRs in BE
In order to let users' sorting preferences transfer between devices, we
save the preference for issues and MRs (one preference for issues, one
for MRs) in the backend inside the UserPreference object
2019-01-28 12:48:05 -06:00
Cindy Pallares fe5f75930e
Merge branch 'security-fix-pat-web-access' into 'master'
[master] Resolve "Personal access token with only `read_user` scope can be used to authenticate any web request"

See merge request gitlab/gitlabhq!2583
2018-11-28 19:13:59 -05:00
gfyoung 73322a0e55 Enable frozen string in app/controllers/**/*.rb
Enables frozen string for the following:

* app/controllers/*.rb
* app/controllers/admin/**/*.rb
* app/controllers/boards/**/*.rb
* app/controllers/ci/**/*.rb
* app/controllers/concerns/**/*.rb

Partially addresses #47424.
2018-09-18 21:22:45 -07:00
Yorick Peterse 2039c8280d
Disable existing offenses for the CodeReuse cops
This whitelists all existing offenses for the various CodeReuse cops, of
which most are triggered by the CodeReuse/ActiveRecord cop.
2018-09-11 17:32:00 +02:00
Dennis Tang 5b74a1aebc Resolve "Improve handling of projects shared with a group" 2018-09-07 06:09:13 +00:00
Winnie Hellmann 743add978a Move badge settings to general settings 2018-09-03 13:16:23 +00:00
Mike Greiling 308a07f365
ensure all group settings panels remain open after form submission 2018-08-08 01:24:36 -05:00
Sean McGivern 320ae8ff4a Merge branch 'blackst0ne-rails5-add-safe-params-helper' into 'master'
[Rails5] Add `safe_params` helper

See merge request gitlab-org/gitlab-ce!18241
2018-04-18 10:26:44 +00:00
Yorick Peterse daad7144ec
Support Markdown rendering using multiple projects
This refactors the Markdown pipeline so it supports the rendering of
multiple documents that may belong to different projects. An example of
where this happens is when displaying the event feed of a group. In this
case we retrieve events for all projects in the group. Previously we
would group events per project and render these chunks separately, but
this would result in many SQL queries being executed. By extending the
Markdown pipeline to support this out of the box we can drastically
reduce the number of SQL queries.

To achieve this we introduce a new object to the pipeline:
Banzai::RenderContext. This object simply wraps two other objects: an
optional Project instance, and an optional User instance. On its own
this wouldn't be very helpful, but a RenderContext can also be used to
associate HTML documents with specific Project instances. This work is
done in Banzai::ObjectRenderer and allows us to reuse as many queries
(and results) as possible.
2018-04-11 14:10:19 +02:00
blackst0ne eddf3febd7 [Rails5] Add `safe_params` helper
Rails 5.0 requires to explicitly permit attributes when building a URL
using current `params` object.

The `safe_params` helper allows developers to just call `safe_params.merge(...)`
instead of manually adding `permit` to every call.

https://github.com/rails/rails/pull/20868
2018-04-08 15:35:30 +11:00
Sean McGivern 868cb4307f Fix subgroup issue and MR pages empty states and counts
Previously, these wouldn't count issues or MRs in subgroups - meaning that if
_this_ group had no issues or MRs, we'd show the empty state, which was wrong.
2018-02-27 10:32:29 +00:00
Bob Van Landuyt 148816cd67 Port `read_cross_project` ability from EE 2018-02-22 17:11:36 +01:00
Mayra Cabrera 68a419c879 31885 - Ability to transfer a single group to another group 2018-02-06 00:10:58 +00:00
James Lopez 406e10b89c
refactor groups controller to match EE 2018-01-31 16:23:15 +01:00
Stan Hu 30e6cfa05a Fix not all events being shown in group dashboard
The group activity feed was limited to the first 20 projects found
in the group, which caused activity from some projects to be omitted.
A limit of 20 is applied to the query for events, so the
extra pagination does little in the way of performance.

Closes #42560
2018-01-30 17:04:22 -08:00
Francisco Javier López bf0331dc72 Resolve "DashboardController#activity.json is slow due to SQL" 2017-11-06 16:52:56 +00:00
Bob Van Landuyt 69eba88532 Make sure we render events for projects within a group 2017-10-20 17:02:02 +03:00
Douwe Maan 79e889122b Merge branch 'bvl-group-trees' into 'master'
Show collapsible tree on the project show page

Closes #30343

See merge request gitlab-org/gitlab-ce!14055
2017-10-17 10:03:03 +00:00
Bob Van Landuyt 2c25a7ae34 Nest the group_children_path inside the canonical group path 2017-10-12 11:36:55 +02:00
Vitaliy @blackst0ne Klachkov 64bb19069d Add support for markdown preview to group milestones 2017-10-11 20:03:19 +11:00
Bob Van Landuyt aee5691db3 Don't load unneeded elements in GroupsController#show 2017-10-10 16:54:28 +02:00
Bob Van Landuyt 3fe7f31ac0 Use `GroupFinder` to check if a user can read a group 2017-10-10 14:09:56 +02:00
Bob Van Landuyt 22aa034427 Rename `GroupHierarchy` to `GroupDescendant` 2017-10-04 22:49:41 +02:00
Bob Van Landuyt 31f7756893 `current_user:` as a keyword argument 2017-10-04 22:49:41 +02:00
Bob Van Landuyt e3daa73fbf Setup children in a a method and reuse for both calls 2017-10-04 22:49:41 +02:00
Bob Van Landuyt 8f6dac4991 Allow filtering children for a group
When fetching children for a group with a filter, we will search all
nested groups for results and render them in an expanded tree
2017-10-04 22:49:41 +02:00
Bob Van Landuyt 518216c062 Merge group hierarchies when parents are shared 2017-10-04 22:49:41 +02:00
Bob Van Landuyt 28c440045e Add pagination for children 2017-10-04 22:46:49 +02:00
Bob Van Landuyt 80780018a9 Update `children` route to handle projects and groups 2017-10-04 22:46:49 +02:00
Bob Van Landuyt d33e15574b Add serializer for group children 2017-10-04 22:46:49 +02:00
Bob Van Landuyt 376a8c66c1 Remove the subgroups path on a group 2017-10-04 22:46:49 +02:00
Bob Van Landuyt 2eac1537ad Fetch children using new finder for the `show` of a group. 2017-10-04 22:46:49 +02:00
Ruben Davila 62bb6235c2 Make Members with Owner and Master roles always able to create subgroups 2017-09-07 13:47:58 -05:00
Tiago Botelho 5bc9dedf40 Improves subgroup creation permissions 2017-08-21 15:40:22 +01:00
Yorick Peterse aac1de46c9
Use a specialized class for querying events
This changes various controllers to use the new EventCollection class
for retrieving events. This class uses a JOIN LATERAL query on
PostgreSQL to retrieve queries in a more efficient way, while falling
back to a simpler / less efficient query for MySQL.

The EventCollection class also includes a limit on the number of events
to display to prevent malicious users from cycling through all events,
as doing so could put a lot of pressure on the database.

JOIN LATERAL is only supported on PostgreSQL starting with version 9.3.0
and as such this optimisation is only used when using PostgreSQL 9.3 or
newer.
2017-08-10 17:45:49 +02:00
Tieu-Philippe KHIM 3c1700cde6 Refactor atom builder by using xml.atom layout 2017-06-12 19:21:13 +02:00
blackst0ne a544e46bb0 Add a rubocop rule to check if a method 'redirect_to' is used without explicitly set 'status' in 'destroy' actions of controllers 2017-06-07 09:45:16 +11:00
Douwe Maan 26bcef97d6 Merge branch 'rework-authorizations-performance' into 'master'
Rework project authorizations and nested groups for better performance

See merge request !10885
2017-05-29 15:49:56 +00:00