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

Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb

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

..

group_members

Upgrade to Font Awesome v4.2

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

ldap_group_links

Fix EE UI for new layout

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

milestones

Restyle and refactor milestones filter

2015-01-06 12:32:04 -08: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

Improve project icons for dashboard

2015-02-02 15:47:51 -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

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 branch 'master' into ee-from-ce

2014-12-26 15:05:43 +02: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 CE master into EE master

2014-11-13 17:05:12 +02: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

Left-side navigation for group layout

2014-12-16 16:58:15 +02: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 ce-into-ee

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