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

..

controllers

Fix unsubscribe controller spec.

2014-08-22 12:03:33 +02:00

factories

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ee-7-4

2014-10-03 16:18:40 +03:00

features

Merge branch 'feature_password_strength_indicator' into 'master'

2014-10-30 11:32:11 +00:00

finders

internal snippets: fix exposing of title

2014-10-24 19:44:42 +03:00

fixtures

Add trailing newline to all text files.

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

helpers

Merge CE master into EE master

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

javascripts

Add trailing newline to all text files.

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

lib

Merge CE master into EE master

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

mailers

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

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

models

Merge CE master into EE master

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

requests/api

Merge CE master into EE master

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

routing

Display list of recipientgroups properly

2014-08-08 20:47:08 +02:00

services

Merge CE master into EE master

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

support

Merge pull request #7903 from cirosantilli/test-seed-reset

2014-11-05 15:22:37 +02:00

tasks/gitlab

Make backup version blocker test more robust

2014-02-28 12:11:43 +01:00

workers

Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-pre

2014-09-15 11:24:51 +02:00

factories_spec.rb

Style changes from review with @randx

2013-07-17 22:48:03 -04:00

factories.rb

Make ldap group link factory valid

2014-10-16 12:11:08 +02:00

spec_helper.rb

Try wear_merged! without argument

2014-10-01 11:43:16 +03:00