gitorious:franklin-devs-phpbbhub.git
7 years agoto_key is now an internal AR method, so the to_key method in SshKey is renamed.
August Lilleaas [Sun, 6 Jun 2010 17:26:06 +0000 (19:26 +0200)]
to_key is now an internal AR method, so the to_key method in SshKey is renamed.

7 years agoUpdating the content_for :sidebar presence check.
August Lilleaas [Sat, 5 Jun 2010 20:37:59 +0000 (22:37 +0200)]
Updating the content_for :sidebar presence check.

7 years agoUpdating some of the helpers to use the new block syntax.
August Lilleaas [Sat, 5 Jun 2010 20:35:37 +0000 (22:35 +0200)]
Updating some of the helpers to use the new block syntax.

7 years agoUn-lambdaing a few locale entries.
August Lilleaas [Sat, 5 Jun 2010 20:14:35 +0000 (22:14 +0200)]
Un-lambdaing a few locale entries.

7 years agoAdding ssl requirement functionality. Rolling our own instead of using a plugin.
August Lilleaas [Sat, 5 Jun 2010 18:56:51 +0000 (20:56 +0200)]
Adding ssl requirement functionality. Rolling our own instead of using a plugin.

7 years agoRemoving all activemessaging dispatcher meddling - the dispacher isn't even around...
August Lilleaas [Sat, 5 Jun 2010 17:13:36 +0000 (19:13 +0200)]
Removing all activemessaging dispatcher meddling - the dispacher isn't even around in the latest Rails 3 HEAD.

7 years agoThe environment configs properly set ActionMailer configs.
August Lilleaas [Sat, 5 Jun 2010 17:12:47 +0000 (19:12 +0200)]
The environment configs properly set ActionMailer configs.

7 years agoRemoving misc.rake, which only contained a copy of rake routes. Probably added by...
August Lilleaas [Sat, 5 Jun 2010 17:03:15 +0000 (19:03 +0200)]
Removing misc.rake, which only contained a copy of rake routes. Probably added by some older version of rails?

7 years agoAdjusting some functional test for the lack of a :controller/:action/:id route.
August Lilleaas [Thu, 3 Jun 2010 12:11:01 +0000 (14:11 +0200)]
Adjusting some functional test for the lack of a :controller/:action/:id route.

7 years agoAppliying some finishing touches on the new routes. The standard /projects/1/reposito...
August Lilleaas [Wed, 2 Jun 2010 23:46:18 +0000 (01:46 +0200)]
Appliying some finishing touches on the new routes. The standard /projects/1/repositories/2/... type routes are none-existing, we route projects, repositories and groups with our new resources_without_collection route helper, so that the /~user/project/repo type routes are the actual routes.

7 years agoRemoving will_paginate as a plugin, adding it to the Gemfile.
August Lilleaas [Wed, 2 Jun 2010 21:39:44 +0000 (23:39 +0200)]
Removing will_paginate as a plugin, adding it to the Gemfile.

7 years agoFixing typo: patc => patch.
August Lilleaas [Tue, 1 Jun 2010 20:13:46 +0000 (22:13 +0200)]
Fixing typo: patc => patch.

7 years agoAdding temporary fix to ssl requirement shoulda macro fail.
August Lilleaas [Tue, 1 Jun 2010 20:13:09 +0000 (22:13 +0200)]
Adding temporary fix to ssl requirement shoulda macro fail.

7 years agoUpdating comments controller for Rails 3.
August Lilleaas [Tue, 1 Jun 2010 20:10:48 +0000 (22:10 +0200)]
Updating comments controller for Rails 3.

7 years agoPassing resource member IDs is required for the routes to match.
August Lilleaas [Tue, 1 Jun 2010 20:07:31 +0000 (22:07 +0200)]
Passing resource member IDs is required for the routes to match.

7 years agoThe should_assign_to shoulda macro no longer takes an :equals, so doing that check...
August Lilleaas [Tue, 1 Jun 2010 19:54:45 +0000 (21:54 +0200)]
The should_assign_to shoulda macro no longer takes an :equals, so doing that check by hand.

