Valery Sizov 3fcd75a911 Merge CE master into EE master ...

Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb

2014-11-13 17:05:12 +02:00

..

active_tab.rb

Prefix Spinach features with Spinach::Features::.

2014-09-22 16:30:25 +02:00

archived_projects.rb

Make Spinach test names consistent

2014-10-05 18:21:11 +02:00

dashboard.rb

Remove def project from tests that inherit it.

2014-09-28 13:44:04 +02:00

event_filters.rb

Factor '0' * 40 blank ref constants

2014-11-03 20:37:08 +01:00

help.rb

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

issues.rb

Failing feature for dashboard issues when user has authored issues on projects he is not a member of.

2014-10-27 09:20:43 +01:00

merge_requests.rb

Assigned merge request should show on dashboard mr overiew feature spec.

2014-10-27 09:53:35 +01:00

projects.rb

Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into cirosantilli-spinach-step

2014-09-22 20:56:12 +03:00

shortcuts.rb

Prefix Spinach features with Spinach::Features::.

2014-09-22 16:30:25 +02:00