heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote-tracking branch 'upstream/master' into auth

Browse Source 
Conflicts:
	mediagoblin/app.py
	mediagoblin/auth/forms.py
	mediagoblin/auth/tools.py
	mediagoblin/db/migrations.py
	mediagoblin/db/models.py
	mediagoblin/edit/views.py
	mediagoblin/plugins/basic_auth/tools.py
	mediagoblin/tests/test_edit.py
This commit is contained in:
Rodney Ewing
2013-06-25 13:37:21 -07:00
parent 5a1be074c0 7fa4e19fc4
commit af4414a85f
80 changed files with 4233 additions and 5536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mediagoblin/plugins/basic_auth/__init__.py
View File

@@ -13,8 +13,6 @@
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import uuid
from mediagoblin.plugins.basic_auth import forms as auth_forms
from mediagoblin.plugins.basic_auth import tools as auth_tools
from mediagoblin.db.models import User
@@ -45,7 +43,6 @@ def create_user(registration_form):
user.email = registration_form.email.data
user.pw_hash = gen_password_hash(
registration_form.password.data)
user.verification_key = unicode(uuid.uuid4())
user.save()
return user