7 years agoBlobs controller doesn't need to call to_json on the nested hash, to_json can handle...
August Lilleaas [Tue, 1 Jun 2010 19:39:13 +0000 (21:39 +0200)]
Blobs controller doesn't need to call to_json on the nested hash, to_json can handle nested hashes. It also errored out.

7 years agoSome repository routes assumes :repository_id rather than :id, so we explicitly route...
August Lilleaas [Tue, 1 Jun 2010 19:38:29 +0000 (21:38 +0200)]
Some repository routes assumes :repository_id rather than :id, so we explicitly route those accordingly.

7 years agoIn routes, 'match' can't be used directly in the resource scope, it has to be used...
August Lilleaas [Tue, 1 Jun 2010 19:27:40 +0000 (21:27 +0200)]
In routes, 'match' can't be used directly in the resource scope, it has to be used inside member or collection. That actually makes a whole lot of sense - you have to route from /myresources or /myresources/:id, anything else would be silly.

7 years agoSilencing the deprecations while I make the tests pass, so I don't go insane.
August Lilleaas [Mon, 31 May 2010 23:19:14 +0000 (01:19 +0200)]
Silencing the deprecations while I make the tests pass, so I don't go insane.

7 years agoWe have to specify a user id for the route to match. We had to do this in Rails 2...
August Lilleaas [Mon, 31 May 2010 23:18:30 +0000 (01:18 +0200)]
We have to specify a user id for the route to match. We had to do this in Rails 2 as well, so how this test ever passed is beyond me.

7 years agoAccessing controller callbacks by name has changed.
August Lilleaas [Mon, 31 May 2010 23:17:38 +0000 (01:17 +0200)]
Accessing controller callbacks by name has changed.

7 years agoGetting to work on a real routes.rb. The repository routes needs to be appended to...
August Lilleaas [Mon, 31 May 2010 23:16:37 +0000 (01:16 +0200)]
Getting to work on a real routes.rb. The repository routes needs to be appended to many different scopes, so we extract that as a 'repositories' method we can call from anywhere in routes.rb.

7 years ago@controller is no longer available from helpers - use the controller method instead.
August Lilleaas [Mon, 31 May 2010 23:13:36 +0000 (01:13 +0200)]
@controller is no longer available from helpers - use the controller method instead.

7 years agoTiny fix to the ruby open id authentication plugin so that it doesn't bork with ...
August Lilleaas [Mon, 31 May 2010 22:39:57 +0000 (00:39 +0200)]
Tiny fix to the ruby open id authentication plugin so that it doesn't bork with 'params' in tests. Without this fix, :controller and :action will not be set in tests params.

7 years agoRemoving activemessaging submodule that I have no idea how go there in the first...
August Lilleaas [Sun, 30 May 2010 17:33:16 +0000 (19:33 +0200)]
Removing activemessaging submodule that I have no idea how go there in the first place, and is not supposed to be there.

7 years agoMonkey patching some incompabilities in an initializer. Needs to be removed before...
August Lilleaas [Sun, 30 May 2010 17:18:16 +0000 (19:18 +0200)]
Monkey patching some incompabilities in an initializer. Needs to be removed before a master merge.

7 years agoImplementing Gitorious::Reservations.controller_names with Rails 3 semantics.
August Lilleaas [Sun, 30 May 2010 17:16:12 +0000 (19:16 +0200)]
Implementing Gitorious::Reservations.controller_names with Rails 3 semantics.

7 years agoAdding a test helper rails_cache_passthrough, using it.
August Lilleaas [Sun, 30 May 2010 16:08:02 +0000 (18:08 +0200)]
Adding a test helper rails_cache_passthrough, using it.

7 years agoMarking mangled emails as HTML safe.
August Lilleaas [Sun, 30 May 2010 16:01:30 +0000 (18:01 +0200)]
Marking mangled emails as HTML safe.

7 years agoUpdating ssh client test. The routes are temporary.
August Lilleaas [Sun, 30 May 2010 15:56:58 +0000 (17:56 +0200)]
Updating ssh client test. The routes are temporary.

7 years agoSeems like ActiveRecord::Base#reload doesn't reload all associations.
August Lilleaas [Sun, 30 May 2010 15:38:18 +0000 (17:38 +0200)]
Seems like ActiveRecord::Base#reload doesn't reload all associations.

