Commit Graph
213 Commits
Author SHA1 Message Date
Robert Speicher 2f88459297 Ensure raise_error expectations provide arguments 2015-09-21 15:35:29 -04:00
Kamil Trzcinski 8671343b65 Rubocop fix 2015-09-20 20:46:15 +02:00
Kamil Trzcinski 71a5d5a036 Fail builds if no .gitlab-ci.yml is found 2015-09-20 20:46:14 +02:00
Valery SizovandKamil Trzcinski a0c1a12dee remove API calls from CE to CI 2015-09-18 18:02:11 +02:00
Stan Hu f481637245 Merge branch 'fix-issue-2382' into 'master'
Create a "destroyed Milestone" event and keep Milestone events around in the DB for posterity

Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone".

Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c89cc8a0a9fa549deac433f17b890913/image.png)

Closes #2382

See merge request !1227
2015-09-17 08:04:37 +00:00
Kamil Trzcinski e21deaee8e Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
# Conflicts:
#	Gemfile.lock
2015-09-15 22:40:35 +02:00
Kamil Trzcinski 0d23676f9d Fix: rubocop 2015-09-15 22:24:33 +02:00
Kamil Trzcinski 209c72c4a1 Fix: services/ci/create_project_service_spec.rb 2015-09-15 21:53:04 +02:00
Valery Sizov b87ca7500f fix specs. Stage 7 2015-09-15 17:43:17 +03:00
Valery Sizov 88b3195ecf fix specs. Stage 6 2015-09-15 16:29:36 +03:00
Stan Hu d3d03d1362 Create a "destroyed Milestone" event and keep Milestone events around in the DB
for posterity.

Also fix issue where destroying a Milestone would cause odd, transient messages like
"created milestone" or "imported milestone".

Add "in" preposition when creating and destroying milestones

Closes #2382
2015-09-15 05:51:11 -07:00
Valery Sizov e2cbb36ba9 fix specs. Stage 5 2015-09-15 15:51:03 +03:00
Valery Sizov 2c4daf1a68 fix part of specs 2015-09-14 16:48:33 +03:00
Valery Sizov 4c53cc0eba rubocop satisfy 2015-09-14 14:37:18 +03:00
Stan Hu 9995f0806b Import forked repositories asynchronously to prevent large repositories from timing out
Use import_status to track async import status and give feedback to the user

Closes #2388
Closes #2400
2015-09-11 00:34:04 -07:00
Dmitriy Zaporozhets 0b5d627cd4 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-09 14:56:02 +02:00
Dmitriy Zaporozhets 90c338a495 Move helpers back to original directory 2015-09-09 14:37:34 +02:00
Dmitriy Zaporozhets cc4ef4da11 Refactor CI tests 2015-09-09 14:17:16 +02:00
Dmitriy Zaporozhets b05cc8bc9a Merge branch 'global_labels' into 'master'
Global labels

https://dev.gitlab.org/gitlab/gitlabhq/issues/2353

See merge request !1240
2015-09-09 08:57:54 +00:00
Jared Szechy e156f42079 FogBugz project import 2015-09-08 20:23:01 -04:00
Valery Sizov 6bd3d72bbd added spinach for glabal labels 2015-09-03 19:02:14 +03:00
Douwe Maan ea5da30326 Don't notify users without access to the project when they are (accidentally) mentioned in a note. 2015-08-26 17:23:22 -07:00
Maël Valais a9e409179b Create cross-reference for closing references on commits pushed to non-default branches.
I also revamped the tests on "closing reference commits" (= "Fixes #xxxx" for example).
Now, there are two different contexts:
- when the commits with "closing reference" are pushed to the default branch,
- when the commits with "closing reference" are pushed to a non-default branch.

Closes gitlab-org/gitlab-ce#2190.
2015-08-22 16:49:09 +02:00
Douwe Maan 3d51a6d435 Merge branch 'master' into reply-by-email 2015-08-20 12:19:19 -07:00
Douwe Maan 991c9f6fda Test Email::AttachmentUploader. 2015-08-20 11:33:35 -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
Douwe Maan 4f24eb2aa6 Merge branch 'master' into merge-notifs 2015-08-06 12:16:36 +02:00
Dmitriy Zaporozhets ab8c71de4e Fix merge request creation without branch selected
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-05 11:03:41 +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
Douwe Maan fa9004c78c Send notification to all participants when MR is merged. 2015-07-30 15:29:43 +02:00
Stan Hu 3e9b612306 Check that project was actually created rather than just validated in import:repos task
Add gitlab-shell to error message to give user a clue that something may be wrong there.

