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

author	Riyad Preukschas <riyad@informatik.uni-bremen.de>
	Mon, 14 Jan 2013 23:52:25 +0000 (00:52 +0100)
committer	Riyad Preukschas <riyad@informatik.uni-bremen.de>
	Mon, 14 Jan 2013 23:52:25 +0000 (00:52 +0100)
commit	30227869482bbbdbfea153f2b45ef3bb9a9fd218
tree	aff64071116447092751770d2896998f62d1b44a	tree \| snapshot
parent	8ee5fce9d64b70d8981896457484fae622d142c9	commit \| diff
parent	aca0caa8cc1a6bd481f87dd810284e69d3747050	commit \| diff

Merge commit 'master' into discussions

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

24 files changed:

app/assets/stylesheets/common.scss	diff1 \|	diff2 \|	blob \| history
app/assets/stylesheets/sections/commits.scss	diff1 \|	diff2 \|	blob \| history
app/assets/stylesheets/sections/notes.scss	diff1 \|	diff2 \|	blob \| history
app/contexts/notes/load_context.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/mailers/notify.rb	diff1 \|	diff2 \|	blob \| history
app/models/concerns/issuable.rb	diff1 \|	diff2 \|	blob \| history
app/models/note.rb	diff1 \|	diff2 \|	blob \| history
app/observers/note_observer.rb	diff1 \|	diff2 \|	blob \| history
app/views/commit/show.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/commits/_text_diff.html.haml	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/merge_requests/diffs.js.haml	diff1 \|	diff2 \|	blob \| history
app/views/merge_requests/show.js.haml	diff1 \|	diff2 \|	blob \| history
app/views/notes/_note.html.haml	diff1 \|	diff2 \|	blob \| history
features/steps/project/project_merge_requests.rb	diff1 \|	diff2 \|	blob \| history
features/steps/shared/paths.rb	diff1 \|	diff2 \|	blob \| history
lib/gitlab/markdown.rb	diff1 \|	diff2 \|	blob \| history
spec/factories.rb	diff1 \|	diff2 \|	blob \| history
spec/lib/votes_spec.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/common.scss	diff1 \|	diff2 \|	blob \| history
app/assets/stylesheets/sections/commits.scss	diff1 \|	diff2 \|	blob \| history
app/assets/stylesheets/sections/notes.scss	diff1 \|	diff2 \|	blob \| history
app/contexts/notes/load_context.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/mailers/notify.rb	diff1 \|	diff2 \|	blob \| history
app/models/concerns/issuable.rb	diff1 \|	diff2 \|	blob \| history
app/models/note.rb	diff1 \|	diff2 \|	blob \| history
app/observers/note_observer.rb	diff1 \|	diff2 \|	blob \| history
app/views/commit/show.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/commits/_text_diff.html.haml	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/merge_requests/diffs.js.haml	diff1 \|	diff2 \|	blob \| history
app/views/merge_requests/show.js.haml	diff1 \|	diff2 \|	blob \| history
app/views/notes/_note.html.haml	diff1 \|	diff2 \|	blob \| history
features/steps/project/project_merge_requests.rb	diff1 \|	diff2 \|	blob \| history
features/steps/shared/paths.rb	diff1 \|	diff2 \|	blob \| history
lib/gitlab/markdown.rb	diff1 \|	diff2 \|	blob \| history
spec/factories.rb	diff1 \|	diff2 \|	blob \| history
spec/lib/votes_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/models/note_spec.rb	diff1 \|	diff2 \|	blob \| history