Alexander Machehin dfbf8a8d58 Merge branch 'master' into 90-pull ... Fucking conflicts: app/controllers/projects/issues_controller.rb app/models/ability.rb app/views/projects/issues/show.html.haml config/routes.rb db/schema.rb lib/tasks/import.rake spec/models/comment_for_commit_spec.rb vendor/assets/javascripts/bootstrap-tab.js vendor/assets/stylesheets/bootstrap.css		2012-09-25 17:55:30 +06:00
..
admin	Merge pull request #587 from warpc/586-datatables_json_fixes	2012-07-27 05:45:23 -07:00
groups	[refs #641] Show only public projects in group profile	2012-09-12 18:49:40 +04:00
platforms	#638: some refactoring	2012-09-13 00:47:39 +04:00
projects	Merge branch 'master' into 90-pull	2012-09-25 17:55:30 +06:00
users	[refs #641] Show only public projects in group profile	2012-09-12 18:49:40 +04:00
activity_feeds_controller.rb	[refs #396] Devise token auth update for atom feed. Some atom feed fixes.	2012-04-18 19:15:04 +04:00
advisories_controller.rb	[issue #428] Fixed bug with before_filter in advisory	2012-07-06 18:23:49 +04:00
application_controller.rb	Update gems, fix conflicts. Raise 404 error instead of redirect. Refactor git controllers. Refactor git methods, move to modules. Cleanup git helpers, refactor and remove unused variables from views, refactor git templates. Refactor project load. Refactor git routes and links, refactor constraints. Fix branches with slashes and dots. Apply github linguist and libmagic for binary file detection. Other refactor and code cleanup. Fix specs and deprecations. Refs #263	2012-07-17 11:02:56 +03:00
contacts_controller.rb	[issue #565] Added feedback form.	2012-07-20 20:06:31 +04:00
pages_controller.rb	[refs #630] swap tour conten for porject and build pages	2012-09-04 18:30:02 +04:00
search_controller.rb	[refs #349] Disable global menu Projects and Platforms; Allowed full search; Protect user and maintainer emails; Refactoring right rules	2012-09-06 21:09:10 +04:00