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

..

admin

Merge remote-tracking branch 'ce/master'

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

dashboard

Show link to public projects for new users.

2014-03-17 13:02:04 +01:00

devise

Merge branch 'master' into login_page

2014-04-07 20:13:37 +02:00

errors

Replace page_title with page-title. Correct margin for some blocks/layouts

2013-07-13 08:45:48 +03:00

events

Temporary fix for #4305: Cant preview attached png images on notes; attachment.secure_url returns an url which is accessible

2014-01-14 12:06:53 -03:00

groups

Merge remote-tracking branch 'ce/master'

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

help

Merge remote-tracking branch 'origin/master' into 6-8-ce-to-ee

2014-04-22 11:58:11 +02:00

kaminari/gitlab

Migrate forms and inputs pt1

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

layouts

Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ce-6-9

2014-05-12 12:39:51 +03:00

notify

Merge branch 'fix_merge_request_emails' into 'master'

2014-05-08 18:36:32 +00:00

profiles

Merge branch 'improve-oauth'

2014-04-07 17:15:31 +03:00

projects

Merge remote-tracking branch 'ce/master'

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

public/projects

Refactor scss

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

search

Add bottom margin to nav-tabs

2014-02-15 13:41:48 +02:00

shared

Merge pull request #6778 from dblessing/feature/mr_labels

2014-05-13 14:43:46 +03:00

snippets

Refactor scss

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

users

Allow access to groups with public projects.

2014-02-20 09:26:38 -06: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