• Dmitriy Zaporozhets's avatar
    Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee · b165b097
    Dmitriy Zaporozhets authored
    Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
    
    Conflicts:
    	LICENSE
    	VERSION
    	app/controllers/omniauth_callbacks_controller.rb
    	app/helpers/application_helper.rb
    	app/helpers/merge_requests_helper.rb
    	app/models/group.rb
    	app/models/project.rb
    	app/models/project_team.rb
    	app/views/admin/groups/edit.html.haml
    	app/views/groups/_projects.html.haml
    	app/views/groups/edit.html.haml
    	db/schema.rb
    	doc/install/installation.md
    	doc/integration/README.md
    	lib/gitlab/git_access.rb
    	lib/gitlab/markdown.rb
    	spec/helpers/merge_requests_helper.rb
    	spec/models/merge_request_spec.rb
    b165b097
group_links_controller.rb 681 Bytes