Jacob Vosmaer 90ce0be420 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups ...

Conflicts:
	app/models/group.rb
	app/views/groups/members.html.haml
	db/schema.rb

2014-08-29 14:43:20 +02:00

..

admin

Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups

2014-08-29 14:43:20 +02:00

dashboard

Replace project labels with tags to prevent name conflict with GitLab labels

2014-07-29 18:23:18 +03:00

devise

Restore blue color for sign-in button

2014-07-14 10:02:46 +03:00

errors

Improve error page layout

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

events

Merge branch 'bugfix/305/dashboard_feed_summaries' into 'master'

2014-07-02 07:00:16 +00:00

explore

Restyle explore projects to fix #7548

2014-08-20 02:38:52 +02:00

groups

Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups

2014-08-29 14:43:20 +02:00

help

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2014-07-10 23:43:42 +03:00

kaminari/gitlab

Migrate forms and inputs pt1

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

layouts

Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166

2014-08-15 10:25:23 +02:00

ldap_group_links

Remove traces from ldab_cn and ldap_access

2014-08-15 12:33:05 +02:00

notify

Add the email templates

2014-08-26 17:17:04 +02:00

profiles

Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166

2014-08-15 10:25:23 +02:00

projects

Move to partial.

2014-08-26 12:44:10 +02:00

search

Fix project search showing always no results if no merge requests matches

2014-08-11 12:48:00 +03:00

shared

Move calls to Gitlab::MarkdownHelper to application_helper

2014-08-11 11:59:36 +02:00

snippets

Refactor snippets views

2014-06-14 12:36:46 +03:00

unsubscribes

Use base 64 encoding for email params.

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

users

Add trailing newline to all text files.

2014-06-21 11:20:22 +02:00

users_groups

Improve alignment of labels in .well-list items

2014-03-28 13:22:43 +01:00

votes

Fix votes block. twbs3 progress bars

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