Valery Sizov 21e8f43af3 Merge branch 'master' into 7-4-stable ...

Conflicts:
	CHANGELOG
	VERSION

2014-10-27 12:08:44 +02:00

..

controllers

Fix tests

2014-08-07 20:46:17 +03:00

factories

Remove outdated comment on the project test seed

2014-10-03 12:21:23 +02:00

features

Improve project remove spec

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

finders

internal snippets: fix exposing of title

2014-10-24 19:39:14 +03:00

fixtures

Add trailing newline to all text files.

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

helpers

Use actual GitLab URL for test assertion

2014-10-18 00:04:21 -05:00

javascripts

Add trailing newline to all text files.

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

lib

Fix LDAP config lookup for provider 'ldap'

2014-10-24 12:53:32 +03:00

mailers

Update expected value in notify_spec

2014-09-26 14:55:45 -05:00

models

Add test for allowed team name of slack.

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

requests/api

Merge branch 'hipchat_api' of https://github.com/qwazerty/gitlabhq into qwazerty-hipchat_api

2014-10-21 11:46:45 +03:00

routing

Delete wall notes tests

2014-06-13 14:29:26 +03:00

services

Add a simple spec test.

2014-09-29 16:07:53 +02: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

Fix post-receive specs

2014-09-02 11:05:51 +03:00

factories_spec.rb

Style changes from review with @randx

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

factories.rb

Merge tests to support Multiple LDAP groups

2014-10-13 17:33:44 +02:00

spec_helper.rb

Try wear_merged! without argument

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