James Edwards-Jones b988faaf85 Merge branch 'master' into 'jej-pages-to-ce' ... # Conflicts: # db/schema.rb		2017-02-06 15:12:27 +00:00
..
admin.rb	Merged the 'groups' and 'projects' tabs when viewing user profiles	2016-12-29 22:42:16 +00:00
api.rb
ci.rb
dashboard.rb
development.rb
explore.rb
git_http.rb	Add nested groups support to the routing	2016-11-23 14:08:36 +02:00
group.rb	Fix 500 error for Group#web_url method if nested group	2017-01-24 17:44:21 +02:00
help.rb
import.rb	Rename Gogs to Gitea, DRY the controller and improve views	2016-12-19 17:35:51 +01:00
profile.rb	Create relation between chat user and GitLab user and allow to authorize them [ci skip]	2016-11-16 13:42:35 +01:00
project.rb	Merge branch 'master' into 'jej-pages-to-ce'	2017-02-06 15:12:27 +00:00
repository.rb	Add nested groups support to the routing	2016-11-23 14:08:36 +02:00
sherlock.rb
sidekiq.rb
snippets.rb	Check public snippets for spam	2017-02-02 10:23:51 +00:00
uploads.rb
user.rb	Add nested groups support to the routing	2016-11-23 14:08:36 +02:00
wiki.rb	Add nested groups support to the routing	2016-11-23 14:08:36 +02:00