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

Remove unnecessary page. from tests.

2014-09-26 09:51:17 +02:00

admin.rb

Merge remote-tracking branch 'origin/master' into ee-7-4

2014-10-02 13:24:59 +03:00

authentication.rb

Replace old spinach step definitions with step.

2014-09-22 10:01:50 +02:00

diff_note.rb

Replace javascript:; links with buttons.

2014-09-22 21:01:19 +02:00

group.rb

Added public groups area to enhance searching and exploring of projects

2014-07-15 08:19:27 +02:00

markdown.rb

Refactor task list tests and coffeescript

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

note.rb

Add Spinach tests for task lists

2014-10-06 02:07:03 -05:00

paths.rb

Git hooks for checking email

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

project_tab.rb

Explicitly require active teab for tests

2014-09-04 10:00:04 +03:00

project.rb

Merge CE master into EE master

2014-11-13 17:05:12 +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

Move destroy user feature to spec.

2014-07-17 23:22:40 +02:00