Files
gitlabhq/app/assets/javascripts/project_new.js.coffee
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

15 lines
389 B
CoffeeScript

class @ProjectNew
constructor: ->
$('.project-edit-container').on 'ajax:before', =>
$('.project-edit-container').hide()
$('.save-project-loader').show()
@toggleSettings()
toggleSettings: ->
checked = $("#project_merge_requests_enabled").prop("checked")
if checked
$('.merge-request-feature').show()
else
$('.merge-request-feature').hide()