Robert SpeicherandRobert Speicher 47711f38a4 Merge branch 'ldap-attributes' into 'master' ...

Allow configuration of LDAP attributes GitLab will use for the new user account.

Fixes #2412.

See merge request !1261

2015-09-16 16:02:29 -04:00

..

controllers

Merge branch 'public_profiles' into 'master'

2015-09-14 15:28:42 +00:00

factories

Re-annotate models

2015-09-06 07:48:48 -07:00

features

Merge branch 'public_profiles' into 'master'

2015-09-14 15:28:42 +00:00

finders

Add Group#add_* convenience methods

2015-08-07 00:20:02 -04:00

fixtures

No HTML-only email please

2015-08-21 16:09:55 -07:00

helpers

Remove invalid spec for GitlabMarkdownHelper

2015-08-31 16:22:14 -04:00

javascripts

Add specs for syntax_highlight JS

2015-09-10 15:38:24 -04:00

lib

Merge branch 'ldap-attributes' into 'master'

2015-09-16 16:02:29 -04:00

mailers

Merge branch 'master' into rubocop-for-tests

2015-06-23 10:44:03 +02:00

models

Re-annotate models

2015-09-06 07:48:48 -07:00

requests/api

Fix broken sort in merge request API

2015-09-15 22:55:22 -07:00

routing

Move partial to right place and fix tests.

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

services

Import forked repositories asynchronously to prevent large repositories from timing out

2015-09-11 00:34:04 -07:00

support

Fix emoji URLs in Markdown when relative_url_root is used

2015-09-06 09:46:10 -07:00

tasks/gitlab

Use a separate backup test directory and nuke its contents

2015-07-24 18:54:06 +02:00

workers

Import forked repositories asynchronously to prevent large repositories from timing out

2015-09-11 00:34:04 -07:00

factories_spec.rb

Remove the invalid key factories

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

factories.rb

Only publish ssh key-type and key

2015-08-04 14:33:18 +02:00

rails_helper.rb

Started on the actual rspec 3 upgrade

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

spec_helper.rb

Fix emoji URLs in Markdown when relative_url_root is used

2015-09-06 09:46:10 -07:00

teaspoon_env.rb

teaspoon install

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