Ran into this in #2082. User was told that repositories were created when they were
not due to hooks symlink being wrong.
2015-07-29 10:49:13 -07:00
Robert Speicher 88aed40962 Create project services on Project creation 2015-07-25 16:43:55 -04:00
Robert Speicher d92668a05b Only create :admin user in the one test where it's used 2015-07-25 16:42:28 -04:00
Douwe MaanandRobert Speicher 29cbb2f078 Update specs. 2015-07-11 16:47:33 -04:00
Robert Speicher cf7c57aaf5 Use stub_application_setting in a few more specs
These specs also failed when run by themselves before this change, so
we've likely got some kind of cross-test contamination going on.
2015-07-06 22:39:56 -04:00
Dmitriy Zaporozhets f40b99d02e Merge branch 'master' into rubocop-for-tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/features/issues_spec.rb
	spec/models/forked_project_link_spec.rb
	spec/models/hooks/service_hook_spec.rb
	spec/models/hooks/web_hook_spec.rb
	spec/models/project_services/hipchat_service_spec.rb
	spec/requests/api/project_members_spec.rb
	spec/requests/api/projects_spec.rb
	spec/requests/api/system_hooks_spec.rb
	spec/services/archive_repository_service_spec.rb
	spec/support/matchers.rb
	spec/tasks/gitlab/backup_rake_spec.rb
2015-06-23 10:44:03 +02:00
Stan Hu 52aa21b12d Fix Style/IndentationWidth cop violations 2015-06-22 22:25:40 -07:00
Stan Hu 359ed48638 Fix Style/AlignHash cop violations 2015-06-22 22:24:39 -07:00
Robert Speicher 15a05be70d Fix Style/Blocks cop violations 2015-06-22 16:00:54 -04:00
Robert Speicher 56246b70fb Fix Style/TrailingBlankLines cop violations 2015-06-22 14:38:33 -04:00
Robert Speicher 649c9969ba Fix Style/IndentationConsistency cop violations 2015-06-22 14:33:01 -04:00
Dmitriy Zaporozhets cf259cdb43 Remove unnecessary whitespace between let and (
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-22 14:39:07 +02:00
Robert SpeicherandDmitriy Zaporozhets 0f627f1c60 Fix raise_error without an argument deprecation warnings 2015-06-22 12:13:47 +02:00
Robert SpeicherandDmitriy Zaporozhets 7460c39f60 Fix GitPushService spec 2015-06-22 12:13:47 +02:00
Robert SpeicherandDmitriy Zaporozhets 2120e2dd95 Replace remaining references to Note.create_cross_reference_note 2015-06-22 12:13:46 +02:00
Robert SpeicherandDmitriy Zaporozhets 5a9ede4721 Update mock and stub syntax for specs 2015-06-22 12:13:46 +02:00
Douwe Maan 903132bc07 Merge branch 'fix-ext-issue-webbased-hooks' into 'master'
Fix hooks for web based events with external issue references

The creation of cross references for external issues (which would fail)
is now prevented. This fixes a 500 error and the execution of hooks when
creating a merge request or commenting on one.

Fixes #1650, GH-9333.

This regression might have been introduced by
8f8a8ab32b. There is actually a TODO by
@rspeicher mentioning external issues which is lost (unhandled) in a
later commit.

This fix is related to !766 and !804 which fix a similar issue for hooks for
Git based events.

See merge request !794
2015-06-16 11:36:31 +00:00
Douwe Maan 6617e9bbf3 Merge branch 'fix-post-receive-external-tracker' into 'master'
Fix post-receive errors on a push when an external issue tracker is configured

### What does this MR do?

This MR improves upon !766, fixing errors upon a git push that occur only when an external issue tracker (not JIRA) is used. This MR takes into account that external issue trackers, such as JIRA, may close issues. Disabling the processing of post-receive commits when an external issue tracker is configured seems like the wrong behavior.

### Why was this MR needed?

When a user adds an issue reference, the refactoring in 8f8a8ab and a6defd157 caused `project.get_issue` to be called, causing `ExternalIssue` to be returned when an external issue tracker was configured. This object does not have a `close` method, as needed in `CloseService`. Nor does it make sense to associate a `SystemNote` with this object.

GitLab EE uses a [special case for JIRA](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/app/services/git_push_service.rb#L87). I would recommend moving this logic into `CloseService` too.

### What are the relevant issue numbers?

* Closes #1700
* Closes #1720

See merge request !804
2015-06-15 07:42:24 +00: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