gitlabhq

mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00

Files

T

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

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

Conflicts:
	VERSION
	app/assets/javascripts/project_new.js.coffee
	app/helpers/appearances_helper.rb
	app/helpers/application_helper.rb
	app/helpers/groups_helper.rb
	app/helpers/oauth_helper.rb
	app/models/user.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/layouts/nav/_group.html.haml
	app/views/layouts/nav/_project_settings.html.haml
	app/views/profiles/accounts/show.html.haml
	doc/integration/README.md
	features/steps/project/merge_requests.rb
	features/support/env.rb
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/oauth_helper_spec.rb
	spec/lib/gitlab/ldap/access_spec.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/project_team_spec.rb
	spec/routing/admin_routing_spec.rb
	spec/services/git_push_service_spec.rb
	spec/services/test_hook_service_spec.rb

2015-07-02 17:07:02 +02:00

uploads

Make sure important directories exist in git

2014-03-30 22:45:28 -04:00

404.html

Improve text on error pages.

2015-05-13 09:41:55 +02:00

422.html

Fix 422 error page.

2015-05-13 09:41:56 +02:00

500.html

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