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

author	Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
	Tue, 4 Jun 2013 15:36:22 +0000 (18:36 +0300)
committer	Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
	Tue, 4 Jun 2013 15:36:22 +0000 (18:36 +0300)
commit	bcc4e4dc7ed0740e92a61fc82c3c669f8f2d8d30
tree	1df3e2d68cd524af4dce107b2e4227778bb3945d	tree \| snapshot
parent	211e435ade337c968fab11c52427c172adcec99a	commit \| diff
parent	e0af7cefb4c92b474d14116b40927d70c13e78cc	commit \| diff

Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist

Conflicts:
Gemfile.lock
app/models/ability.rb
app/models/project.rb
app/views/snippets/_form.html.haml
db/schema.rb
features/steps/shared/paths.rb
spec/factories.rb
spec/models/project_spec.rb

18 files changed:

app/models/ability.rb	diff1 \|	diff2 \|	blob \| history
app/models/event.rb	diff1 \|	diff2 \|	blob \| history
app/models/note.rb	diff1 \|	diff2 \|	blob \| history
app/models/project.rb	diff1 \|	diff2 \|	blob \| history
app/models/user.rb	diff1 \|	diff2 \|	blob \| history
app/views/snippets/_form.html.haml	diff1 \|	diff2 \|	blob \| history
config/routes.rb	diff1 \|	diff2 \|	blob \| history
db/schema.rb	diff1 \|	diff2 \|	blob \| history
features/steps/shared/paths.rb	diff1 \|	diff2 \|	blob \| history
lib/api/projects.rb	diff1 \|	diff2 \|	blob \| history
spec/factories.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
spec/models/user_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/requests/api/notes_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/requests/api/projects_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/routing/project_routing_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/routing/routing_spec.rb	diff1 \|	diff2 \|	blob \| history

RSS Atom

About OSDN

Find Software

Develop Software

Help

app/models/ability.rb	diff1 \|	diff2 \|	blob \| history
app/models/event.rb	diff1 \|	diff2 \|	blob \| history
app/models/note.rb	diff1 \|	diff2 \|	blob \| history
app/models/project.rb	diff1 \|	diff2 \|	blob \| history
app/models/user.rb	diff1 \|	diff2 \|	blob \| history
app/views/snippets/_form.html.haml	diff1 \|	diff2 \|	blob \| history
config/routes.rb	diff1 \|	diff2 \|	blob \| history
db/schema.rb	diff1 \|	diff2 \|	blob \| history
features/steps/shared/paths.rb	diff1 \|	diff2 \|	blob \| history
lib/api/projects.rb	diff1 \|	diff2 \|	blob \| history
spec/factories.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
spec/models/user_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/requests/api/notes_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/requests/api/projects_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/routing/project_routing_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/routing/routing_spec.rb	diff1 \|	diff2 \|	blob \| history