7 years agoFixed the previous deprecation error fix: errors.on would return nil with no errors...
August Lilleaas [Sun, 30 May 2010 15:30:30 +0000 (17:30 +0200)]
Fixed the previous deprecation error fix: errors.on would return nil with no errors before, now it returns an empty array.

7 years agoRemoving old Rails 2 artifact from repositories helper test.
August Lilleaas [Sun, 30 May 2010 15:19:17 +0000 (17:19 +0200)]
Removing old Rails 2 artifact from repositories helper test.

7 years agoThe clear_messages method on the activemessaging test connection was custom in the...
August Lilleaas [Sun, 30 May 2010 15:16:31 +0000 (17:16 +0200)]
The clear_messages method on the activemessaging test connection was custom in the first place. Re-adding it as a monkey patch in the test helper.

7 years agoFixing test case: moving around on the stubs a bit. Overwriting Rails.cache.fetch...
August Lilleaas [Sun, 30 May 2010 15:05:12 +0000 (17:05 +0200)]
Fixing test case: moving around on the stubs a bit. Overwriting Rails.cache.fetch, it doesn't seem to yield in the test env as before.

7 years agoRe-adding the oauth test consumer from the old vendor/oauth.
August Lilleaas [Sun, 30 May 2010 14:37:23 +0000 (16:37 +0200)]
Re-adding the oauth test consumer from the old vendor/oauth.

7 years agoMinor change in what we stub. Not exactly shure why this failed without this change...
August Lilleaas [Sun, 30 May 2010 14:30:44 +0000 (16:30 +0200)]
Minor change in what we stub. Not exactly shure why this failed without this change, but stubbing out the entire association is better anyways.

7 years agowrite_attribute is private, hijacking the private scope with instance_eval.
August Lilleaas [Sun, 30 May 2010 14:25:40 +0000 (16:25 +0200)]
write_attribute is private, hijacking the private scope with instance_eval.

7 years agoUsing a normal interpolation locale for application_helper.notice_for.
August Lilleaas [Sun, 30 May 2010 14:19:43 +0000 (16:19 +0200)]
Using a normal interpolation locale for application_helper.notice_for.

7 years agoSpecifying the subject (new shoulda thingie) to avoid shoulda spamming STDOUT.
August Lilleaas [Sun, 30 May 2010 14:06:13 +0000 (16:06 +0200)]
Specifying the subject (new shoulda thingie) to avoid shoulda spamming STDOUT.

7 years agoThe all important fix to make Mocha behave correctly: don't require it with bundler...
August Lilleaas [Sun, 30 May 2010 13:55:46 +0000 (15:55 +0200)]
The all important fix to make Mocha behave correctly: don't require it with bundler, let shoulda require it for us.

7 years agoAdding the builder gem for the message model.
August Lilleaas [Sun, 30 May 2010 13:36:10 +0000 (15:36 +0200)]
Adding the builder gem for the message model.

7 years agoLetting factory girl know where the factories are.
August Lilleaas [Sun, 30 May 2010 13:06:14 +0000 (15:06 +0200)]
Letting factory girl know where the factories are.

7 years agoApplying a few Rails 3 fixes to activemessaging.
August Lilleaas [Sun, 30 May 2010 13:01:20 +0000 (15:01 +0200)]
Applying a few Rails 3 fixes to activemessaging.

7 years agoBumping activemessaging.
August Lilleaas [Sun, 30 May 2010 13:00:46 +0000 (15:00 +0200)]
Bumping activemessaging.

7 years agoA few minor custom fixes to ultrasphinx.
August Lilleaas [Sun, 30 May 2010 12:58:12 +0000 (14:58 +0200)]
A few minor custom fixes to ultrasphinx.

7 years agoBumping ultrasphinx. Removing the vendor and test directories in it as well.
August Lilleaas [Sun, 30 May 2010 12:57:42 +0000 (14:57 +0200)]
Bumping ultrasphinx. Removing the vendor and test directories in it as well.

