Commit Graph

17 Commits

Author SHA1 Message Date
GitLab Bot 5bdbc604c8 Add latest changes from gitlab-org/gitlab@master 2020-05-08 09:09:39 +00:00
GitLab Bot b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
Yorick Peterse 025015048f Merge branch 'security-2773-milestones-fix' into 'master'
[master] Check issue milestone availability

See merge request gitlab/gitlabhq!2788
2019-03-04 18:37:15 +00:00
Jarka Košanová 30ab6ee416 Check issue milestone availability
Add project when creating milestone in specs

We validate milestone is from the same
project/parent group as issuable ->
we need to set project in specs correctly

Improve methods names and specs organization
2019-02-14 15:28:02 +01:00
Rémy Coutable eafe834c3d
Reduce remaining diff with EE in app/services
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-02-14 12:37:55 +01:00
gfyoung 265478ad74 Enable frozen string in apps/services/**/*.rb
For directories application_settings --> labels.

Partially addresses #47424.
2018-07-16 12:36:41 -07:00
Douwe Maan cc656a1199 Refactor resolvability checks based on type 2017-04-06 10:51:45 -05:00
Douwe Maan 5f94785620 Make issue-from-discussion description text more consistent 2017-04-05 20:48:26 -05:00
Bob Van Landuyt 4224124ddf Update copy
One comments *on* something, not *in* something
2017-03-13 08:27:52 +01:00
Bob Van Landuyt ea70a0d674 Rename variable
merge_request_for_resolving_discussions ->
merge_request_to_resolve_discussions_of
2017-03-13 08:27:52 +01:00
Bob Van Landuyt 5eee47758c Correctly indent quotes in new issue description
By using `>`-quote style instead of `>>>`.

Also: Update documentation images.
2017-03-13 08:27:51 +01:00
Bob Van Landuyt 52c0195dcc Better variable names
So the title doesn't seem to be set _on_ a merge request.
2017-03-13 08:27:51 +01:00
Bob Van Landuyt f0dd2a54b3 Link 'discussion' instead of date
Since the date would be wrong for people in different timezones.
2017-03-13 08:27:51 +01:00
Bob Van Landuyt ffe135ccf6 Move functionality for resolving discussions into a concern 2017-03-13 08:27:51 +01:00
Bob Van Landuyt 0267b83898 Delegate a single discussion to a new issue
Delegate a discussion in a merge request into a new issue.
The discussion wil be marked as resolved and a system note will be
added linking to the newly created issue.
2017-03-13 08:27:51 +01:00
wendy0402 9a24db121c fix issue creation from milestone doesn't assign the milestone 2017-02-12 09:02:03 +07:00
Bob Van Landuyt 1123057ab7 Feature: delegate all open discussions to Issue
When a merge request can only be merged when all discussions are
resolved. This feature allows to easily delegate those discussions to a
new issue, while marking them as resolved in the merge request.

The user is presented with a new issue, prepared with mentions of all
unresolved discussions, including the first unresolved note of the
discussion, time and link to the note.

When the issue is created, the discussions in the merge request will get
a system note directing the user to the newly created issue.
2016-12-05 20:55:45 +01:00