3022786948
Conflicts: app/assets/stylesheets/sections/notes.scss app/contexts/notes/load_context.rb app/models/project.rb app/observers/note_observer.rb app/roles/votes.rb app/views/commit/show.html.haml app/views/merge_requests/_show.html.haml app/views/merge_requests/diffs.js.haml app/views/merge_requests/show.js.haml app/views/notes/_note.html.haml features/steps/project/project_merge_requests.rb spec/models/note_spec.rb |
||
---|---|---|
.. | ||
create_project.rb | ||
project.rb | ||
project_active_tab.rb | ||
project_browse_branches.rb | ||
project_browse_commits.rb | ||
project_browse_files.rb | ||
project_browse_git_repo.rb | ||
project_browse_tags.rb | ||
project_comment_commit.rb | ||
project_hooks.rb | ||
project_issues.rb | ||
project_labels.rb | ||
project_merge_requests.rb | ||
project_milestones.rb | ||
project_network_graph.rb | ||
project_services.rb | ||
project_team_management.rb | ||
project_wall.rb | ||
project_wiki.rb |