7 years agoRemoving routing_filter plugin, which is a Rails 2 route hack so it won't work in...
August Lilleaas [Sun, 30 May 2010 12:45:17 +0000 (14:45 +0200)]
Removing routing_filter plugin, which is a Rails 2 route hack so it won't work in Rails 3 at all.

7 years agoAdding state_machine to Gemfile, removing from vendor/plugins.
August Lilleaas [Sun, 30 May 2010 12:44:06 +0000 (14:44 +0200)]
Adding state_machine to Gemfile, removing from vendor/plugins.

7 years agoRemoving shoulda from vendor/plugins, it's in the gemfile now.
August Lilleaas [Sun, 30 May 2010 12:41:41 +0000 (14:41 +0200)]
Removing shoulda from vendor/plugins, it's in the gemfile now.

7 years agoAdding .bundle/config to gitignore, so that people can bundle their gems where ever...
August Lilleaas [Sun, 30 May 2010 12:40:24 +0000 (14:40 +0200)]
Adding .bundle/config to gitignore, so that people can bundle their gems where ever they want.

7 years agoUsing bmdaddy's shoulda fork for the time being, it has a few fixes that upstream...
August Lilleaas [Sun, 30 May 2010 12:35:01 +0000 (14:35 +0200)]
Using bmdaddy's shoulda fork for the time being, it has a few fixes that upstream doesn't have.

7 years agoRemoving paperclip from vendor/plugins, adding it to Gemfile.
August Lilleaas [Sun, 30 May 2010 12:34:15 +0000 (14:34 +0200)]
Removing paperclip from vendor/plugins, adding it to Gemfile.

7 years agoThe ssl requirement plugin doesn't work in Rails 3. As a temporary solution, we remov...
August Lilleaas [Sun, 30 May 2010 12:11:37 +0000 (14:11 +0200)]
The ssl requirement plugin doesn't work in Rails 3. As a temporary solution, we remove the plugin and create a stub ssl_requirement controller method.

7 years agoAdding the routes.rb we got so far. It's work in progress.
August Lilleaas [Sun, 30 May 2010 12:10:22 +0000 (14:10 +0200)]
Adding the routes.rb we got so far. It's work in progress.

7 years agoshould_require_attributes => should_validate_presence_of in newest shoulda.
August Lilleaas [Sun, 30 May 2010 01:11:40 +0000 (03:11 +0200)]
should_require_attributes => should_validate_presence_of in newest shoulda.

7 years agoFixing the Mailer test.
August Lilleaas [Sat, 29 May 2010 23:41:39 +0000 (01:41 +0200)]
Fixing the Mailer test.

* We don't need ActionController::UrlWriter anymore
* We can't set @body[:body] - that will overwrite the entire message body.

7 years ago needs to be
August Lilleaas [Sat, 29 May 2010 18:26:28 +0000 (20:26 +0200)]
 needs to be

7 years agoRemoving oauth from vendor, adding it to Gemfile.
August Lilleaas [Sat, 29 May 2010 18:24:38 +0000 (20:24 +0200)]
Removing oauth from vendor, adding it to Gemfile.

7 years agoTest gems shoulda and factory girl updated to rails3 branches and required per instuc...
August Lilleaas [Sat, 29 May 2010 18:23:15 +0000 (20:23 +0200)]
Test gems shoulda and factory girl updated to rails3 branches and required per instuctions in test helper.

7 years agoUpgrading en.rb locale file to new interpolation syntax: from {{foo}} to %{foo}.
August Lilleaas [Sat, 29 May 2010 18:21:11 +0000 (20:21 +0200)]
Upgrading en.rb locale file to new interpolation syntax: from {{foo}} to %{foo}.

7 years agoOverriding the instance method in models has been deprecated; using instead.
August Lilleaas [Sat, 29 May 2010 18:08:37 +0000 (20:08 +0200)]
Overriding the  instance method in models has been deprecated; using  instead.

7 years agoUsing the filter_parameters already in place in application.rb.
August Lilleaas [Sat, 29 May 2010 11:32:45 +0000 (13:32 +0200)]
Using the filter_parameters already in place in application.rb.

