gitorious:taladars-gitorious-saltation.git
7 years agoMerge remote-tracking branch 'origin/master' into saltation
Matthias Hoermann [Mon, 11 Jul 2011 11:21:14 +0000 (13:21 +0200)]
Merge remote-tracking branch 'origin/master' into saltation

Conflicts:
app/controllers/trees_controller.rb
app/models/committership.rb
app/models/repository.rb
app/views/committerships/edit.html.erb
app/views/committerships/index.html.erb
app/views/committerships/new.html.erb
app/views/site/dashboard.html.erb
config/environment.rb

7 years agoSomewhat more consistent coding style in CSS files
Christian Johansen [Thu, 7 Jul 2011 13:54:11 +0000 (15:54 +0200)]
Somewhat more consistent coding style in CSS files

7 years agoAdd fix for overflowing download link in right column
Christian Johansen [Thu, 7 Jul 2011 12:43:44 +0000 (14:43 +0200)]
Add fix for overflowing download link in right column

7 years agoAdd Gitorious::VERSION constant and simple changelog script/rake task
Christian Johansen [Tue, 5 Jul 2011 13:07:31 +0000 (15:07 +0200)]
Add Gitorious::VERSION constant and simple changelog script/rake task

7 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Mon, 4 Jul 2011 08:13:51 +0000 (10:13 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

7 years agoDon't cache external.css (login page) and onload.js
Christian Johansen [Mon, 4 Jul 2011 08:13:34 +0000 (10:13 +0200)]
Don't cache external.css (login page) and onload.js

- :cache => true for CSS/JS assumes the filename "all.(js|css)"
- "all.css" is already created by another set of CSS files
- "all.js" is already used by another set of JS files
- Result: login page got way too much CSS, causing freaky rendering
- Result: onload.js was not loaded in production. Rather all.js was loaded
  twice, causing double event listeners and whatnot

7 years agoMissing equals sign
Christian Johansen [Mon, 4 Jul 2011 08:10:55 +0000 (10:10 +0200)]
Missing equals sign

7 years agoFix a bug where rendering inline commit summaries would fail on 1.9
Marius Mathiesen [Thu, 30 Jun 2011 08:35:43 +0000 (10:35 +0200)]
Fix a bug where rendering inline commit summaries would fail on 1.9

dom_id(an_object) calls an_object#id, which raises a warning on 1.8,
and fails on 1.9. Using the underlying commit's id attribute instead.

7 years agoMerge commit '0ef9b600868e565232b9f2bb2ec7129665d4fd3e'
Christian Johansen [Mon, 27 Jun 2011 08:16:30 +0000 (10:16 +0200)]
Merge commit '0ef9b600868e565232b9f2bb2ec7129665d4fd3e'

7 years agoOnly caches url reservations after Rails initialization completes
Rodrigo Rosenfeld Rosas [Sat, 21 May 2011 20:24:08 +0000 (17:24 -0300)]
Only caches url reservations after Rails initialization completes

7 years agoFix typo
Rodrigo Rosenfeld Rosas [Mon, 23 May 2011 23:17:00 +0000 (20:17 -0300)]
Fix typo

7 years agomake "reserved?" implementation clearer and faster in some cases
Rodrigo Rosenfeld Rosas [Sat, 21 May 2011 20:23:15 +0000 (17:23 -0300)]
make "reserved?" implementation clearer and faster in some cases

7 years agorefactoring: replace vendored hodel_3000_compliant_logger with its gem
Rodrigo Rosenfeld Rosas [Mon, 16 May 2011 16:46:30 +0000 (12:46 -0400)]
refactoring: replace vendored hodel_3000_compliant_logger with its gem

7 years agoRemove vendored state-machine plugin as it was already included in Gemfile
Rodrigo Rosenfeld Rosas [Mon, 16 May 2011 16:34:26 +0000 (12:34 -0400)]
Remove vendored state-machine plugin as it was already included in Gemfile

7 years agoUse 2 spaces instead of tabs in sessions/new.html.erb
Rodrigo Rosenfeld Rosas [Fri, 27 May 2011 00:49:31 +0000 (21:49 -0300)]
Use 2 spaces instead of tabs in sessions/new.html.erb

7 years agoRemoves unused partial view
Rodrigo Rosenfeld Rosas [Sat, 4 Jun 2011 19:17:30 +0000 (16:17 -0300)]
Removes unused partial view

7 years agoDuplicated (redundant) oauth dependency in Gemfile
Rodrigo Rosenfeld Rosas [Sun, 5 Jun 2011 22:40:36 +0000 (19:40 -0300)]
Duplicated (redundant) oauth dependency in Gemfile

7 years agoFix Gemfile.lock
Rodrigo Rosenfeld Rosas [Thu, 16 Jun 2011 23:56:28 +0000 (20:56 -0300)]
Fix Gemfile.lock

7 years agoManually assign password and confirmation in create_admin script
Christian Johansen [Wed, 22 Jun 2011 13:32:38 +0000 (15:32 +0200)]
Manually assign password and confirmation in create_admin script

7 years agoFix CSS and JS includes
Christian Johansen [Tue, 21 Jun 2011 06:15:09 +0000 (08:15 +0200)]
Fix CSS and JS includes

- Don't use stylesheet_include_tag for Google fonts (adds .css suffix)

- Use include tags for all local files

7 years agoUpdate link to Google font
Christian Johansen [Tue, 21 Jun 2011 06:09:09 +0000 (08:09 +0200)]
Update link to Google font

7 years agoAllow blank avatars
Christian Johansen [Thu, 16 Jun 2011 17:21:42 +0000 (19:21 +0200)]
Allow blank avatars

7 years agoAllow bmp, svg and ico for user avatars too
Christian Johansen [Thu, 16 Jun 2011 12:15:56 +0000 (14:15 +0200)]
Allow bmp, svg and ico for user avatars too

7 years agoOnly allow gif/jpg/png files for avatars
Christian Johansen [Thu, 16 Jun 2011 09:50:06 +0000 (11:50 +0200)]
Only allow gif/jpg/png files for avatars

7 years agoDon't allow destructive actions via GET etc
Christian Johansen [Thu, 16 Jun 2011 08:20:03 +0000 (10:20 +0200)]
Don't allow destructive actions via GET etc

- Verify HTTP methods for destructive actions in UserController
- Disallow mass-assignment of password and password_confirmation in User
- Add test helper to verify method verification

7 years agoAllow id and href attributes in wiki markup
Christian Johansen [Wed, 15 Jun 2011 07:52:02 +0000 (09:52 +0200)]
Allow id and href attributes in wiki markup

7 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Wed, 15 Jun 2011 07:03:06 +0000 (09:03 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

7 years agoAdd tuxml for xml test output to Gemfile
Christian Johansen [Wed, 15 Jun 2011 07:02:55 +0000 (09:02 +0200)]
Add tuxml for xml test output to Gemfile

7 years agoPrevent Ultrasphinx from freaking out on an unknown adapter (jdbcmysql)
Marius Mathiesen [Tue, 14 Jun 2011 13:53:01 +0000 (15:53 +0200)]
Prevent Ultrasphinx from freaking out on an unknown adapter (jdbcmysql)

This is basically a backport of
github.com/fauna/ultrasphinx/commit/4ecdbbf4ed89d9edd8aaa9607b97adc569798150
and aliases SQL_FUNCTIONS and DEFAULTS for jdbcmysql to mysql

7 years agoConvert open_merge_request_count to a string, otherwise breaks on JRuby
Marius Mathiesen [Tue, 14 Jun 2011 13:26:45 +0000 (15:26 +0200)]
Convert open_merge_request_count to a string, otherwise breaks on JRuby

7 years agoPrepare for JRuby compatibility
Marius Mathiesen [Tue, 14 Jun 2011 13:20:52 +0000 (15:20 +0200)]
Prepare for JRuby compatibility

- Require activerecord JDBC on JRuby
- Update to latest RDiscount, which works on JRuby 1.6

7 years agoThe sanitizer didn't work exactly as I expected.
Marius Mathiesen [Fri, 10 Jun 2011 13:23:27 +0000 (15:23 +0200)]
The sanitizer didn't work exactly as I expected.

Passing along a much richer set of tags to be allowed.

7 years agoAllow inserting certain tags inside Wiki pages
Marius Mathiesen [Fri, 10 Jun 2011 13:08:48 +0000 (15:08 +0200)]
Allow inserting certain tags inside Wiki pages

After being processed by the markup renderer, wiki contents are sanitized.
This commit whitelists certain tags (table- and dl-related) to not be sanitized away.

7 years agoFix syntax error in script
Christian Johansen [Thu, 9 Jun 2011 13:34:23 +0000 (15:34 +0200)]
Fix syntax error in script

7 years agoAdd the new partial
Christian Johansen [Thu, 9 Jun 2011 07:28:05 +0000 (09:28 +0200)]
Add the new partial

7 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Thu, 9 Jun 2011 07:17:26 +0000 (09:17 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

7 years agoAdd 'commercial Gitorious support' to all footers
Christian Johansen [Thu, 9 Jun 2011 07:17:15 +0000 (09:17 +0200)]
Add 'commercial Gitorious support' to all footers

7 years agoText updates to /about and /contact
Marius Mathiesen [Wed, 8 Jun 2011 12:59:32 +0000 (14:59 +0200)]
Text updates to /about and /contact

Clarify that Gitorious AS maintains Gitorious and gitorious.org,
add information about professional offerings to /about and /contact
pages.

7 years agoAdd link to professional services in footer
Christian Johansen [Wed, 8 Jun 2011 12:36:35 +0000 (14:36 +0200)]
Add link to professional services in footer

7 years agoProper formatting of frontpage template
Christian Johansen [Wed, 8 Jun 2011 11:28:06 +0000 (13:28 +0200)]
Proper formatting of frontpage template

7 years agoSomewhat consistent formatting of CSS
Christian Johansen [Wed, 8 Jun 2011 11:24:24 +0000 (13:24 +0200)]
Somewhat consistent formatting of CSS

7 years agoAdd information about Gitorious professional services to frontpage
Christian Johansen [Wed, 8 Jun 2011 11:19:31 +0000 (13:19 +0200)]
Add information about Gitorious professional services to frontpage

7 years agoMerge commit 'refs/merge-requests/9' of git://gitorious.org/+saltation-developer...
Björn Steinbrink [Tue, 7 Jun 2011 13:20:18 +0000 (15:20 +0200)]
Merge commit 'refs/merge-requests/9' of git://gitorious.org/+saltation-developer/gitorious/gitorious-saltation into saltation

7 years agoMerge commit 'refs/merge-requests/8' of git://gitorious.org/+saltation-developer...
Björn Steinbrink [Tue, 7 Jun 2011 13:08:50 +0000 (15:08 +0200)]
Merge commit 'refs/merge-requests/8' of git://gitorious.org/+saltation-developer/gitorious/gitorious-saltation into saltation

7 years agoMerge commit 'refs/merge-requests/7' of git://gitorious.org/+saltation-developer...
Björn Steinbrink [Tue, 7 Jun 2011 13:08:08 +0000 (15:08 +0200)]
Merge commit 'refs/merge-requests/7' of git://gitorious.org/+saltation-developer/gitorious/gitorious-saltation into saltation

7 years agoMerge commit 'refs/merge-requests/6' of git://gitorious.org/+saltation-developer...
Björn Steinbrink [Tue, 7 Jun 2011 13:07:35 +0000 (15:07 +0200)]
Merge commit 'refs/merge-requests/6' of git://gitorious.org/+saltation-developer/gitorious/gitorious-saltation into saltation

7 years agoMerge commit 'refs/merge-requests/5' of git://gitorious.org/+saltation-developer...
Björn Steinbrink [Tue, 7 Jun 2011 13:07:10 +0000 (15:07 +0200)]
Merge commit 'refs/merge-requests/5' of git://gitorious.org/+saltation-developer/gitorious/gitorious-saltation into saltation

7 years agoMerge commit 'refs/merge-requests/4' of git://gitorious.org/+saltation-developer...
Björn Steinbrink [Tue, 7 Jun 2011 13:06:41 +0000 (15:06 +0200)]
Merge commit 'refs/merge-requests/4' of git://gitorious.org/+saltation-developer/gitorious/gitorious-saltation into saltation

7 years agoMerge commit 'refs/merge-requests/3' of git://gitorious.org/+saltation-developer...
Björn Steinbrink [Tue, 7 Jun 2011 13:06:11 +0000 (15:06 +0200)]
Merge commit 'refs/merge-requests/3' of git://gitorious.org/+saltation-developer/gitorious/gitorious-saltation into saltation

7 years agoMerge commit 'refs/merge-requests/2' of git://gitorious.org/+saltation-developer...
Björn Steinbrink [Tue, 7 Jun 2011 13:01:21 +0000 (15:01 +0200)]
Merge commit 'refs/merge-requests/2' of git://gitorious.org/+saltation-developer/gitorious/gitorious-saltation into saltation

7 years agoCreate the breadcrumb so that it gets rendered when accessed
Pedro Kiefer [Tue, 7 Jun 2011 03:38:56 +0000 (00:38 -0300)]
Create the breadcrumb so that it gets rendered when accessed

7 years agoResolve merge conflict
Christian Johansen [Mon, 6 Jun 2011 12:52:25 +0000 (14:52 +0200)]
Resolve merge conflict

7 years agoEnsure that HTTPS is enforced in links/references if use_ssl if on
Shane O'Grady [Fri, 3 Jun 2011 15:19:35 +0000 (16:19 +0100)]
Ensure that HTTPS is enforced in links/references if use_ssl if on

Use GitoriousConfig['scheme'] instead of "http" which will honour the use_ssl parameter.

7 years agoUse the right scheme when validating URL's in generated mails
Peter Kjellerstedt [Wed, 1 Jun 2011 15:12:58 +0000 (17:12 +0200)]
Use the right scheme when validating URL's in generated mails

The mail test broke in commit 02db88fd32889c512447d5e5962a0c116b8393fd.

7 years agoAdd a comment explaining why it's important to avoid hitting the session object
Christian Johansen [Tue, 31 May 2011 10:41:01 +0000 (12:41 +0200)]
Add a comment explaining why it's important to avoid hitting the session object

7 years agoClearer implementation of the SSL requirements
Christian Johansen [Tue, 31 May 2011 09:27:29 +0000 (11:27 +0200)]
Clearer implementation of the SSL requirements

7 years agoMerge commit 'refs/merge-requests/152' of gitorious.org:gitorious/mainline
Christian Johansen [Tue, 31 May 2011 08:06:04 +0000 (10:06 +0200)]
Merge commit 'refs/merge-requests/152' of gitorious.org:gitorious/mainline

7 years agoRevert "Remove last reference to ActiveMessaging in tests"
Christian Johansen [Tue, 31 May 2011 07:19:02 +0000 (09:19 +0200)]
Revert "Remove last reference to ActiveMessaging in tests"

This reverts commit a3b6e11112f7c4be7d8f42511fdaeb53ce5f4d7b.

Commited on the wrong branch.

7 years agoMerge commit 'refs/merge-requests/155' of gitorious.org:gitorious/mainline
Christian Johansen [Mon, 30 May 2011 17:38:27 +0000 (19:38 +0200)]
Merge commit 'refs/merge-requests/155' of gitorious.org:gitorious/mainline

7 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Mon, 30 May 2011 17:36:41 +0000 (19:36 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

7 years agoRemove last reference to ActiveMessaging in tests
Christian Johansen [Mon, 30 May 2011 17:36:34 +0000 (19:36 +0200)]
Remove last reference to ActiveMessaging in tests

7 years agoFixed Google Fonts API link to not throw browser warnings when use_ssl is turned on
Shane O'Grady [Mon, 30 May 2011 14:10:38 +0000 (15:10 +0100)]
Fixed Google Fonts API link to not throw browser warnings when use_ssl is turned on

Changed the link to the Google Fonts API stylesheet to use a protocol-less URI so that browsers do not throw HTTPS warnings when used with an SSL only Gitorious installation.
The browser determines what scheme is used for fetching the stylesheet depending on whether the page is called over HTTP or HTTPS.
[Protocol less URIs are valid and defined in RFC 3986 (4.2) http://www.ietf.org/rfc/rfc3986.txt]

7 years agoFix some errors due to moving to the ActsAsTaggableOn gem
Marius Mathiesen [Mon, 30 May 2011 13:32:48 +0000 (15:32 +0200)]
Fix some errors due to moving to the ActsAsTaggableOn gem

- Project#tag_list didn't work, the plugin has this built-in, but not as
  super
- Add a migration that will ensure old Taggings still work (needs to
  have context='tags')

7 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Mon, 30 May 2011 12:33:41 +0000 (14:33 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

7 years agoMake sure repository tests start with no repositories
Christian Johansen [Mon, 30 May 2011 12:33:31 +0000 (14:33 +0200)]
Make sure repository tests start with no repositories

- Resolves long-standing bug where test passes when run alone, but
  fails together with the other tests because they don't clean up
  properly.
- Note that this is more of a work-around than a fix. The proper fix
  is for tests to clean up after themselves.

7 years agoThe dashboard_path breadcrumb link should honour the use_ssl parameter
Shane O'Grady [Fri, 27 May 2011 15:21:18 +0000 (16:21 +0100)]
The dashboard_path breadcrumb link should honour the use_ssl parameter

Use GitoriousConfig['scheme'] instead of "http" which will honour the use_ssl parameter for the Dashboard breadcrumb link

7 years agoEnsure emails honour the use_ssl parameter
Shane O'Grady [Fri, 27 May 2011 15:12:47 +0000 (16:12 +0100)]
Ensure emails honour the use_ssl parameter

Use GitoriousConfig['scheme'] instead of "http" which will honour the use_ssl parameter.

7 years agoDo not require the correct subdomain for tarball downloads
Marius Mathiesen [Fri, 27 May 2011 13:04:25 +0000 (15:04 +0200)]
Do not require the correct subdomain for tarball downloads

7 years agoUpdated acts as taggable has renamed the tag class
Christian Johansen [Fri, 27 May 2011 12:23:48 +0000 (14:23 +0200)]
Updated acts as taggable has renamed the tag class

7 years agoURLs generated by the mailer will now respect the SSL setting in gitorious.yml
Marius Mathiesen [Fri, 27 May 2011 12:12:07 +0000 (14:12 +0200)]
URLs generated by the mailer will now respect the SSL setting in gitorious.yml

This means that URLs generated by the mailers will use SSL unless you have
explicitly configured Gitorious to not use SSL. To force Gitorious into non-SSL
mode, edit config/gitorious.yml as follows:

  use_ssl: false

7 years agoResolve merge conflict
Christian Johansen [Fri, 27 May 2011 08:45:35 +0000 (10:45 +0200)]
Resolve merge conflict

7 years agoPrevent Messages#index from choking on senders being removed.
Marius Mathiesen [Tue, 24 May 2011 13:53:33 +0000 (15:53 +0200)]
Prevent Messages#index from choking on senders being removed.

If a user who has sent eg. spam to other users is deleted, rendering the
inbox for the recipients of any messages from this user would fail.

7 years agoLinks to inline comments now only show them, never hide them again 7454_comment_link_should_not_hide_inline_comment
Matthias Hoermann [Tue, 24 May 2011 12:35:47 +0000 (14:35 +0200)]
Links to inline comments now only show them, never hide them again

7 years agoadded display of version for comments targetting MergeRequestVersion 7406_comment_include_version
Matthias Hoermann [Tue, 24 May 2011 07:49:17 +0000 (09:49 +0200)]
added display of version for comments targetting MergeRequestVersion

7 years agoAdded link to merge request to messages targetting merge request versions 7405_merge_request_notification_link
Matthias Hoermann [Mon, 23 May 2011 15:02:21 +0000 (17:02 +0200)]
Added link to merge request to messages targetting merge request versions

Previously only comments targetting merge requests directly (i.e. not inline comments) generated a message with a link back to the merge request

7 years agoRevert "Fix a bug in Grit that causes rev_list to show commits in the wrong order."
Marius Mathiesen [Mon, 23 May 2011 14:13:59 +0000 (16:13 +0200)]
Revert "Fix a bug in Grit that causes rev_list to show commits in the wrong order."

This reverts commit 6fb3997a0385b015147f2d4a92caf78ccd22421e.

7 years agoFix a bug in Grit that causes rev_list to show commits in the wrong order.
Marius Mathiesen [Mon, 23 May 2011 14:10:49 +0000 (16:10 +0200)]
Fix a bug in Grit that causes rev_list to show commits in the wrong order.

This makes Commits#index show the commits in the correct order.

Backported from
https://github.com/koraktor/grit/commit/64935ea4cf66cd38ab0ad7acc46c4fbc2fb6cf1e

7 years agoProjects in the main project list are now sorted by title 7656_sort_projects_by_title
Matthias Hoermann [Mon, 23 May 2011 12:18:48 +0000 (14:18 +0200)]
Projects in the main project list are now sorted by title

7 years agoMerge request version comments are now deleted along with the merge request version 7440_merge_request_version_comment_cascading_delete
Matthias Hoermann [Mon, 23 May 2011 08:54:59 +0000 (10:54 +0200)]
Merge request version comments are now deleted along with the merge request version

They were missing a :dependent => :destroy

7 years agoEnable auto-watch only for merge requests in watched repositories 7410_no_automatic_reviewer_watch_for_merge_requests
Matthias Hoermann [Wed, 4 May 2011 09:54:01 +0000 (11:54 +0200)]
Enable auto-watch only for merge requests in watched repositories

Just because you may review something, doesn't mean that you want to
be told about each and every one, so let's limit that to merge
requests in watched repositories.

7 years agoInline-Comment Code-Quotes are now taken from the correct file only 7453_comments_quote_wrong_diff
Matthias Hoermann [Mon, 9 May 2011 12:56:10 +0000 (14:56 +0200)]
Inline-Comment Code-Quotes are now taken from the correct file only

Previously the algorithm first extracted only the line numbers
and then took those lines from all visible files that had lines
with those numbers and concatenated all the results.

Now the algorithm also takes the filename into account when
extracting the lines.

7 years agoTaking a stab at making a solr adapter for Gitorious::Search
Marius Mathiesen [Thu, 19 May 2011 13:33:23 +0000 (15:33 +0200)]
Taking a stab at making a solr adapter for Gitorious::Search

7 years agoMoving search components into separate files/modules
Marius Mathiesen [Wed, 18 May 2011 13:56:28 +0000 (15:56 +0200)]
Moving search components into separate files/modules

7 years agoWrapped the various calls to the Sphinx wrapper
Marius Mathiesen [Wed, 18 May 2011 13:04:28 +0000 (15:04 +0200)]
Wrapped the various calls to the Sphinx wrapper

We now support all the arguments used for our wrapper, and search results
work like before.

Since Ultrasphinx' indexer parses our source code to find classes that should
be indexed, we needed to keep the old method name (is_indexed). However, we alias
the old method and provide a new DSL for specifying how to index the data.

Our new API exposes a helper object inside is_indexed, which offers these methods:
- #index which indexes fields or fields from related tables
  (#fields in Ultrasphinx)
- #collect which concatenates several values from related tables using
  complex SQL (#concatenate in Ultrasphinx)
- #conditions (just like Ultrasphinx)

I have assured that the generated Sphinx config file is the same as before, so this
should not give us any surprises.

7 years agoModels that should be searchable should include Gitorious::Search
Marius Mathiesen [Wed, 18 May 2011 07:14:02 +0000 (09:14 +0200)]
Models that should be searchable should include Gitorious::Search

This makes it more explicit which models are searchable. Ultrasphinx is designed so
any ActiveRecord::Base subclass already has an is_indexed method, but now we at least
only inject the method we use explicitly by using include

7 years agoAdding a wrapper around Ultrasphinx: Gitorious::Search
Marius Mathiesen [Mon, 16 May 2011 15:27:17 +0000 (17:27 +0200)]
Adding a wrapper around Ultrasphinx: Gitorious::Search

Change references to ActiveRecord::Base.is_indexed to make_searchable
Will add an adapter for other search engines later.

7 years agoMerge branch 'merge-requests/153'
Christian Johansen [Mon, 16 May 2011 06:22:19 +0000 (08:22 +0200)]
Merge branch 'merge-requests/153'

7 years agoRemove deprecation warnings from Paperclip usage
Rodrigo Rosenfeld Rosas [Sun, 15 May 2011 22:48:48 +0000 (19:48 -0300)]
Remove deprecation warnings from Paperclip usage

7 years agorefactoring: remove vendored paperclip plugin as it was already in Gemfile
Rodrigo Rosenfeld Rosas [Sun, 15 May 2011 22:48:08 +0000 (19:48 -0300)]
refactoring: remove vendored paperclip plugin as it was already in Gemfile

7 years agorefactoring: Replaces vendored will_paginate plugin with its gem
Rodrigo Rosenfeld Rosas [Sat, 14 May 2011 14:13:41 +0000 (11:13 -0300)]
refactoring: Replaces vendored will_paginate plugin with its gem

7 years agorefactoring: Replaces vendored ssl_requirement plugin with its gem
Rodrigo Rosenfeld Rosas [Sat, 14 May 2011 14:01:34 +0000 (11:01 -0300)]
refactoring: Replaces vendored ssl_requirement plugin with its gem

7 years agorefactoring: Replaces vendored exception_notifier plugin its gem
Rodrigo Rosenfeld Rosas [Sat, 14 May 2011 13:40:36 +0000 (10:40 -0300)]
refactoring: Replaces vendored exception_notifier plugin its gem

7 years agorefactoring: Replaces vendored acts_as_taggable_on_steroids plugin with acts-as-tagga...
Rodrigo Rosenfeld Rosas [Sat, 14 May 2011 12:45:00 +0000 (09:45 -0300)]
refactoring: Replaces vendored acts_as_taggable_on_steroids plugin with acts-as-taggable-on gem

7 years agos/administrate/administer/ (more common form)
Jason Woofenden [Sat, 14 May 2011 04:57:30 +0000 (00:57 -0400)]
s/administrate/administer/ (more common form)

7 years agoRemove deprecation warnings from Shoulda
Rodrigo Rosenfeld Rosas [Fri, 13 May 2011 01:08:09 +0000 (22:08 -0300)]
Remove deprecation warnings from Shoulda

7 years agoFix indenting in unit/repository_test.rb
Rodrigo Rosenfeld Rosas [Fri, 13 May 2011 00:57:23 +0000 (21:57 -0300)]
Fix indenting in unit/repository_test.rb

7 years agoFix pt-BR translation
Rodrigo Rosenfeld Rosas [Wed, 11 May 2011 13:33:53 +0000 (10:33 -0300)]
Fix pt-BR translation

7 years agocentos/gitorious-logrotate: add missing git-poller amongservices to restart
COUDER Christian [Mon, 2 May 2011 08:37:48 +0000 (10:37 +0200)]
centos/gitorious-logrotate: add missing git-poller amongservices to restart

git-poller was added to "ubuntu/gitorious-logrotate" in commit
c3e1d675667939e64ced1bb5b541c9042a1d60f8 by Rodrigo Rosenfeld Rosas
on Friday April 29 2011, but it was missing from the corresponding
"centos/gitorious-logrotate".

Signed-off-by: Christian Couder <christian.couder@murex.com>
7 years agogit-ultrasphinx: use GITORIOUS_HOME variable
COUDER Christian [Fri, 29 Apr 2011 16:38:45 +0000 (18:38 +0200)]
git-ultrasphinx: use GITORIOUS_HOME variable

Signed-off-by: Christian Couder <christian.couder@murex.com>
7 years agostomp: cleanup ubuntu init.d script
COUDER Christian [Fri, 29 Apr 2011 16:38:44 +0000 (18:38 +0200)]
stomp: cleanup ubuntu init.d script

Signed-off-by: Christian Couder <christian.couder@murex.com>