Dmitriy Zaporozhets b03b69e23e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1 ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/images/brand_logo.png
	app/assets/stylesheets/sections/login.scss
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/appearances_helper.rb
	app/views/layouts/devise.html.haml

2014-07-16 12:39:45 +03:00

..

api

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

2014-07-10 23:43:42 +03:00

assets

move assets from lib directory to vendor

2012-05-29 17:56:48 +05:00

backup

Backup wiki repo even if the main repo is empty

2014-05-08 22:50:48 +02:00

gitlab

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

2014-07-16 12:39:45 +03:00

redcarpet/render

Add feature spec.

2014-05-26 20:43:58 +02:00

support

Move gitlab-ssl nginx config from gitlab-recipes

2014-06-05 16:54:50 +03:00

tasks

Remove duplicated calls.

2014-07-07 14:19:32 +02:00

email_validator.rb

Test for the apostrophe in the email

2014-06-11 13:36:30 +02:00

event_filter.rb

Constants in Events looks good now

2013-02-13 15:48:16 +04:00

extracts_path.rb

Improve code according to new gitlab_git

2014-02-04 14:46:15 +02:00

file_size_validator.rb

Fully embrace Ruby 1.9 hash syntax

2012-08-10 18:25:15 -04:00

static_model.rb

Fixed styles, ProjectHook specs etc

2013-01-05 00:35:38 +02:00