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

refactor login as to be impersonation with better login/logout

2015-10-29 11:00:17 +01:00

atom

Use new routing helper

2015-09-08 17:53:16 +01:00

ci

Remove deprecated CI events from project settings page

2015-10-28 12:33:54 +01:00

issues

Improve features to ensure Ajax filter has actually executed

2015-07-08 15:57:24 -04:00

merge_requests

Improve features to ensure Ajax filter has actually executed

2015-07-08 15:57:24 -04:00

profiles

Use new routing helper

2015-09-08 17:53:16 +01:00

security

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

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

builds_spec.rb

Implement Build Artifacts

2015-11-10 12:51:50 +01:00

ci_settings_spec.rb

Move CI project settings page to CE project settings area

2015-09-29 16:07:44 +02:00

ci_web_hooks_spec.rb

Move CI web hooks page to project settings area

2015-10-05 10:47:23 +02:00

commits_spec.rb

Implement Build Artifacts

2015-11-10 12:51:50 +01:00

gitlab_flavored_markdown_spec.rb

Make sure the gfm helper passes the required options

2015-08-31 18:09:18 -04:00

groups_spec.rb

Add feature tag to feature specs

2015-07-06 22:39:55 -04:00

help_pages_spec.rb

Re-fix image rendering for help pages

2015-04-15 12:45:31 -04:00

issues_spec.rb

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

2015-07-14 15:40:46 +02:00

login_spec.rb

Fix spec broken by updated Devise translations

2015-10-01 23:46:43 -04:00

markdown_spec.rb

Add post_process method to Gitlab::Markdown

2015-09-01 18:16:56 -04:00

notes_on_merge_requests_spec.rb

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

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

password_reset_spec.rb

Refactor PasswordsController to use before_actions

2015-10-01 21:47:27 -04:00

profile_spec.rb

Use stub_application_setting in a few more specs

2015-07-06 22:39:56 -04:00

projects_spec.rb

Fix spec

2015-10-18 14:12:50 +02:00

runners_spec.rb

Show specific runners from projects where user is master or owner

2015-11-16 13:24:56 +01:00

search_spec.rb

Fix Style/TrailingBlankLines cop violations

2015-06-22 14:38:33 -04:00

task_lists_spec.rb

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

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

triggers_spec.rb

Move CI triggers page to project settings area

2015-09-29 10:37:31 +02:00

users_spec.rb

Streamline the "Report button"

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

variables_spec.rb

Move CI variables page to project settings

2015-09-28 17:19:20 +02:00