Robert Speicher b9fca47854 Merge branch 'user-ldap-email' into 'master' ...

Allow LDAP users to change their email if it was not set by the LDAP
server

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3054

See merge request !2502

2016-01-19 19:15:23 +00:00

..

benchmarks

Move Markdown/reference logic from Gitlab::Markdown to Banzai

2015-12-15 15:51:16 +01:00

controllers

Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master'

2016-01-14 14:38:55 +00:00

factories

Merge branch 'master' into ci/api-triggers

2016-01-14 21:58:17 +01:00

features

Add tests for the wiki pipeline

2016-01-14 12:09:31 -02:00

finders

remove public field from namespace and refactoring

2016-01-04 16:00:29 +02:00

fixtures

Update build artifacts metadata fixture to 0.0.2

2016-01-18 19:58:16 +01:00

helpers

Use the WikiPipeline when rendering the wiki markdown content

2016-01-14 12:09:31 -02:00

initializers

Ensure Gravatar host looks like an actual host

2016-01-18 14:58:16 +01:00

javascripts

reverting more MR ajax files, will appear in different commit

2016-01-12 14:55:54 -05:00

lib

Allow LDAP users to change their email if it was not set by the LDAP server

2016-01-19 16:25:38 +01:00

mailers

Minor improvements, unsubscribe from email footer

2016-01-09 19:32:03 +01:00

models

Use a more sensible message for the AbuseReport uniqueness validation

2016-01-16 16:50:43 -05:00

requests

Add specs. Adjust filter.

2016-01-19 09:57:00 -05:00

routing

Merge branch 'issue_3076' into 'master'

2016-01-08 15:52:05 +00:00

services

Fix creator should be added as a master of the project on creation

2016-01-19 13:24:42 -02:00

support

Let the CI runner know about builds that this build depends on

2016-01-14 19:45:55 +01: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

Write to InfluxDB directly via UDP

2015-12-29 14:53:45 +01:00

factories_spec.rb

Remove the invalid key factories

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

factories.rb

Unsubscribe from thread through link in email footer

2016-01-09 12:41:22 +01: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