Douwe Maan 8fb49a4b70 Merge branch 'master' into merge-if-green ...

# Conflicts:
#	app/views/projects/merge_requests/widget/_heading.html.haml
#	app/views/projects/merge_requests/widget/open/_accept.html.haml

2015-12-08 22:34:03 +01:00

..

benchmarks

Align hash literals in IssuesFinder spec

2015-11-19 16:02:21 +01:00

controllers

Merge branch 'serve_lfs_object' into 'master'

2015-12-08 14:19:52 +00:00

factories

Incorporate feedback

2015-12-05 15:42:38 +01:00

features

Merge branch 'master' into merge-if-green

2015-12-08 22:34:03 +01:00

finders

Port GitLab EE ProjectsFinder changes

2015-11-20 15:53:04 +01:00

fixtures

Use URL helpers in specs

2015-12-03 14:00:09 +01:00

helpers

Fix spec failure introduced by 9d03bc6fa3

2015-12-07 16:50:20 -05:00

javascripts

Make tab target selectors less naive

2015-12-08 14:47:28 -05:00

lib

Block LDAP user when they are no longer found in the LDAP server

2015-12-08 11:15:30 -06:00

mailers

fix deprecation messages in tests

2015-12-03 10:33:43 +02:00

models

Merge branch 'master' into zj/gitlab-ce-merge-if-green

2015-12-08 13:43:45 +01:00

requests

Merge branch 'master' into merge-if-green

2015-12-08 22:34:03 +01:00

routing

Move partial to right place and fix tests.

2015-09-08 15:14:14 +01:00

services

Merge branch 'master' into zj/gitlab-ce-merge-if-green

2015-12-08 13:43:45 +01:00

support

Merge branch 'serve_lfs_object' into 'master'

2015-12-08 14:19:52 +00:00

tasks/gitlab

Add lfs to backup specs.

2015-11-19 10:43:45 +01:00

views/help

Allow non-admin users to see version information

2015-09-23 17:18:15 -04:00

workers

fix specs

2015-11-30 16:12:31 +02:00

factories_spec.rb

Remove the invalid key factories

2015-04-11 17:12:10 -04:00

factories.rb

Improve personal snippet access workflow. Fixes #3258

2015-10-29 18:42:29 -02:00

rails_helper.rb

Started on the actual rspec 3 upgrade

2015-06-22 12:12:49 +02:00

spec_helper.rb

fix notification_service specs

2015-11-30 11:21:10 +02:00

teaspoon_env.rb

teaspoon install

2015-05-28 18:22:32 -04:00