spec/factories · c80f34257dc389369801eb112506706d46051bb1 · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

History Find file

Merge branch 'master' into merge-if-green · eab086bd
Douwe Maan authored Dec 09, 2015
```
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	config/routes.rb
```
eab086bd

Name	Last commit	Last update
..
ci		Loading commit data...
abuse_reports.rb		Loading commit data...
broadcast_messages.rb		Loading commit data...
commit_statuses.rb		Loading commit data...
forked_project_links.rb		Loading commit data...
group_members.rb		Loading commit data...
label_links.rb		Loading commit data...
labels.rb		Loading commit data...
lfs_objects.rb		Loading commit data...
lfs_objects_projects.rb		Loading commit data...
merge_requests.rb		Loading commit data...
notes.rb		Loading commit data...
projects.rb		Loading commit data...
releases.rb		Loading commit data...