Marin Jankovski 95ef8f9756 Merge remote-tracking branch 'ce/master' ...

Conflicts:
	VERSION
	doc/install/installation.md
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	lib/gitlab/markdown.rb
	spec/lib/gitlab/ldap/ldap_access_spec.rb

2014-05-21 13:10:37 +02:00

..

_filter.html.haml

Refactor scss

2014-02-20 13:51:22 +02:00

_new_group_member.html.haml

Adopt Group#members page for large groups (> 100 users)

2014-02-13 11:00:44 +02:00

_projects.html.haml

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7

2014-03-18 11:15:01 +02:00

_shared_projects.html.haml

Show shared projects on Group#show in admin area

2014-03-18 12:29:35 +02:00

edit.html.haml

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

2014-04-10 13:34:56 +03:00

issues.atom.builder

avatar upload on profile page

2013-10-09 09:05:09 +02:00

issues.html.haml

Allow access to groups with public projects.

2014-02-20 09:26:38 -06:00

members.html.haml

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

2014-04-10 13:34:56 +03:00

merge_requests.html.haml

Allow access to groups with public projects.

2014-02-20 09:26:38 -06:00

new.html.haml

Fix new group form

2014-01-08 18:39:03 +02:00

show.atom.builder

avatar upload on profile page

2013-10-09 09:05:09 +02:00

show.html.haml

Merge remote-tracking branch 'ce/master'

2014-05-21 13:10:37 +02:00