Valery Sizov badfdf6634 Merge remote-tracking branch 'ee/master' into ce-non-conflict ...

Conflicts:
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/projects_helper.rb
	db/schema.rb

2015-01-13 18:22:38 -08:00

..

admin

fix preview appearance

2015-01-13 11:32:14 -08:00

audit_events

Fix EE UI for new layout

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

dashboard

Restyle and refactor dashboard projects page filtering

2015-01-06 13:09:56 -08:00

devise

Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2015-01-08 20:37:35 -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

Use short_id instead of [0..N] for short version of commit sha

2014-10-10 15:39:48 +03:00

explore

Create helper for sort drowdown option names

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

github_imports

Improve github import page UI

2015-01-13 11:44:17 -08:00

groups

Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2015-01-08 20:37:35 -08:00

help

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

kaminari/gitlab

Migrate forms and inputs pt1

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

layouts

Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2015-01-08 20:37:35 -08:00

ldap_group_links

Prevent 500 error on ldap group links page

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

notify

Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2015-01-08 20:37:35 -08:00

profiles

Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2015-01-08 20:37:35 -08:00

projects

Merge remote-tracking branch 'ee/master' into ce-non-conflict

2015-01-13 18:22:38 -08:00

search

Respect current controller scope when using search from project area

2014-12-02 22:38:45 +02:00

shared

Restyle and refactor milestones filter

2015-01-06 12:32:04 -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

Fix xmlns:media namespacing for atom feeds

2014-12-31 15:05:38 -05:00

votes

Fix votes block. twbs3 progress bars

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