Robert Speicher 09bcce7d1f 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 18:34:55 +00:00

..

controllers

Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g

2015-09-15 22:40:35 +02:00

factories

Refactor ci_admin_event and fix features/ci/events_spec.rb

2015-09-15 20:56:20 +02:00

features

Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g

2015-09-15 22:40:35 +02: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

Fix: helpers/ci/runners_helper_spec.rb

2015-09-15 21:27:10 +02: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 18:34:55 +00:00

mailers

fix specs. Stage 6

2015-09-15 16:29:36 +03:00

models

Make rubocop happy

2015-09-16 17:30:15 +02:00

requests

Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g

2015-09-16 13:34:58 +02:00

routing

Move partial to right place and fix tests.

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

services

Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g

2015-09-15 22:40:35 +02:00

support

Fix backup tests

2015-09-16 00:06:41 +02:00

tasks/gitlab

Fix backup tests

2015-09-16 00:06:41 +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

Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g

2015-09-11 16:32:11 +02:00

teaspoon_env.rb

teaspoon install

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