app/controllers · 0f2798d498c69372137d13a8ba3ec8e87b7f0a8a · Forest Godfrey / gitlab-ce

Merge branch 'feature/refactoring_scopes_pr' of… · 0f2798d4

authored Apr 09, 2013

Merge branch 'feature/refactoring_scopes_pr' of https://github.com/Undev/gitlabhq into Undev-feature/refactoring_scopes_pr

Conflicts:
	db/schema.rb

0f2798d4

Name	Last commit	Last update
..
admin		Loading commit data...
projects		Loading commit data...
public		Loading commit data...
teams		Loading commit data...
application_controller.rb		Loading commit data...
blame_controller.rb		Loading commit data...
blob_controller.rb		Loading commit data...
commit_controller.rb		Loading commit data...
commits_controller.rb		Loading commit data...
compare_controller.rb		Loading commit data...
dashboard_controller.rb		Loading commit data...
deploy_keys_controller.rb		Loading commit data...
edit_tree_controller.rb		Loading commit data...
errors_controller.rb		Loading commit data...
files_controller.rb		Loading commit data...
graph_controller.rb		Loading commit data...
groups_controller.rb		Loading commit data...
help_controller.rb		Loading commit data...
hooks_controller.rb		Loading commit data...
issues_controller.rb		Loading commit data...
keys_controller.rb		Loading commit data...
labels_controller.rb		Loading commit data...
merge_requests_controller.rb		Loading commit data...
milestones_controller.rb		Loading commit data...
notes_controller.rb		Loading commit data...
notifications_controller.rb		Loading commit data...
omniauth_callbacks_controller.rb		Loading commit data...
profiles_controller.rb		Loading commit data...
project_resource_controller.rb		Loading commit data...
projects_controller.rb		Loading commit data...
protected_branches_controller.rb		Loading commit data...
raw_controller.rb		Loading commit data...
refs_controller.rb		Loading commit data...
registrations_controller.rb		Loading commit data...
repositories_controller.rb		Loading commit data...
search_controller.rb		Loading commit data...
services_controller.rb		Loading commit data...
snippets_controller.rb		Loading commit data...
team_members_controller.rb		Loading commit data...
teams_controller.rb		Loading commit data...
tree_controller.rb		Loading commit data...
users_controller.rb		Loading commit data...
walls_controller.rb		Loading commit data...
wikis_controller.rb		Loading commit data...