f438bd415f
Conflicts: app/controllers/admin/teams/projects_controller.rb app/views/team_members/_team_member.html.haml app/views/teams/members/_member.html.haml |
||
---|---|---|
.. | ||
contexts | ||
controllers | ||
factories | ||
features | ||
helpers | ||
javascripts | ||
lib | ||
mailers | ||
models | ||
observers | ||
requests/api | ||
routing | ||
services | ||
support | ||
tasks/gitlab | ||
workers | ||
factories.rb | ||
factories_spec.rb | ||
seed_project.tar.gz | ||
spec_helper.rb |