Jan-Willem van der Meer 9b678226a7 Merge branch 'feature-multi-ldap-servers-merge-master' into feature-multi-ldap-servers-group-sync ...

Conflicts:
	db/schema.rb
	lib/api/ldap.rb

2014-10-15 14:50:24 +02:00

..

admin

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

dashboard

Upgrade to Font Awesome v4.2

2014-10-03 12:19:24 +02:00

devise

Use Hash syntax for LDAP server declaration

2014-10-14 13:13:59 +02:00

errors

Improve error page layout

2014-06-24 15:57:38 +03:00

events

Use short_id instead of [0..N] for short version of commit sha

2014-10-10 15:39:48 +03:00

explore

Upgrade to Font Awesome v4.2

2014-10-03 12:19:24 +02:00

groups

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

help

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

kaminari/gitlab

Migrate forms and inputs pt1

2013-12-31 02:50:36 +02:00

layouts

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ee-7-4

2014-10-03 16:18:40 +03:00

ldap_group_links

Adapt frontend to LdapGroupLink with provider

2014-10-10 21:50:54 +02:00

notify

Merge remote-tracking branch 'origin/master' into ee-7-4

2014-10-02 13:24:59 +03:00

profiles

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

projects

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

search

Use short_id instead of [0..N] for short version of commit sha

2014-10-10 15:39:48 +03:00

shared

Snippets: public/internal/private

2014-10-09 17:09:53 +03:00

snippets

Snippets: public/internal/private

2014-10-09 17:09:53 +03:00

unsubscribes

Use base 64 encoding for email params.

2014-08-22 10:51:33 +02:00

users

Upgrade to Font Awesome v4.2

2014-10-03 12:19:24 +02:00

votes

Fix votes block. twbs3 progress bars

2014-01-01 22:59:06 +02:00