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

author	Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
	Wed, 27 Nov 2013 09:51:46 +0000 (11:51 +0200)
committer	Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
	Wed, 27 Nov 2013 09:51:46 +0000 (11:51 +0200)
commit	fa7d62494a24584c0d27d52344aae8e382304936
tree	caa8f0f35123e31c4c9e172f99b7f723f355cd6d	tree \| snapshot
parent	9aaf478f10993ac134bf86546c95dbb4284f9f5f	commit \| diff
parent	d9bb4230cc3aa161876df821c34d8e9c53d2e7a6	commit \| diff

Merge branch 'authenticated_public_mode' of https://github.com/jhollingsworth/gitlabhq into feature/internal_projects

Conflicts:
app/models/project.rb

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/contexts/projects/update_context.rb	diff1 \|	diff2 \|	blob \| history
app/models/project.rb	diff1 \|	diff2 \|	blob \| history

RSS Atom

About OSDN

Site Announce
About OSDN
Privacy
Terms of Use
Advertise

Find Software

Search
Find by Categories
Download Ranking
Project Ranking

Develop Software

Create Project/Chamber
What's new
Recently Registered Project
Chambers Map
API

Help

Help Docs
Contact Us
Report Abuse/spam

app/contexts/projects/update_context.rb	diff1 \|	diff2 \|	blob \| history
app/models/project.rb	diff1 \|	diff2 \|	blob \| history