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

..

commits

Add tests to release notes feature

2015-11-06 15:43:59 +01:00

issues

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

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

source

Add ability to create directories in the editor

2015-10-29 15:49:07 +01:00

active_tab.rb

Fix consistency issue in sidebars of Project and Group Settings.

2015-06-24 18:05:16 +02:00

archived.rb

Update all should-style syntax to expect in features

2015-06-12 05:12:09 -04:00

audit_event.rb

Move audit tests for project in separate class

2015-07-03 12:43:54 +02:00

create.rb

Update all should-style syntax to expect in features

2015-06-12 05:12:09 -04:00

deploy_keys.rb

Change within to page.within in feature steps

2015-06-12 05:12:42 -04:00

ff_merge_requests.rb

Page is not reloaded periodically to check if rebase is finished

2015-10-29 20:17:35 +02:00

fork.rb

Fix tests

2015-09-25 10:04:09 +02:00

forked_merge_requests.rb

Merge master from CE

2015-08-17 14:01:32 +02:00

git_hooks.rb

RSpec 3 updates for EE

2015-07-02 12:35:49 -04:00

graph.rb

Fix graph description and text

2015-11-10 16:27:50 +01:00

hooks.rb

Enable SSL verification for Webhooks

2015-08-26 15:48:31 +03:00

merge_requests.rb

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

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

network_graph.rb

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

2015-07-31 16:12:46 +02:00

project_group_links.rb

Use page.within instead of within

2015-07-02 16:58:28 -04:00

project_shortcuts.rb

Add shortcut for project activity page

2015-07-08 12:43:46 +02:00

project.rb

Merge remote-tracking branch 'origin/master' into ce_upsteram

2015-11-05 14:26:35 +02:00

redirects.rb

Merge remote-tracking branch 'origin/master' into ce_upstream_15_10

2015-10-15 16:46:48 +03:00

services.rb

Allow configuring the Jira API URL

2015-10-30 14:34:39 +01:00

snippets.rb

Fix spec

2015-10-18 15:36:02 +02:00

star.rb

Cleanup and some test fixes after refactoring project home page

2015-07-08 16:55:04 +02:00

team_management.rb

satisfy rubocop

2015-10-15 19:15:58 +03:00

wiki.rb

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

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