Dmitriy Zaporozhets 67d6a79ee9 Merge branch 'ce-ee-master' into ee-master ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb

2014-10-22 14:47:04 +03: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

Improve project remove spec

2014-10-08 15:05:14 +03:00

finders

Merge branch 'master' into ce-upstream

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

fixtures

Add trailing newline to all text files.

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

helpers

Merge branch 'master' into ce-upstream

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

javascripts

Add trailing newline to all text files.

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

lib

Use server specific admin_group

2014-10-17 17:16:29 +02:00

mailers

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

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

models

Merge branch '7-4-stable' into ee_stable

2014-10-21 14:39:35 +03:00

requests/api

Merge branch 'ce-ee-master' into ee-master

2014-10-22 14:47:04 +03:00

routing

Display list of recipientgroups properly

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

services

Fix EE code after membership refactoring

2014-10-03 14:09:07 +03:00

support

Use short_id instead of [0..N] for short version of commit sha

2014-10-10 15:39:48 +03: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