Commit graph

17 commits

Author SHA1 Message Date
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
c5eb2977d7 Merge branch 'add-current-user-to-autocomplete' into 'master'
Always add current user to autocomplete controller to support filter by "Me"

### What does this MR do?

This MR always adds the current user to the autocomplete list of users.

### Why was this MR needed?

Normally only the members from a team or the group are shown in the autocomplete list. However, this prevents a user from filtering issues belong to him/her if the user does not belong directly to either. To make this filtering more usable, we can be sure to add the current user to the list, which the JavaScript code will move to the top of the list.

### What are the relevant issue numbers?

Partial fix #2202

See merge request !1100
2015-08-06 16:10:38 +00:00
Stan Hu
70f5291808 Always add current user to autocomplete controller to support filter by "Me"
Partial fix #2202
2015-08-06 00:46:14 -07:00
Dmitriy Zaporozhets
a87989fb7d Remove satellites 2015-07-15 15:45:57 +02:00
Stan Hu
357cd97199 Add an expect call to prevent random Spinach failure:
"Unable to find field "merge_request_title"
2015-06-23 23:19:32 -07:00
Robert Speicher
69bbc413fe Update all should-style syntax to expect in features 2015-06-12 05:12:09 -04:00
Stan Hu
7a7ce70169 Use the user list from the target project in a merge request
Closes #1535
2015-05-22 09:52:09 -04:00
Dmitriy Zaporozhets
c66e575179
Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-06 17:00:19 +03:00
Vinnie Okada
76aad9b76e Upgrade to Rails 4.1.9
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
2015-02-14 11:09:23 -07:00
Dmitriy Zaporozhets
ce0811ae5c Improve tests 2015-02-06 09:19:51 -08:00
Ciro Santilli
a92f48f615 Remove def project from tests that inherit it. 2014-09-28 13:44:04 +02:00
Ciro Santilli
de6c8778f7 Prefix Spinach features with Spinach::Features::. 2014-09-22 16:30:25 +02:00
Dmitriy Zaporozhets
cbe4891d7c
Fix form mr tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31 20:13:27 +03:00
Dmitriy Zaporozhets
536373ad05
Dont allow mr compare with empty branches
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-08 19:00:03 +03:00
Dmitriy Zaporozhets
c8e1c53f43 Merge branch 'rm-dir-prefix' of https://github.com/cirosantilli/gitlab-elearn into cirosantilli-rm-dir-prefix 2014-03-13 22:36:39 +02:00
Ciro Santillli
170340e6b1 Remove dir prefix and suffix from tests inside dir. 2014-02-23 10:34:39 +01:00
Renamed from features/steps/project/project_forked_merge_requests.rb (Browse further)