Valery Sizov 3fcd75a911 Merge CE master into EE master ...

Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb

2014-11-13 17:05:12 +02:00

..

group_members

Upgrade to Font Awesome v4.2

2014-10-03 12:19:24 +02:00

ldap_group_links

Change naming of multi-LDAP to linked LDAP groups

2014-08-15 12:19:07 +02:00

milestones

Upgrade to Font Awesome v4.2

2014-10-03 12:19:24 +02:00

_filter.html.haml

Filter group milestones.

2014-06-30 09:44:30 +02:00

_new_group_member.html.haml

Merge branch 'ee-7-4' into 'master'

2014-10-03 12:29:35 +00:00

_projects.html.haml

Upgrade to Font Awesome v4.2

2014-10-03 12:19:24 +02:00

_settings_nav.html.haml

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

2014-10-03 16:18:40 +03:00

_shared_projects.html.haml

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

2014-06-17 10:53:44 +03:00

edit.html.haml

Merge CE master into EE master

2014-11-13 17:05:12 +02:00

issues.atom.builder

avatar upload on profile page

2013-10-09 09:05:09 +02:00

issues.html.haml

Upgrade to Font Awesome v4.2

2014-10-03 12:19:24 +02:00

members.html.haml

Merge CE master into EE master

2014-11-13 17:05:12 +02:00

merge_requests.html.haml

Upgrade to Font Awesome v4.2

2014-10-03 12:19:24 +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

Upgrade to Font Awesome v4.2

2014-10-03 12:19:24 +02:00

show.atom.builder

avatar upload on profile page

2013-10-09 09:05:09 +02:00

show.html.haml

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00