Commit Graph

156 Commits

Author SHA1 Message Date
Valery Sizov 0b7aabe302 Multiple issue assignee: fix for CE restrictions 2017-05-05 20:07:35 +03:00
Valery Sizov 0cfe35f727 Multiple issue assignee: CE restriction for multiple assignees 2017-05-05 18:55:16 +03:00
Valery Sizov 387c4b2c21 Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03: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
Jarka Kadlecova a74a6cfddf Create todos only for new mentions 2017-03-29 17:20:11 +02:00
Bob Van Landuyt 0c6e685f8c Move `ResolveDiscussions` into `concerns/issues` folder 2017-03-13 08:27:52 +01: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 67bd277ae6 Make sure the for a merge request only gets executed once. 2017-03-13 08:27:51 +01:00
Bob Van Landuyt 43da8db7ed Clean up `discussions_to_resolve`-method 2017-03-13 08:27:51 +01:00
Bob Van Landuyt 3eeea42638 Move `resolve_discussions_with_issue` to `Issues::CreateService` 2017-03-13 08:27:51 +01:00
Bob Van Landuyt 843092b631 Don't filter params and merge them back in later
By building the issue before filtering
2017-03-13 08:27:51 +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 b9aa6c3583 Optimize finding `discussions_to_resolve` 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 f86928953d Always require MR-iid for resolving discussions
And deduplicate the finding of MR's & discussions. Now the searching
is done in the service, istead of the controller & the API.
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
Valery Sizov a0108c6925 Address review comments 2017-03-07 13:42:17 +02:00
Valery Sizov 5bf2ab73ba Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues 2017-03-03 20:24:16 +02:00
Valery Sizov 39db04bb17 Address review comments 2017-03-02 18:09:48 +02:00
Sean McGivern 811e598f60 Enable and autocorrect the CustomErrorClass cop 2017-03-01 15:28:10 +00:00
Valery Sizov 3b69196a49 [Issue Board Sorting] Set position for newly created issues 2017-02-28 19:52:42 +02:00
Valery Sizov 1ff3cd9934 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues 2017-02-24 16:32:35 +02:00
Oswaldo Ferreira 2ace39f242 Spam check and reCAPTCHA improvements 2017-02-21 13:32:49 -03:00
Phil Hughes c032414b2d Frontend updates to positioning the issue in lists 2017-02-17 11:29:16 +00:00
Douwe Maan ac868482a7 Allow issues in boards to be ordered 2017-02-17 11:29:16 +00:00
winniehell 81eae63b7a Use safe navigation operator to make rubocop happy 2017-02-13 13:02:53 +01:00
wendy0402 9a24db121c fix issue creation from milestone doesn't assign the milestone 2017-02-12 09:02:03 +07:00
Jarka Kadlecova 3d2954e457 Use reCaptcha when an issue identified as spam 2017-02-07 12:56:20 +01:00
Felipe Artur 1b082a4c33 Check if user can read issue before being assigned 2016-12-27 19:25:17 -02:00
Rydkin Maxim 170efaaba2 Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741 2016-12-16 21:37:22 +03: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
Adam Niedzielski 1105597303 Refactor JiraService by moving code out of JiraService#execute method
The implicit interface of project services states that the "execute"
method is meant to be called when project hooks are executed.
Currently JiraService does not support any project events even though
JiraService#supported_events says that "commit" and "merge_request"
are supported. They are only used to render correct options in
JIRA configuration screen, but they are not supported.
Because of that, this commit makes "execute" method a no-op.
2016-12-01 09:45:06 +01:00
Yorick Peterse 509910b89f
Process commits in a separate worker
This moves the code used for processing commits from GitPushService to
its own Sidekiq worker: ProcessCommitWorker.

Using a Sidekiq worker allows us to process multiple commits in
parallel. This in turn will lead to issues being closed faster and cross
references being created faster. Furthermore by isolating this code into
a separate class it's easier to test and maintain the code.

The new worker also ensures it can efficiently check which issues can be
closed, without having to run numerous SQL queries for every issue.
2016-11-07 13:11:44 +01:00
Douglas Barbosa Alexandre 484f19ed1c Include global labels when moving an issue to another project 2016-10-19 14:58:25 -02:00
Dmitriy Zaporozhets f28ca293b7 Add bulk update support for merge requests list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-09-08 11:52:20 +03:00
Douglas Barbosa Alexandre 21f10af095 Scope hooks thal will run for confidential issues 2016-08-31 18:34:45 -03:00
Douglas Barbosa Alexandre 44340fede2 Fix confidential issues should not be passed to Webhooks 2016-08-31 18:33:14 -03:00
Robert Speicher 717366d28d Merge branch '4273-slash-commands' into 'master'
Support slash commands in issues / MR description & comments

See merge request !5021
2016-08-18 16:41:16 -05:00
Douwe Maan 8b8a4626c6 Fix specs and implement fixes based on failing specs 2016-08-17 17:54:24 -05:00
Robert Speicher 3666f6987e Merge branch '2451-fix-mentions-in-issue-updates' into 'master'
Send notification emails when users are newly mentioned in issue or MR edits

## What does this MR do?

Introduces "new mention in issue" and "new mention in MR" email notifications.  Editing a Mentionable title or description and adding a mention to a user who was not previously mentioned will now send them a notification email, following usual permissions for doing so.

## Why was this MR needed?

Issues & MRs may be edited to include mentions to new people. We don't currently send out email notifications of these edits to anyone, although they do create TODOs. This brings email notifications into parity with TODOs.

## What are the relevant issue numbers?

Closes #2451

See merge request !5800
2016-08-17 20:19:11 +00:00
Douwe Maan e07c27fee4 Merge branch 'master' into 4273-slash-commands
# Conflicts:
#	app/services/issues/create_service.rb
2016-08-16 17:49:53 -05:00
Patricio Cano 5994c11910 Further refactor and syntax fixes. 2016-08-15 17:20:57 -05:00
Patricio Cano 43e756d4ea Refactored AkismetHelper into AkismetService and cleaned up `Spammable`
- Refactored SpamCheckService into SpamService
2016-08-15 13:18:15 -05:00
Patricio Cano 64ab2b3d9f Refactored spam related code even further
- Removed unnecessary column from `SpamLog`
- Moved creation of SpamLogs out of its own service and into SpamCheckService
- Simplified code in SpamCheckService.
- Moved move spam related code into Spammable concern
2016-08-15 13:18:15 -05:00
Patricio Cano 722fc84e3d Complete refactor of the `Spammable` concern and tests:
- Merged `AkismetSubmittable` into `Spammable`
- Clean up `SpamCheckService`
- Added tests for `Spammable`
- Added submit (ham or spam) options to `AkismetHelper`
2016-08-15 13:18:15 -05:00
Patricio Cano 95419679f2 Lay the ground works to submit information to Akismet
- New concern `AkismetSubmittable` to allow issues and other `Spammable` models to be submitted to Akismet.
- New model `UserAgentDetail` to store information needed for Akismet.
- Services needed for their creation and tests.
2016-08-15 13:17:58 -05:00