Dmitriy Zaporozhets 3a9682a3d7 Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce ...

Conflicts:
	VERSION
	app/helpers/selects_helper.rb
	app/models/project.rb
	app/views/devise/sessions/new.html.haml
	app/views/groups/_settings_nav.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/profiles/keys/index.html.haml
	app/views/profiles/keys/show.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	config/routes.rb
	db/schema.rb
	doc/api/projects.md
	features/steps/shared/paths.rb

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

..

_links.erb

Use gitlab_config intead of Gitlab.config.gitlab in views

2013-10-17 22:11:41 +03:00

_oauth_box.html.haml

Redesign signin/singup pages

2015-01-07 17:07:36 -08:00

_sign_in_link.html.haml

Improve signin/signup/reset pages UI

2014-07-11 16:05:57 +03:00

_signin_box.html.haml

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

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

_signup_box.html.haml

Redesign signin/singup pages

2015-01-07 17:07:36 -08:00