Valery Sizov 45ec0d255d Merge remote-tracking branch 'ee/master' into ce_non_conflict ...

Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb

2015-02-05 22:01:05 -08:00

..

admin

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

2015-02-04 18:19:22 -08:00

audit_events

Fix EE UI for new layout

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

dashboard

Improve project icons for dashboard

2015-02-02 15:47:51 -08:00

devise

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

2015-01-21 17:05:31 -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

Add a commit calendar to the user profile

2015-01-29 01:25:26 +01:00

explore

Create helper for sort drowdown option names

2014-12-04 12:10:38 +02:00

groups

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

2015-02-04 18:19:22 -08:00

help

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

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

import

gitlab.com importer: refactorig

2015-02-05 17:03:43 -08: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 ce-into-ee

2015-02-04 18:19:22 -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 branch 'master' of dev.gitlab.org:gitlab/gitlabhq

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

projects

Merge remote-tracking branch 'ee/master' into ce_non_conflict

2015-02-05 22:01:05 -08:00

search

Replace highlight.js with rouge-fork rugments

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

shared

Fixes the sort dropdown goind outside of the screen

2015-01-17 16:39:29 +01: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

Improve project icons for dashboard

2015-02-02 15:47:51 -08:00

votes

Fix votes block. twbs3 progress bars

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