gitlab-org--gitlab-foss/app/views/projects/commits/_commit.html.haml

32 lines
977 B
Text
Raw Normal View History

%li.commit.js-toggle-container
.commit-row-title
Merge Request on forked projects The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
2013-04-25 10:15:33 -04:00
= link_to commit.short_id(8), project_commit_path(project, commit), class: "commit_short_id"
 
%span.str-truncated
= link_to_gfm commit.title, project_commit_path(project, commit.id), class: "commit-row-message"
2014-02-25 08:54:30 -05:00
- if commit.description?
%a.text-expander.js-toggle-button ...
2014-02-25 08:54:30 -05:00
2014-07-08 11:28:02 -04:00
= link_to_browse_code(project, commit)
2013-09-10 03:17:15 -04:00
.notes_count
- if @note_counts
- note_count = @note_counts.fetch(commit.id, 0)
- else
- notes = project.notes.for_commit_id(commit.id)
- note_count = notes.count
- if note_count > 0
%span.label.label-gray
%i.icon-comment= note_count
2013-09-10 03:17:15 -04:00
2014-02-25 08:54:30 -05:00
- if commit.description?
.commit-row-description.js-toggle-content
%pre
= commit.description
2014-02-25 08:54:30 -05:00
2013-09-10 03:17:15 -04:00
.commit-row-info
= commit_author_link(commit, avatar: true, size: 16)
.committed_ago
#{time_ago_with_tooltip(commit.committed_date)}