7 years agoUpgrading the metal for Rails 3 conventions - got to set the proper headers.
August Lilleaas [Sat, 29 May 2010 11:08:58 +0000 (13:08 +0200)]
Upgrading the metal for Rails 3 conventions - got to set the proper headers.

7 years agoDeprecation fix: filter_parameter_loging is now in config/application.rb
August Lilleaas [Thu, 27 May 2010 18:54:06 +0000 (20:54 +0200)]
Deprecation fix: filter_parameter_loging is now in config/application.rb

7 years agoRemoving vendor/rails - it's in the Gemfile now.
August Lilleaas [Sat, 29 May 2010 11:43:04 +0000 (13:43 +0200)]
Removing vendor/rails - it's in the Gemfile now.

7 years agoRails3-ifying everything by running the Rails 3 `rails` command on top of Gitorious...
August Lilleaas [Thu, 27 May 2010 18:12:31 +0000 (20:12 +0200)]
Rails3-ifying everything by running the Rails 3 `rails` command on top of Gitorious' root.

7 years agosmaller chunked branch list
Johan Sørensen [Fri, 21 May 2010 13:13:23 +0000 (15:13 +0200)]
smaller chunked branch list

7 years agoDon't set width of the repository getting started partial
Johan Sørensen [Fri, 21 May 2010 13:02:19 +0000 (15:02 +0200)]
Don't set width of the repository getting started partial

7 years agoMake clone url field larger if push url isn't shown
Johan Sørensen [Fri, 21 May 2010 12:54:10 +0000 (14:54 +0200)]
Make clone url field larger if push url isn't shown

7 years agoMerge remote branch 'origin/master'
Ole Martin Kristiansen [Fri, 21 May 2010 12:30:10 +0000 (14:30 +0200)]
Merge remote branch 'origin/master'

7 years agoBranches width fix
Ole Martin Kristiansen [Fri, 21 May 2010 12:29:21 +0000 (14:29 +0200)]
Branches width fix

7 years agoFix to main header
Ole Martin Kristiansen [Fri, 21 May 2010 12:27:57 +0000 (14:27 +0200)]
Fix to main header

7 years agoBring back blog feed on Site#public_index and fix issue with Time#to_s
Johan Sørensen [Fri, 21 May 2010 11:29:30 +0000 (13:29 +0200)]
Bring back blog feed on Site#public_index and fix issue with Time#to_s

7 years agoCorrected events image sprites
Johan Sørensen [Fri, 21 May 2010 11:06:05 +0000 (13:06 +0200)]
Corrected events image sprites

7 years agoDashboard/profile activity list size fix
Ole Martin Kristiansen [Fri, 21 May 2010 11:51:13 +0000 (13:51 +0200)]
Dashboard/profile activity list size fix

7 years agoSmall css adjustments and preview button fix on Wiki
Ole Martin Kristiansen [Fri, 21 May 2010 11:35:53 +0000 (13:35 +0200)]
Small css adjustments and preview button fix on Wiki

7 years agoChanged copy for Administration table
Ole Martin Kristiansen [Fri, 21 May 2010 11:04:13 +0000 (13:04 +0200)]
Changed copy for Administration table

7 years agoSpelling fix on events.png
Ole Martin Kristiansen [Fri, 21 May 2010 11:01:54 +0000 (13:01 +0200)]
Spelling fix on events.png

7 years agoFix to collaborators table and form
Ole Martin Kristiansen [Fri, 21 May 2010 09:16:23 +0000 (11:16 +0200)]
Fix to collaborators table and form

7 years agoMerge remote branch 'origin/master'
Ole Martin Kristiansen [Fri, 21 May 2010 08:56:25 +0000 (10:56 +0200)]
Merge remote branch 'origin/master'

7 years agoChanged the layout width to 960px to accommodate smaller resolutions and browser...
Ole Martin Kristiansen [Fri, 21 May 2010 08:54:56 +0000 (10:54 +0200)]
Changed the layout width to 960px to accommodate smaller resolutions and browser windows

7 years agoMajor change from 1100 to 960 grid. Small fixes on front page, adjustments to overall...
Ole Martin Kristiansen [Thu, 20 May 2010 12:39:31 +0000 (14:39 +0200)]
Major change from 1100 to 960 grid. Small fixes on front page, adjustments to overall pull-boxes, tables etc.

