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

..

commits

Make Spinach test names consistent

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

issues

Refactor task list tests and coffeescript

2014-10-06 19:19:12 -05:00

source

Use :message key, not :error for File::Service.

2014-10-21 11:37:15 +03:00

active_tab.feature

Make Spinach test names consistent

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

archived.feature

Remove dir prefix and suffix from tests inside dir.

2014-02-23 10:34:39 +01:00

create.feature

Make Spinach test names consistent

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

deploy_keys.feature

Feature tests for deploy keys

2013-05-06 15:09:41 +03:00

edit_issuetracker.feature

Add trailing newline to all text files.

2014-06-21 11:20:22 +02:00

fork.feature

Make Spinach test names consistent

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

forked_merge_requests.feature

Comment random failing test

2014-10-02 17:49:11 +03:00

git_hooks.feature

Git hooks for checking email

2014-10-29 11:42:51 +02:00

graph.feature

Add tests for commits graph

2014-09-29 12:11:53 +03:00

group_links.feature

Add feature test for project share

2013-10-16 14:17:58 +03:00

hooks.feature

Prevent 500 if hook url is down, fixes #7376

2014-07-29 11:49:46 +02:00

merge_requests.feature

Merge branch 'master' into ce-upstream

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

network_graph.feature

Make Spinach test names consistent

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

project.feature

Merge branch 'master' into ce-upstream

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

redirects.feature

Add in the tests.

2014-07-11 19:53:10 +02:00

service.feature

Merge CE master into EE master

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

shortcuts.feature

Make Spinach test names consistent

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

snippets.feature

Refactor snippets views

2014-06-14 12:36:46 +03:00

star.feature

Fix star tests

2014-07-24 23:25:38 +03:00

team_management.feature

Merge branch 'master' into ce-upstream

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

wiki.feature

Unstub after the test is done.

2014-05-07 11:52:07 +02:00