Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658 ... # Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb		2016-03-21 23:22:21 +01:00
..
_admin.html.haml	Branded login page also in CE	2016-02-26 15:50:51 +01:00
_dashboard.html.haml	Updated other views with new project icon	2016-03-21 10:08:00 +00:00
_explore.html.haml	Updated other views with new project icon	2016-03-21 10:08:00 +00:00
_group.html.haml	Tweaks, refactoring, and specs	2016-03-20 21:04:07 +01:00
_group_settings.html.haml	Restore sidebar tooltips and fix logo tooltip location	2015-12-02 14:05:10 +01:00
_profile.html.haml	Let oauth/applications#index handle the profiles#applications route	2016-03-13 16:51:09 -04:00
_project.html.haml	Fix issues count on project view	2016-03-17 20:55:59 -03:00
_project_settings.html.haml	Add functionality to setup share of project with group via project settings	2016-03-11 18:37:46 +01:00