git.sourceforge.jp Git - wvm/gitlab.git/commit

author	Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
	Thu, 23 Jan 2014 12:38:23 +0000 (14:38 +0200)
committer	Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
	Thu, 23 Jan 2014 12:38:23 +0000 (14:38 +0200)
commit	28e13634dc9318dbd093a4561ee8ea16e1d71460
tree	0a14694c45a8328fc9dbf868f310c5ba3a71184f	tree \| snapshot
parent	68590fddd860c5d840d8f04314ed11f0d02ddd44	commit \| diff
parent	573f1f4ade80cc3b66723ad12594467e881b4510	commit \| diff

Merge branch 'improve/mr_diff'

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
features/steps/project/project_fork.rb
features/steps/project/project_forked_merge_requests.rb
features/steps/project/project_issue_tracker.rb
features/steps/project/project_markdown_render.rb
features/steps/shared/project.rb

12 files changed:

app/controllers/projects/merge_requests_controller.rb	diff1 \|	diff2 \|	blob \| history
features/steps/project/project_fork.rb	diff1 \|	diff2 \|	blob \| history
features/steps/project/project_forked_merge_requests.rb	diff1 \|	diff2 \|	blob \| history
features/steps/project/project_issue_tracker.rb	diff1 \|	diff2 \|	blob \| history
features/steps/project/project_markdown_render.rb	diff1 \|	diff2 \|	blob \| history
features/steps/project/project_merge_requests.rb	diff1 \|	diff2 \|	blob \| history
features/steps/project/project_team_management.rb	diff1 \|	diff2 \|	blob \| history
features/steps/project/redirects.rb	diff1 \|	diff2 \|	blob \| history
features/steps/public/projects_feature.rb	diff1 \|	diff2 \|	blob \| history
features/steps/shared/project.rb	diff1 \|	diff2 \|	blob \| history
lib/api/merge_requests.rb	diff1 \|	diff2 \|	blob \| history
spec/workers/post_receive_spec.rb	diff1 \|	diff2 \|	blob \| history

RSS Atom

About OSDN

Find Software

Develop Software

Help

app/controllers/projects/merge_requests_controller.rb	diff1 \|	diff2 \|	blob \| history
features/steps/project/project_fork.rb	diff1 \|	diff2 \|	blob \| history
features/steps/project/project_forked_merge_requests.rb	diff1 \|	diff2 \|	blob \| history
features/steps/project/project_issue_tracker.rb	diff1 \|	diff2 \|	blob \| history
features/steps/project/project_markdown_render.rb	diff1 \|	diff2 \|	blob \| history
features/steps/project/project_merge_requests.rb	diff1 \|	diff2 \|	blob \| history
features/steps/project/project_team_management.rb	diff1 \|	diff2 \|	blob \| history
features/steps/project/redirects.rb	diff1 \|	diff2 \|	blob \| history
features/steps/public/projects_feature.rb	diff1 \|	diff2 \|	blob \| history
features/steps/shared/project.rb	diff1 \|	diff2 \|	blob \| history
lib/api/merge_requests.rb	diff1 \|	diff2 \|	blob \| history
spec/workers/post_receive_spec.rb	diff1 \|	diff2 \|	blob \| history