Commit Graph

25 Commits

Author SHA1 Message Date
Drew Blessing f177aaa5fa Backport JIRA service 2015-12-18 14:19:48 -06:00
Zeger-Jan van de Weg e7969d6f6c Satisfy Douwe Maan 2015-12-07 13:41:18 +01:00
Zeger-Jan van de Weg 0e96d6eb10 Merge branch 'master' into merge-if-green 2015-12-07 10:06:07 +01:00
Zeger-Jan van de Weg 46278ec7ba Button fix 2015-12-07 09:59:16 +01:00
Zeger-Jan van de Weg 2462a96e45 Incorporate feedback 2015-12-05 15:42:38 +01:00
Zeger-Jan van de Weg a7682f8775 Specs for 'Merge When Build Succeeds' 2015-12-02 13:27:16 +01:00
Douwe Maan 4a292aa604 Proper cross-project references when MR is closed by issue 2015-11-30 21:36:35 +01:00
Zeger-Jan van de Weg 8608c6325e Refactor MergeWhenBuildSucceedsService and incorporate feedback 2015-11-23 10:11:54 +01:00
Rubén Dávila fa9f2dec0e Monkey patching TaskList::Item is no longer required. #2296 2015-11-20 10:49:12 -05:00
Ruben Davila 97afb84b31 Generate system note after Task item has been updated on Issue or Merge Request. #2296
Everytime the User check or uncheck a Task Item from the Issue or
Merge Request description, a new update is going to be
added to the activity logs of the Issue or Merge Request.

Note that when using the edit form, you can only update the Task item
status or add/delete/modify existing ones. Doing both actions is not
fully supported.
2015-11-19 21:05:44 -05:00
Zeger-Jan van de Weg 2f048df4a4 API support, incorporated feedback 2015-11-18 11:17:41 +01:00
Zeger-Jan van de Weg 77f8a1e392 Merge when build succeeds 2015-11-02 17:27:38 +01:00
Douwe Maan 464c939a7e Clean up MR refresh service somewhat. 2015-10-21 17:34:12 +02:00
Stan Hu f726df26c2 Reorder system note verb to say "Restored source branch X" instead of "Source branch X restored" 2015-10-16 00:51:25 -07:00
Stan Hu effa94bb87 Improve SystemNote interface for branch add/restore case 2015-10-15 23:54:13 -07:00
Stan Hu 2611d9f63c Add a system note and update relevant merge requests when a branch is deleted or re-added
If a branch is deleted with an open merge request, amended offline, and then pushed again,
GitLab doesn't bother to update the merge request even though the last commit ID and/or
code may have changed. This MR ensures that each push will update any relevant merge
requests and adds a system note if this happens as well.

Closes #2926
2015-10-15 23:54:13 -07:00
Daniel Gerhardt 92bb845e1e Fix hooks for web based events with external issue references
The creation of cross references for external issues (which would fail)
is now prevented.

Fixes #1650, GH-9333.
2015-06-14 17:41:11 +02:00
Stan Hu 5e4384ec9b Support editing target branch of merge request
Closes https://github.com/gitlabhq/gitlabhq/issues/7105
See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130
2015-05-29 04:08:08 -07:00
Dmitriy Zaporozhets 701c2e9a3b Merge branch 'rs-to_reference' into 'master'
Add to_reference method to referable models

Now there is a single source of information for which attribute a model uses to be referenced, and its special character.

See merge request !641
2015-05-27 10:03:14 +00:00
Robert Speicher 1aa3921dd8 Add a note when an Issue or Merge Request's title changes 2015-05-26 21:49:04 -04:00
Robert Speicher 3cb6a33846 More SystemNoteService cleanup 2015-05-26 16:30:07 -04:00
Robert Speicher 3e8efce360 Refactor SystemNoteService.cross_reference_disallowed? 2015-05-11 00:01:16 -04:00
Robert Speicher 686f6855c2 Update SystemNoteService method naming conventions
Now the verb comes first, and there is no restriction on
singular/plural.
2015-05-11 00:01:15 -04:00
Robert Speicher ff3a62aad1 Remove legacy special case for emphasized reference notes 2015-05-11 00:01:15 -04:00
Robert Speicher 48e6fb532a Add a SystemNoteService class
There's a lot of code in the Note model that only deals with creating
system notes, so we're going to split that into its own class.
2015-05-11 00:01:01 -04:00