Dmitriy Zaporozhets 29611a245d Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ...

Conflicts:
	GITLAB_SHELL_VERSION
	VERSION
	lib/api/entities.rb
	lib/api/groups.rb

2015-02-18 17:44:29 -08:00

..

admin

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 20:30:21 -08:00

audit_events

Fix EE UI for new layout

2014-12-26 15:16:44 +02:00

dashboard

DB performance improvements to GitLab

2015-02-18 00:16:42 -08:00

devise

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

doorkeeper

Rework oauth2 feature

2014-12-25 18:35:04 +02:00

errors

Improve error page layout

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

events

Make sure twitter widgets are loaded when rendered through turbolinks.

2015-02-14 13:32:05 +01:00

explore

Show contributed projects on user page and stars for it

2015-02-17 22:40:00 -08:00

groups

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-02-18 17:44:29 -08:00

help

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

import

Add "Import all projects" button to GitHub and GitLab import pages.

2015-02-07 23:15:04 +01:00

kaminari/gitlab

Migrate forms and inputs pt1

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

layouts

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

ldap_group_links

Prevent 500 error on ldap group links page

2014-12-08 15:58:01 +02:00

notify

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-01-21 17:05:31 -08:00

profiles

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 20:30:21 -08:00

projects

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-02-18 17:44:29 -08:00

search

Replace highlight.js with rouge-fork rugments

2015-01-15 13:41:11 +01:00

shared

Fix code rendering for snippets

2015-02-17 00:16:28 -08: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

Get contributed projects only if push event exists

2015-02-18 14:20:26 -08:00

votes

Fix votes block. twbs3 progress bars

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