6c0994a3b3
Conflicts: app/controllers/omniauth_callbacks_controller.rb |
||
|---|---|---|
| .. | ||
| concerns | ||
| hooks | ||
| members | ||
| network | ||
| project_services | ||
| .gitkeep | ||
| ability.rb | ||
| broadcast_message.rb | ||
| commit.rb | ||
| deploy_key.rb | ||
| deploy_keys_project.rb | ||
| diff_line.rb | ||
| email.rb | ||
| event.rb | ||
| forked_project_link.rb | ||
| group.rb | ||
| group_milestone.rb | ||
| issue.rb | ||
| key.rb | ||
| label.rb | ||
| label_link.rb | ||
| member.rb | ||
| merge_request.rb | ||
| merge_request_diff.rb | ||
| milestone.rb | ||
| namespace.rb | ||
| note.rb | ||
| notification.rb | ||
| personal_snippet.rb | ||
| project.rb | ||
| project_snippet.rb | ||
| project_team.rb | ||
| project_wiki.rb | ||
| protected_branch.rb | ||
| repository.rb | ||
| service.rb | ||
| snippet.rb | ||
| tree.rb | ||
| user.rb | ||
| users_star_project.rb | ||
| wiki_page.rb | ||