Commit graph

73 commits

Author SHA1 Message Date
Drew Blessing
f177aaa5fa Backport JIRA service 2015-12-18 14:19:48 -06:00
Douwe Maan
73c59de062 Merge branch 'master' into split-up-builds 2015-12-09 13:56:26 +01:00
Douwe Maan
1e8d703a85 Tag model specs 2015-12-09 10:50:51 +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
Yorick Peterse
d496a6b919 Handle removed source projects in MR CI commits
When calling MergeRequest#ci_commit the code would previously raise an
error if the source project no longer existed (e.g. because the user
removed their fork).

See  for more information.
2015-11-20 23:43:10 +01:00
Zeger-Jan van de Weg
53b285c9a8 Merge branch 'master' into merge-if-green 2015-11-18 11:58:01 +01:00
Zeger-Jan van de Weg
2f048df4a4 API support, incorporated feedback 2015-11-18 11:17:41 +01:00
Dmitriy Zaporozhets
a237999f00
Annotate models
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13 19:22:46 +01:00
Valery Sizov
95df86638d Fix: Inability to reply to code comments in the MR view, if the MR comes from a fork 2015-10-22 18:38:00 +02:00
Ben Boeckel
6b73902733 merge_request: add work_in_progress to MR hooks 2015-10-08 16:37:04 -04:00
Stan Hu
d7812a95cf Re-annotate models 2015-09-06 07:48:48 -07:00
Dmitriy Zaporozhets
3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' "
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets
9f10943c1a
Revert "Merge branch 'drop-satellites'"
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 10:28:42 +02:00
Dmitriy Zaporozhets
44ac823e59
Improve tests to use real branches in merge requests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04 17:20:26 +02:00
Robert Speicher
213d1a4768 Use to_reference for issue and merge request mentionable specs 2015-06-22 12:13:46 +02:00
Robert Speicher
5a9ede4721 Update mock and stub syntax for specs 2015-06-22 12:13:46 +02:00
Robert Speicher
5a9c5520d9 Make use of to_reference in more specs 2015-05-26 15:49:22 -04:00
Robert Speicher
8773f339a3 Minor model spec cleanups
Snippet model was missing project association
2015-05-26 15:48:30 -04:00
Robert Speicher
c0faf91ff2 Add to_reference for models that support references
Now there is a single source of information for which attribute a model
uses to be referenced, and its special character.
2015-05-26 15:48:30 -04:00
Douwe Maan
7e0eb486ed Don't allow a merge request to be merged when its title starts with "WIP". 2015-04-30 15:46:36 +02:00
Robert Speicher
dee52393b5 Correct usage of subject in specs 2015-04-16 16:30:16 -04:00
Jeroen van Baarsen
0c4a70a306 Updated rspec to rspec 3.x syntax
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-02-12 19:17:35 +01:00
Dmitriy Zaporozhets
98ee4a1fa7 Annotate models 2015-01-22 09:40:03 -08:00
Vinnie Okada
fecd9c0cb2 Add specs for tasks
Add tests for the new task list functionality in the Markdown parser and
in issues and merge requests.
2014-10-05 22:15:36 -05:00
Dmitriy Zaporozhets
92deb451da
Annotate models
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-25 12:25:02 +03:00
Dmitriy Zaporozhets
0f550aa386
Remove mass assgnment specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-26 23:57:55 +03:00
Jacob Vosmaer
3f1ece2690 Detect closing issues in Merge Request description 2014-06-13 17:25:44 +02:00
Dmitriy Zaporozhets
8a3807c838
Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-28 12:40:22 +03:00
Dmitriy Zaporozhets
36f861f1b1
Re-annotate models
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-09 15:05:03 +03:00
Dmitriy Zaporozhets
e013cd44e0
Fix mr specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-23 13:24:25 +02:00
skv
d89527839e fix most of warnings 2013-12-15 00:05:10 +04:00
Dmitriy Zaporozhets
8c5aa5e3b1
Fix test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-12 14:20:08 +02:00
Dmitriy Zaporozhets
580dfe5af9
Replace assign with stub for default_branch
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-06 19:13:45 +02:00
Dmitriy Zaporozhets
db10e6aaa6 Fix merge request model spec 2013-10-07 19:42:59 +03:00
Dmitriy Zaporozhets
e219cf7246 Annotate! 2013-10-01 15:15:28 +03:00
ash wilson
c8a115c0e3 Link issues from comments and automatically close them
Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown
references in descriptions, titles, or attached Notes creates a back-reference
Note that links to the original referencer. Furthermore, pushing commits with
commit messages that match a (configurable) regexp to a project's default
branch will close any issues mentioned by GFM in the matched closing phrase.
If accepting a merge request would close any Issues in this way, a banner is
appended to the merge request's main panel to indicate this.
2013-08-25 18:58:41 -04:00
Dmitriy Zaporozhets
8dd37afe34 Reannotate 2013-08-21 12:34:02 +03:00
Izaak Alpert
fae3f46615 Refactor merge api create
-Made the api method a little more readable
-removed some missed extra newline's

Change-Id: Ic38baafc813aaeda0a8b283f39916182c8ec37d5
2013-07-17 22:48:03 -04:00
Izaak Alpert
3d7194f011 Merge Request on forked projects
The good:

 - You can do a merge request for a forked commit and it will merge properly (i.e. it does work).
 - Push events take into account merge requests on forked projects
 - Tests around merge_actions now present, spinach, and other rspec tests
 - Satellites now clean themselves up rather then recreate

The questionable:

 - Events only know about target projects
 - Project's merge requests only hold on to MR's where they are the target
 - All operations performed in the satellite

The bad:

  -  Duplication between project's repositories and satellites (e.g. commits_between)

(for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos)

Fixes:

Make test repos/satellites only create when needed
-Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap)
-project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually
-fixed remote removal
-How to merge renders properly
-Update emails to show project/branches
-Edit MR doesn't set target branch
-Fix some failures on editing/creating merge requests, added a test
-Added back a test around merge request observer
-Clean up project_transfer_spec, Remove duplicate enable/disable observers
-Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well
-Signifant speed ups for tests
-Update formatting ordering in notes_on_merge_requests
-Remove wiki schema update
Fixes for search/search results
-Search results was using by_project for a list of projects, updated this to use in_projects
-updated search results to reference the correct (target) project
-udpated search results to print both sides of the merge request

Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
2013-07-17 22:41:30 -04:00
Dmitriy Zaporozhets
6e35aceff2 Annotated 2013-06-19 15:40:33 +03:00
Andrey Kumanyaev
b1b354b0f8 remove trailing spaces 2013-05-05 18:02:02 +04:00
Dmitriy Zaporozhets
21b1fee92c reannotated 2013-03-15 15:16:02 +02:00
Andrew8xx8
e2d94e0719 State machine added for merge_status field 2013-02-20 17:49:48 +04:00
Andrew8xx8
b45e9aefd3 Merge Request uses StateMachine now 2013-02-18 14:43:50 +04:00
Andrew8xx8
f97296597c Issuable consern uses StateMachine now 2013-02-18 14:43:49 +04:00
Andrew8xx8
8db3920c01 State renamed to merge_status 2013-02-18 14:43:49 +04:00
Dmitriy Zaporozhets
e3d7ce2cc4 Tests are fixed now 2013-01-05 12:12:02 +02:00