Robert Speicher ed2a8ba600 Merge 8-2-stable into 8-2-stable-ee ...

Conflicts remaining:

- app/controllers/groups/group_members_controller.rb
- app/controllers/projects/project_members_controller.rb
- app/models/ability.rb
- app/models/member.rb
- app/models/project.rb

2015-11-19 10:33:18 -05:00

..

admin

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-09-16 10:26:10 +02:00

dashboard

Fix spinach tests introduced by 07101cfab6

2015-10-14 17:27:29 +02:00

explore

Make all group public

2015-09-09 11:27:03 +03:00

profile

Fix tests

2015-11-03 16:39:09 +01:00

project

Merge remote-tracking branch 'ce/master' into ce-to-ee

2015-11-13 12:34:34 -05:00

snippets

fix spinach features to use new button wordings

2015-10-15 17:59:17 +11:00

steps

Merge 8-2-stable into 8-2-stable-ee

2015-11-19 10:33:18 -05:00

support

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into master-ce-to-ee

2015-08-19 11:13:30 +02:00

abuse_report.feature

Streamline the "Report button"

2015-09-29 21:47:01 +02:00

group_active_tab.feature

Add tests for group active tab

2015-08-27 11:29:50 +02:00

group_hooks.feature

Group level web hooks: tests

2015-03-12 20:46:10 +02:00

groups_management.feature

Add feature spec for group membership locking.

2014-12-15 10:44:34 +01:00

groups.feature

Merge 8-2-stable into 8-2-stable-ee

2015-11-19 10:33:18 -05:00

invites.feature

Add spinach tests around accepting and declining invitations.

2015-04-14 18:04:29 +02:00

login_form.feature

satisfy rubocop

2015-09-07 13:15:27 +03:00

search.feature

Ability to search milestones

2015-08-24 13:59:01 +03:00

snippet_search.feature

Updating to persist a params snippets variable

2014-09-05 13:30:55 -04:00

user.feature

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-09-16 10:26:10 +02:00