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

Conflicts:
	app/assets/javascripts/dispatcher.js.coffee
	features/admin/settings.feature
	features/steps/admin/settings.rb
	features/steps/user.rb
	features/user.feature
	lib/gitlab/git_access.rb

2015-03-25 09:16:09 -07:00

..

admin

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

2015-03-25 09:16:09 -07:00

audit_events

Fix EE UI for new layout

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

dashboard

Fix project name overflow on dashboard

2015-03-18 21:05:39 -07:00

devise

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

2015-03-25 09:16:09 -07:00

doorkeeper

Refactor buttons

2015-03-14 00:29:32 -07:00

errors

Improve error page layout

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

events

List new commits for newly pushed branch in activity view.

2015-03-18 14:28:50 +01:00

explore

Add project filter by visibility and tag to explore page

2015-03-10 15:59:14 -07:00

groups

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

2015-03-21 20:41:10 -07:00

help

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

2015-03-25 09:16:09 -07:00

import

Style improvements to import page

2015-03-12 10:04:09 -07: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

2015-03-25 09:16:09 -07:00

ldap_group_links

Improve UI for sharing project with groups and LDAP groups pages

2015-03-18 19:49:24 -07:00

notify

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

2015-03-25 09:16:09 -07:00

profiles

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

2015-03-25 09:16:09 -07:00

projects

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

2015-03-25 09:16:09 -07:00

search

Refactor buttons

2015-03-14 00:29:32 -07:00

shared

Improve group rename warning

2015-03-18 20:16:36 -07:00

snippets

Update views to single form of address. Change "my" to "your"

2015-03-22 20:10:12 -07:00

unsubscribes

Use base 64 encoding for email params.

2014-08-22 10:51:33 +02:00

users

Merge branch 'userpage-activity-scroll'

2015-03-23 09:45:40 -07:00

votes

Fix votes inline rendering

2015-03-20 15:34:29 -07:00