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

author	Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
	Tue, 30 Jul 2013 10:35:33 +0000 (13:35 +0300)
committer	Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
	Tue, 30 Jul 2013 10:35:33 +0000 (13:35 +0300)
commit	0d715bcd812ca6c99884e117f28a400669aa8e57
tree	5690fa43c790af40c51441425b9d8be068d4139d	tree \| snapshot
parent	4f07a6a99cab8f8ae3ad0a786a6cc9a837955c08	commit \| diff
parent	4d373005968b8269a8d2fe56b7776820396127a4	commit \| diff

Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork

Conflicts:
app/views/projects/commit/show.html.haml
app/views/projects/compare/show.html.haml
app/views/projects/merge_requests/branch_from.js.haml

14 files changed:

app/assets/stylesheets/common.scss	diff1 \|	diff2 \|	blob \| history
app/helpers/commits_helper.rb	diff1 \|	diff2 \|	blob \| history
app/models/project.rb	diff1 \|	diff2 \|	blob \| history
app/observers/activity_observer.rb	diff1 \|	diff2 \|	blob \| history
app/services/notification_service.rb	diff1 \|	diff2 \|	blob \| history
app/views/projects/commit/show.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/projects/commits/_diffs.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/projects/compare/show.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/projects/merge_requests/branch_from.js.haml	diff1 \|	diff2 \|	blob \| history
config/routes.rb	diff1 \|	diff2 \|	blob \| history
features/steps/shared/paths.rb	diff1 \|	diff2 \|	blob \| history
lib/gitlab/satellite/satellite.rb	diff1 \|	diff2 \|	blob \| history
spec/helpers/gitlab_markdown_helper_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/models/project_spec.rb	diff1 \|	diff2 \|	blob \| history

RSS Atom

About OSDN

Find Software

Develop Software

Help

app/assets/stylesheets/common.scss	diff1 \|	diff2 \|	blob \| history
app/helpers/commits_helper.rb	diff1 \|	diff2 \|	blob \| history
app/models/project.rb	diff1 \|	diff2 \|	blob \| history
app/observers/activity_observer.rb	diff1 \|	diff2 \|	blob \| history
app/services/notification_service.rb	diff1 \|	diff2 \|	blob \| history
app/views/projects/commit/show.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/projects/commits/_diffs.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/projects/compare/show.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/projects/merge_requests/branch_from.js.haml	diff1 \|	diff2 \|	blob \| history
config/routes.rb	diff1 \|	diff2 \|	blob \| history
features/steps/shared/paths.rb	diff1 \|	diff2 \|	blob \| history
lib/gitlab/satellite/satellite.rb	diff1 \|	diff2 \|	blob \| history
spec/helpers/gitlab_markdown_helper_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/models/project_spec.rb	diff1 \|	diff2 \|	blob \| history