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

Conflicts:
	Gemfile.lock
	app/controllers/uploads_controller.rb
	app/models/application_setting.rb
	app/models/project_services/issue_tracker_service.rb
	app/views/projects/services/_form.html.haml
	db/schema.rb
	doc/integration/README.md
	features/steps/groups.rb

2015-03-11 18:41:41 -07:00

..

group_members

Blocking user does not remove him/her from project/groups but show blocked label

2015-03-09 19:02:30 -07:00

ldap_group_links

Fix EE UI for new layout

2014-12-26 15:16:44 +02:00

milestones

Render milestone progress with one helper method

2015-03-09 15:20:32 -07:00

_new_group_member.html.haml

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

2015-02-04 18:19:22 -08:00

_projects.html.haml

Fix project create link on group page

2015-03-04 18:26:49 -08:00

_settings_nav.html.haml

Merge remote-tracking branch 'ce/master' into merge_ce

2015-01-29 11:34:43 -08:00

_shared_projects.html.haml

Update path helpers and routes for Rails 4.1.9

2015-02-27 18:21:15 -07:00

edit.html.haml

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

issues.atom.builder

DRY and refactor atom code

2014-12-04 22:14:20 +02:00

issues.html.haml

Refactor issues and merge requests lists

2014-12-23 18:49:39 +02:00

members.html.haml

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

2015-03-03 13:33:40 -08:00

merge_requests.html.haml

Refactor issues and merge requests lists

2014-12-23 18:49:39 +02:00

new.html.haml

Merge pull request #8113 from cirosantilli/factor-group-forms

2014-10-21 11:39:41 +03:00

projects.html.haml

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

2015-03-11 18:41:41 -07:00

show.atom.builder

Fix xmlns:media namespacing for atom feeds

2014-12-31 15:05:38 -05:00

show.html.haml

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre

2015-02-23 23:56:59 -08:00