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

..

active_tab.rb

Fix tests

2015-09-07 12:45:06 +02:00

admin.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-07-02 17:07:02 +02:00

authentication.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-07-02 17:07:02 +02:00

diff_note.rb

Fix tests

2015-09-03 22:15:21 +02:00

group.rb

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

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

issuable.rb

Fix rubocop issues at feature/ directory

2015-06-22 14:21:34 +02:00

markdown.rb

Change within to page.within in feature steps

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

note.rb

Fix features syntax

2015-06-22 12:13:45 +02:00

paths.rb

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

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

project_tab.rb

Better name for up-level links

2015-11-03 13:22:11 +01:00

project.rb

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

2015-10-23 13:01:19 +02:00

search.rb

Updating to persist a params snippets variable

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

shortcuts.rb

Awesome shortcuts for GitLab

2014-09-01 11:49:17 +02:00

snippet.rb

fix for public snippet

2014-10-24 12:52:59 +03:00

user.rb

Fix rubocop issues at feature/ directory

2015-06-22 14:21:34 +02:00