git.osdn.net Git - wvm/gitlab.git/commit

author	Riyad Preukschas <riyad@informatik.uni-bremen.de>
	Sun, 23 Dec 2012 00:03:57 +0000 (01:03 +0100)
committer	Riyad Preukschas <riyad@informatik.uni-bremen.de>
	Sun, 23 Dec 2012 00:03:57 +0000 (01:03 +0100)
commit	db2c15369c365340aeaf4e431e8838714b40396b
tree	26ca045a337132370b67cc8f2ed4010e3087dfa5	tree \| snapshot
parent	b47173da6a0fea0982d009f91e2c4d042f9b5c37	commit \| diff
parent	68c43d59f09a66cca0da1b9a50c11421d52eac9a	commit \| diff

Merge branch 'master' into discussions

Conflicts:
app/assets/stylesheets/main.scss
app/models/project.rb
app/views/notes/_common_form.html.haml
app/views/notes/_per_line_form.html.haml
lib/gitlab/markdown.rb
spec/models/note_spec.rb

16 files changed:

app/assets/stylesheets/application.scss	\|	diff2 \|	blob \| history
app/assets/stylesheets/common.scss	diff1 \|	diff2 \|	blob \| history
app/assets/stylesheets/sections/commits.scss	diff1 \|	diff2 \|	blob \| history
app/controllers/issues_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/merge_requests_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/projects_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/snippets_controller.rb	diff1 \|	diff2 \|	blob \| history
app/models/note.rb	diff1 \|	diff2 \|	blob \| history
app/models/project.rb	diff1 \|	diff2 \|	blob \| history
app/views/issues/show.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/merge_requests/_show.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/notes/_form.html.haml	diff1 \|	\|	blob \| history
app/views/snippets/show.html.haml	diff1 \|	diff2 \|	blob \| history
lib/gitlab/markdown.rb	diff1 \|	diff2 \|	blob \| history
spec/factories.rb	diff1 \|	diff2 \|	blob \| history
spec/models/note_spec.rb	diff1 \|	diff2 \|	blob \| history

RSS Atom

About OSDN

Find Software

Develop Software

Help

app/assets/stylesheets/application.scss	\|	diff2 \|	blob \| history
app/assets/stylesheets/common.scss	diff1 \|	diff2 \|	blob \| history
app/assets/stylesheets/sections/commits.scss	diff1 \|	diff2 \|	blob \| history
app/controllers/issues_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/merge_requests_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/projects_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/snippets_controller.rb	diff1 \|	diff2 \|	blob \| history
app/models/note.rb	diff1 \|	diff2 \|	blob \| history
app/models/project.rb	diff1 \|	diff2 \|	blob \| history
app/views/issues/show.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/merge_requests/_show.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/notes/_form.html.haml	diff1 \|	\|	blob \| history
app/views/snippets/show.html.haml	diff1 \|	diff2 \|	blob \| history
lib/gitlab/markdown.rb	diff1 \|	diff2 \|	blob \| history
spec/factories.rb	diff1 \|	diff2 \|	blob \| history
spec/models/note_spec.rb	diff1 \|	diff2 \|	blob \| history