7 years agoFix layout in .select_commits_from_list in MergeRequest#new
Johan Sørensen [Thu, 20 May 2010 11:05:56 +0000 (13:05 +0200)]
Fix layout in .select_commits_from_list in MergeRequest#new

7 years agoWidth fix for external form inputs
Ole Martin Kristiansen [Thu, 20 May 2010 08:41:50 +0000 (10:41 +0200)]
Width fix for external form inputs

7 years agoExternal form padding fix and terms of service label fix, commit_message width fix.
Ole Martin Kristiansen [Thu, 20 May 2010 08:40:06 +0000 (10:40 +0200)]
External form padding fix and terms of service label fix, commit_message width fix.

7 years agoMerge commit 'refs/merge-requests/2210' of git://gitorious.org/gitorious/mainline
Johan Sørensen [Thu, 20 May 2010 08:35:37 +0000 (10:35 +0200)]
Merge commit 'refs/merge-requests/2210' of git://gitorious.org/gitorious/mainline

* git://gitorious.org/gitorious/mainline:
  A little clean up of the contact information
  Make the support email address configurable

7 years agoAlso filter password_confirmation params
Johan Sørensen [Thu, 20 May 2010 08:31:59 +0000 (10:31 +0200)]
Also filter password_confirmation params

7 years agoMerge commit 'refs/merge-requests/2213' of git://gitorious.org/gitorious/mainline
Johan Sørensen [Thu, 20 May 2010 08:31:31 +0000 (10:31 +0200)]
Merge commit 'refs/merge-requests/2213' of git://gitorious.org/gitorious/mainline

* git://gitorious.org/gitorious/mainline:
  Filter passwords from logs

7 years agoMerge commit 'refs/merge-requests/102' of git://gitorious.org/gitorious/mainline
Johan Sørensen [Thu, 20 May 2010 08:30:40 +0000 (10:30 +0200)]
Merge commit 'refs/merge-requests/102' of git://gitorious.org/gitorious/mainline

* git://gitorious.org/gitorious/mainline:
  Fixed jQuery selector for avatar deletion form.

Conflicts:
app/views/groups/edit.html.erb
app/views/users/edit.html.erb

7 years agoMerge commit 'refs/merge-requests/2214' of git://gitorious.org/gitorious/mainline
Johan Sørensen [Thu, 20 May 2010 08:25:59 +0000 (10:25 +0200)]
Merge commit 'refs/merge-requests/2214' of git://gitorious.org/gitorious/mainline

* git://gitorious.org/gitorious/mainline:
  Fix autocompletion for committerships, memberships and message recipients.

7 years agoFixes to event icons and date width
Ole Martin Kristiansen [Thu, 20 May 2010 08:18:07 +0000 (10:18 +0200)]
Fixes to event icons and date width

7 years agoDo 0322e137b71 correctly
Johan Sørensen [Wed, 19 May 2010 14:18:02 +0000 (16:18 +0200)]
Do 0322e137b71 correctly

7 years agoUppercase OpenSUSE featured project name
Johan Sørensen [Wed, 19 May 2010 14:16:19 +0000 (16:16 +0200)]
Uppercase OpenSUSE featured project name

7 years agopoint to ivar
Johan Sørensen [Wed, 19 May 2010 14:11:36 +0000 (16:11 +0200)]
point to ivar

7 years agoPUT to proper path when resetting password
Johan Sørensen [Wed, 19 May 2010 14:08:01 +0000 (16:08 +0200)]
PUT to proper path when resetting password

7 years agoSubmodule ref bump
Johan Sørensen [Wed, 19 May 2010 13:53:11 +0000 (15:53 +0200)]
Submodule ref bump

7 years agoIt's a good idea to spell your own project name correctly
Johan Sørensen [Wed, 19 May 2010 13:48:00 +0000 (15:48 +0200)]
It's a good idea to spell your own project name correctly

7 years agoadd back extra_html_head_data
Johan Sørensen [Wed, 19 May 2010 13:29:58 +0000 (15:29 +0200)]
add back extra_html_head_data