gitorious:mainline.git
4 years agoChange GitShell#graph_log to allow refs with dots
Christian Johansen [Tue, 12 Mar 2013 09:41:29 +0000 (10:41 +0100)]
Change GitShell#graph_log to allow refs with dots

  - Explicitly accept ref as a last parameter
  - Don't sanitize safe arguments (i.e. hardcoded arguments)
  - Use Shellwords to sanitize user input/ref

Conflicts:
lib/gitorious/git_shell.rb
test/functional/api/graphs_controller_test.rb

4 years agoVersion bump
Marius Mathiesen [Wed, 6 Mar 2013 08:59:30 +0000 (09:59 +0100)]
Version bump

4 years agoEtc is not available by default
Christian Johansen [Tue, 5 Mar 2013 21:33:32 +0000 (22:33 +0100)]
Etc is not available by default

4 years agoBug: Custom hooks when GitoriousConfig is loaded
Christian Johansen [Tue, 5 Mar 2013 21:32:33 +0000 (22:32 +0100)]
Bug: Custom hooks when GitoriousConfig is loaded

If GitoriousConfig was already loaded when the hooks fired, then
CustomHook would attempt to access GitoriousConfig[env] which is
senseless, because GitoriousConfig only contains configuration for a
given environment.

4 years agoBump version number v2.4.10
Marius Mathiesen [Mon, 4 Mar 2013 08:33:35 +0000 (09:33 +0100)]
Bump version number

4 years agoFix failing test
Marius Mathiesen [Mon, 4 Mar 2013 08:31:54 +0000 (09:31 +0100)]
Fix failing test

4 years agoDescribe configurable custom hooks in sample hooks
Christian Johansen [Fri, 1 Mar 2013 10:10:05 +0000 (11:10 +0100)]
Describe configurable custom hooks in sample hooks

4 years agoDocument custom hooks in gitorious.yml.sample
Christian Johansen [Fri, 1 Mar 2013 10:09:52 +0000 (11:09 +0100)]
Document custom hooks in gitorious.yml.sample

4 years agobin/gitorious cleanup
Christian Johansen [Thu, 28 Feb 2013 20:51:10 +0000 (21:51 +0100)]
bin/gitorious cleanup

  - Use Pathname to clean up load path management
  - Export GITORIOUS_GIT_CLONE_URL and GITORIOUS_SSH_CLONE_URL

4 years agoRead custom hook configuration from correct env
Christian Johansen [Thu, 28 Feb 2013 14:51:46 +0000 (15:51 +0100)]
Read custom hook configuration from correct env

4 years agoMake sure sync messaging adapter accepts pushes
Christian Johansen [Thu, 28 Feb 2013 14:08:50 +0000 (15:08 +0100)]
Make sure sync messaging adapter accepts pushes

Conflicts:
lib/gitorious/messaging/sync_adapter.rb

4 years agoMake custom hooks work properly for Gitorious 2
Christian Johansen [Thu, 28 Feb 2013 14:23:50 +0000 (15:23 +0100)]
Make custom hooks work properly for Gitorious 2

4 years agoConfigurable custom hooks
Christian Johansen [Thu, 28 Feb 2013 14:08:20 +0000 (15:08 +0100)]
Configurable custom hooks

  - Read custom hook script names from the configuration file
  - Refactor custom hooks to reduce duplication

Conflicts:
data/hooks/pre-receive

4 years agoUpdate Centos init scripts for Sphinx
Marius Mathiesen [Thu, 28 Feb 2013 13:31:38 +0000 (14:31 +0100)]
Update Centos init scripts for Sphinx

Ultrasphinx is history, say hello to Thinking Sphinx.

4 years agoFix layout on system message
Marius Mathiesen [Thu, 28 Feb 2013 10:32:56 +0000 (11:32 +0100)]
Fix layout on system message

Move it to the top of the page, make it span the entire window horizontally

4 years agoAllow mass assignment of merge request statuses
Christian Johansen [Wed, 27 Feb 2013 09:09:06 +0000 (10:09 +0100)]
Allow mass assignment of merge request statuses

  - Fixes regression where new merge request statuses could no longer be
    created from the UI

4 years agoProject XML output includes repositories again
Christian Johansen [Wed, 27 Feb 2013 08:51:25 +0000 (09:51 +0100)]
Project XML output includes repositories again

  - Repositories was removed from the default XML output from projects
    when private repositories where implemented. An XML serializer for
    projects brings them back again.

4 years agoExpose User#avatar for mass-assignment
Marius Mathiesen [Tue, 26 Feb 2013 12:47:24 +0000 (13:47 +0100)]
Expose User#avatar for mass-assignment

This resolves a bug where a user's avatar wasn't updated after we
introduced white-listing of model attributes a few weeks back.

4 years agoUser#public_email should be assignable
Christian Johansen [Mon, 25 Feb 2013 09:08:10 +0000 (10:08 +0100)]
User#public_email should be assignable

  - Fixes bug where "public email" option in UI didn't do anything

4 years agoFix the issue with duplicate merge request versions
Marius Mathiesen [Wed, 20 Feb 2013 12:35:46 +0000 (13:35 +0100)]
Fix the issue with duplicate merge request versions

When creating a new merge request, a separate processor will ensure
the tracking repository exists and create a new version for the merge
request. This causes another push to occur (since doing git push will
trigger those), and the push processor would intercept this push and
create a version.

With this change, the push processor will only process merge request
updates, not deletions (it didn't before this change) and creations.

Bugs like these are hard to find...

4 years agoGet Bane over HTTP
Christian Johansen [Wed, 20 Feb 2013 08:48:48 +0000 (09:48 +0100)]
Get Bane over HTTP

4 years agoTrigger hooks if there only are global hooks too
Christian Johansen [Fri, 15 Feb 2013 14:04:45 +0000 (15:04 +0100)]
Trigger hooks if there only are global hooks too

4 years agoMerge commit 'refs/merge-requests/2252' of gitorious.org:gitorious/mainline into...
Christian Johansen [Fri, 15 Feb 2013 13:59:12 +0000 (14:59 +0100)]
Merge commit 'refs/merge-requests/2252' of gitorious.org:gitorious/mainline into merge-requests/2252

4 years agoMerge branch 'merge-requests/2238' into 2.x-stable
Christian Johansen [Fri, 15 Feb 2013 12:28:59 +0000 (13:28 +0100)]
Merge branch 'merge-requests/2238' into 2.x-stable

4 years agoUpgrade authorization lookup in global hooks
Christian Johansen [Fri, 15 Feb 2013 12:28:36 +0000 (13:28 +0100)]
Upgrade authorization lookup in global hooks

4 years agoAdded support for global web hooks
John VanderPol [Thu, 26 Jan 2012 19:47:58 +0000 (13:47 -0600)]
Added support for global web hooks

4 years agoFix test errors in flaky tests
Christian Johansen [Fri, 15 Feb 2013 12:20:30 +0000 (13:20 +0100)]
Fix test errors in flaky tests

4 years agoMake bin/bundle work
Marius Mathiesen [Fri, 15 Feb 2013 11:36:11 +0000 (12:36 +0100)]
Make bin/bundle work

Previously, all commands in bin/ would require all gems in the Gemfile
to be installed. This doesn't make a lot of sense for bin/bundle.

The updated bin/bundle can be used to install gems:
- it's callable from anywhere on the file system
- it will change gid/uid to the right user
- it will set up the correct Rails.env

/path/to/gitorious/bin/bundle install now works.

4 years agoUse git group if available
Marius Mathiesen [Fri, 15 Feb 2013 11:27:55 +0000 (12:27 +0100)]
Use git group if available

If the git user's primary group isn't "git", but the "git" group is
available, look up the gid for that group for scripts in bin/.

4 years agoUp version v2.4.9
Christian Johansen [Wed, 13 Feb 2013 13:50:31 +0000 (14:50 +0100)]
Up version

4 years agoAllow mass-assignment of new projects
Christian Johansen [Wed, 13 Feb 2013 13:03:13 +0000 (14:03 +0100)]
Allow mass-assignment of new projects

4 years agoInclude a "spacer" to avoid JS concatenation bugs
Christian Johansen [Tue, 12 Feb 2013 22:12:36 +0000 (23:12 +0100)]
Include a "spacer" to avoid JS concatenation bugs

4 years agoUp version v2.4.8
Christian Johansen [Tue, 12 Feb 2013 09:45:48 +0000 (10:45 +0100)]
Up version

4 years agoUpgrade JSON
Christian Johansen [Tue, 12 Feb 2013 09:39:19 +0000 (10:39 +0100)]
Upgrade JSON

  - Addresses CVE-2013-0269

4 years agoUpgrade Rails
Christian Johansen [Tue, 12 Feb 2013 09:27:11 +0000 (10:27 +0100)]
Upgrade Rails

  - Addresses CVE-2013-0276

  - Addresses CVE-2013-0277

4 years agoChange attr_protected to attr_accessible
Christian Johansen [Tue, 12 Feb 2013 08:43:42 +0000 (09:43 +0100)]
Change attr_protected to attr_accessible

  - White-listing scales better than black-listing
  - Avoids vulnerability CVE-2013-0276

Backported from Gitorious 3

Conflicts:
app/models/email.rb
app/models/group.rb
app/models/site.rb
app/models/user.rb
test/unit/project_test.rb
test/unit/user_test.rb

4 years agoOptionally restrict team creation to site admins
Marius Mathiesen [Mon, 11 Feb 2013 13:45:10 +0000 (14:45 +0100)]
Optionally restrict team creation to site admins

By specifying in config/gitorious.yml:

  only_site_admins_can_create_teams: true

only site admin users will be allowed to create teams.  This will hide
the "new team" links from the UI and enforce this restriction in
controllers.

4 years agoSupport disabling OpenID authentication
Marius Mathiesen [Mon, 11 Feb 2013 12:53:51 +0000 (13:53 +0100)]
Support disabling OpenID authentication

This is achieved by adding to config/authentication.yml:
  enable_openid: false

In doing so, the openid login form won't be displayed, and the
sessions controller refuses OpenID authentication

4 years agoLink to full project/tracker/forum URLs
Christian Johansen [Mon, 11 Feb 2013 08:53:42 +0000 (09:53 +0100)]
Link to full project/tracker/forum URLs

  - Add nofollow
  - Remove URI.parse which failed for IRIs (which are supported at
    create-time)

4 years agoUpdate to Rack 1.1.6
Marius Mathiesen [Fri, 8 Feb 2013 08:22:40 +0000 (09:22 +0100)]
Update to Rack 1.1.6

4 years agoGitorious 2.4.7 v2.4.7
Marius Mathiesen [Wed, 6 Feb 2013 08:21:47 +0000 (09:21 +0100)]
Gitorious 2.4.7

4 years agoOnly allow strings as password key.
Marius Mathiesen [Wed, 6 Feb 2013 07:59:37 +0000 (08:59 +0100)]
Only allow strings as password key.

4 years agoUse ps -efww rather than ps -ef 2252
Peter Kjellerstedt [Fri, 1 Feb 2013 09:56:52 +0000 (10:56 +0100)]
Use ps -efww rather than ps -ef

Without this atleast_one_process_name_matching() may fail to identify a
running process since ps will only output the first 80 characters of
information per line, and the string being searched for may be outside
of them.

This caused one unit test to fail for me:

test: Self-diagnostics should detect if any current ps entry contains
given string. (DiagnosticsTest)

4 years agoUpdate Capillary and its dependencies
Christian Johansen [Thu, 31 Jan 2013 09:59:10 +0000 (10:59 +0100)]
Update Capillary and its dependencies

  - Gets rid of deprecated dependency buster-core

Conflicts:
.gitmodules

4 years agoMerge remote-tracking branch 'refs/remotes/origin/227' into merge-requests/227
Christian Johansen [Wed, 30 Jan 2013 09:17:00 +0000 (10:17 +0100)]
Merge remote-tracking branch 'refs/remotes/origin/227' into merge-requests/227

Conflicts:
Gemfile

4 years agoMerge remote-tracking branch 'gitorious/master'
Thomas Kjeldahl Nilsson [Tue, 29 Jan 2013 13:42:20 +0000 (14:42 +0100)]
Merge remote-tracking branch 'gitorious/master'

4 years agoMerge branch '2.x-stable'
Christian Johansen [Tue, 29 Jan 2013 08:20:02 +0000 (09:20 +0100)]
Merge branch '2.x-stable'

4 years agoGitorious 2.4.6 v2.4.6
Christian Johansen [Tue, 29 Jan 2013 08:17:05 +0000 (09:17 +0100)]
Gitorious 2.4.6

This releases fixes vulnerability CVE-2013-0333

4 years agoTrailing white-space: Do not want
Christian Johansen [Tue, 29 Jan 2013 08:13:05 +0000 (09:13 +0100)]
Trailing white-space: Do not want

4 years agoUpgrade to Rails 2.3.16
Christian Johansen [Tue, 29 Jan 2013 08:12:53 +0000 (09:12 +0100)]
Upgrade to Rails 2.3.16

  - Addresses critical security vulnerability in Rails

4 years agoUse the official Rails repo for 2.3-stable
Christian Johansen [Thu, 24 Jan 2013 09:13:40 +0000 (10:13 +0100)]
Use the official Rails repo for 2.3-stable

4 years agoDepend on community fork of Rails 2
Christian Johansen [Tue, 22 Jan 2013 17:58:27 +0000 (18:58 +0100)]
Depend on community fork of Rails 2

4 years agoMerge branch '2.x-stable'
Marius Mathiesen [Fri, 18 Jan 2013 09:30:00 +0000 (10:30 +0100)]
Merge branch '2.x-stable'

4 years agoSupply the csrf token in <head>, pass it along on xhrs
Marius Mathiesen [Fri, 18 Jan 2013 09:29:25 +0000 (10:29 +0100)]
Supply the csrf token in <head>, pass it along on xhrs

This resolves issue #149, which would cause users to receive a 406
when doing AJAX requests and be logged out in the process.

4 years agoMerge branch '2.x-stable' 228
Marius Mathiesen [Wed, 9 Jan 2013 09:00:08 +0000 (10:00 +0100)]
Merge branch '2.x-stable'

4 years agoGitorious 2.4.5 show v2.4.5
Marius Mathiesen [Wed, 9 Jan 2013 07:53:01 +0000 (08:53 +0100)]
Gitorious 2.4.5

This release fixes the vulnerability CVE-2013-0156.

4 years agoRevert "Revert "Support a remote redis server when sending messages on push""
Marius Mathiesen [Wed, 9 Jan 2013 07:44:27 +0000 (08:44 +0100)]
Revert "Revert "Support a remote redis server when sending messages on push""

This reverts commit 4175022f92b174240eb08807e288d01edec73cca.

4 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Thomas Kjeldahl Nilsson [Tue, 8 Jan 2013 21:03:16 +0000 (22:03 +0100)]
Merge branch 'master' of gitorious.org:gitorious/mainline

4 years agoShow "(suspended)" for non-active users
Peter Kjellerstedt [Mon, 2 Apr 2012 10:34:28 +0000 (12:34 +0200)]
Show "(suspended)" for non-active users

4 years agoDo not use Content-Disposition: attachment for raw blobs
Peter Kjellerstedt [Fri, 20 Apr 2012 08:07:30 +0000 (10:07 +0200)]
Do not use Content-Disposition: attachment for raw blobs

This should make it possible to view documents directly via the
Gitorious web interface.

4 years agoAllow max render and download size of blobs to be configured
Peter Kjellerstedt [Thu, 21 Jun 2012 08:26:56 +0000 (10:26 +0200)]
Allow max render and download size of blobs to be configured

4 years agoRevert "Support a remote redis server when sending messages on push"
Marius Mathiesen [Thu, 29 Nov 2012 13:05:20 +0000 (14:05 +0100)]
Revert "Support a remote redis server when sending messages on push"

This should be on next

This reverts commit aeeeec5bc567e41ae7ea6c660cd8d6669da215d0.

4 years agoMerge branch '2.x-stable'
Marius Mathiesen [Tue, 8 Jan 2013 11:38:30 +0000 (12:38 +0100)]
Merge branch '2.x-stable'

4 years agoFix double rendering of comments.
Marius Mathiesen [Tue, 8 Jan 2013 11:16:17 +0000 (12:16 +0100)]
Fix double rendering of comments.

4 years agoMake the "Getting started" box fill the full width 227
Peter Kjellerstedt [Fri, 9 Jul 2010 09:54:20 +0000 (11:54 +0200)]
Make the "Getting started" box fill the full width

This allows more room for long URLs, and it makes the Activites header
that is supposed to be below the box to actually end up there rather
than to the right of the box...

4 years agoCorrect the URL to the official Git site
Peter Kjellerstedt [Tue, 8 Jan 2013 08:54:06 +0000 (09:54 +0100)]
Correct the URL to the official Git site

4 years agoUse correct sphinx syntax in generated "Popular Labels" links
Peter Kjellerstedt [Mon, 7 Jan 2013 15:37:02 +0000 (16:37 +0100)]
Use correct sphinx syntax in generated "Popular Labels" links

4 years agoAvoid unnecessary output from rake mirror:symlinkedrepos
Peter Kjellerstedt [Fri, 30 Nov 2012 11:13:40 +0000 (12:13 +0100)]
Avoid unnecessary output from rake mirror:symlinkedrepos

4 years agoMake sure bundle installs the rdoc gem
Peter Kjellerstedt [Fri, 30 Nov 2012 10:42:23 +0000 (11:42 +0100)]
Make sure bundle installs the rdoc gem

4 years agoCorrect a typo
Peter Kjellerstedt [Fri, 11 Nov 2011 08:14:33 +0000 (09:14 +0100)]
Correct a typo

4 years agoChange ssl_required to scheme_required to lessen confusion
Peter Kjellerstedt [Fri, 11 Nov 2011 08:13:51 +0000 (09:13 +0100)]
Change ssl_required to scheme_required to lessen confusion

4 years agoUpgrade existing permissions when changing owner of repository
Marius Mathiesen [Wed, 2 Jan 2013 10:02:49 +0000 (11:02 +0100)]
Upgrade existing permissions when changing owner of repository

This resolves issue #144.

4 years agoMerge branch 'next', remote-tracking branch 'gitorious/next'
Thomas Kjeldahl Nilsson [Thu, 27 Dec 2012 10:03:56 +0000 (11:03 +0100)]
Merge branch 'next', remote-tracking branch 'gitorious/next'

4 years agoMerge branch 'release/2.4.4' into next
Marius Mathiesen [Fri, 21 Dec 2012 13:19:46 +0000 (14:19 +0100)]
Merge branch 'release/2.4.4' into next

4 years agoMerge branch 'release/2.4.4'
Marius Mathiesen [Fri, 21 Dec 2012 13:17:58 +0000 (14:17 +0100)]
Merge branch 'release/2.4.4'

4 years agoGitorious 2.4.4 v2.4.4
Marius Mathiesen [Fri, 21 Dec 2012 13:17:50 +0000 (14:17 +0100)]
Gitorious 2.4.4

4 years agoUpgrade Paperclip dependency to fix failing avatars
Marius Mathiesen [Fri, 21 Dec 2012 13:17:06 +0000 (14:17 +0100)]
Upgrade Paperclip dependency to fix failing avatars

A bug in cocaine, required from paperclip, caused attachments to fail

Reference: https://github.com/thoughtbot/paperclip/issues/1038

4 years agoFix link to missing translation
Marius Mathiesen [Fri, 21 Dec 2012 13:09:14 +0000 (14:09 +0100)]
Fix link to missing translation

4 years agoFix a misleading comment in gitorious.sample.yml
Marius Mathiesen [Thu, 13 Dec 2012 13:48:24 +0000 (14:48 +0100)]
Fix a misleading comment in gitorious.sample.yml

4 years agoUse correct sphinx syntax in generated tag links
Marius Mathiesen [Wed, 12 Dec 2012 08:33:49 +0000 (09:33 +0100)]
Use correct sphinx syntax in generated tag links

4 years agoTrying to bust the cache
Thomas Kjeldahl Nilsson [Tue, 11 Dec 2012 08:39:19 +0000 (09:39 +0100)]
Trying to bust the cache

4 years agoMerge branch 'release/2.4.3' into next
Marius Mathiesen [Thu, 6 Dec 2012 09:46:21 +0000 (10:46 +0100)]
Merge branch 'release/2.4.3' into next

4 years agoMerge branch 'release/2.4.3'
Marius Mathiesen [Thu, 6 Dec 2012 09:44:10 +0000 (10:44 +0100)]
Merge branch 'release/2.4.3'

4 years agoGitorious 2.4.3 v2.4.3
Marius Mathiesen [Thu, 6 Dec 2012 09:43:43 +0000 (10:43 +0100)]
Gitorious 2.4.3

4 years agoAdd an index of feed_items' event_id column
Marius Mathiesen [Fri, 30 Nov 2012 09:59:56 +0000 (10:59 +0100)]
Add an index of feed_items' event_id column

This will speed up the lookups eg. when destroying projects

4 years agoSupport a remote redis server when sending messages on push
Marius Mathiesen [Thu, 29 Nov 2012 13:04:32 +0000 (14:04 +0100)]
Support a remote redis server when sending messages on push

Since .hooks/messaging doesn't spawn a full Rails environment,
config/resque.yml is not read and a local Redis connection is assumed.

4 years agoRevert "Support a remote redis server when sending messages on push"
Marius Mathiesen [Thu, 29 Nov 2012 13:05:20 +0000 (14:05 +0100)]
Revert "Support a remote redis server when sending messages on push"

This should be on next

This reverts commit aeeeec5bc567e41ae7ea6c660cd8d6669da215d0.

4 years agoSupport a remote redis server when sending messages on push
Marius Mathiesen [Thu, 29 Nov 2012 13:04:32 +0000 (14:04 +0100)]
Support a remote redis server when sending messages on push

Since .hooks/messaging doesn't spawn a full Rails environment,
config/resque.yml is not read and a local Redis connection is assumed.

4 years agoRe-enable re-posting of repo creation messages
Marius Mathiesen [Wed, 28 Nov 2012 11:17:56 +0000 (12:17 +0100)]
Re-enable re-posting of repo creation messages

Posting the creation message for a repository lives in
RepositoryBuilder now, this fact was not caught by the tests which for
some reason (I probably wrote it so it's ok for me to say this) was
mocked. Posting a message to the (test) queue is not a destructive
action.

4 years agoRe-introduce keyword search
Marius Mathiesen [Wed, 28 Nov 2012 10:31:16 +0000 (11:31 +0100)]
Re-introduce keyword search

Thinking sphinx doesn't support Ultrasphinx' "key: value" searching,
but rather leans on Sphinx itself: "@key value".

This requires using :match_mode => :extended when searching, which is
the main change introduced by this commit. Also update func test and
search suggestions in UI.

4 years agoMerge branch 'release/2.4.2' into next
Marius Mathiesen [Tue, 27 Nov 2012 13:49:15 +0000 (14:49 +0100)]
Merge branch 'release/2.4.2' into next

4 years agoMerge branch 'release/2.4.2' tmptag
Marius Mathiesen [Tue, 27 Nov 2012 13:48:54 +0000 (14:48 +0100)]
Merge branch 'release/2.4.2'

4 years agoGitorious 2.4.2 v2.4.2
Marius Mathiesen [Tue, 27 Nov 2012 13:48:42 +0000 (14:48 +0100)]
Gitorious 2.4.2

4 years agoFix Projects#edit with custom MR states
Marius Mathiesen [Tue, 27 Nov 2012 13:47:44 +0000 (14:47 +0100)]
Fix Projects#edit with custom MR states

This error would cause Projects#edit to fail if there are custom merge
request states for the project.

Again caused by a bug in Rails:

https://rails.lighthouseapp.com/projects/8994/tickets/4707-accepts_nested_attributes_for-_delete-feature-broken-in-rails-238

4 years agoMerge branch 'hotfix/2.4.1' into next
Marius Mathiesen [Mon, 26 Nov 2012 16:09:53 +0000 (17:09 +0100)]
Merge branch 'hotfix/2.4.1' into next

4 years agoMerge branch 'hotfix/2.4.1'
Marius Mathiesen [Mon, 26 Nov 2012 16:09:32 +0000 (17:09 +0100)]
Merge branch 'hotfix/2.4.1'

4 years agoFirst bugfix release: 2.4.1 v2.4.1
Marius Mathiesen [Mon, 26 Nov 2012 16:09:13 +0000 (17:09 +0100)]
First bugfix release: 2.4.1

A bug in a Ruby file referenced from our hooks would stop pushing from
functioning properly.

Thanks a lot to Steffen Forkmann for reporting this.

4 years agoFix an error preventing push from working properly
Marius Mathiesen [Mon, 26 Nov 2012 16:04:57 +0000 (17:04 +0100)]
Fix an error preventing push from working properly

- the load path in data/hooks/messaging.rb was set up incorrectly
- referering Rails.env and Rails.root in said file doesn't work without
  converting to a proper string first

4 years agoMerge branch 'release/2.4.0' into next
Marius Mathiesen [Mon, 26 Nov 2012 12:02:04 +0000 (13:02 +0100)]
Merge branch 'release/2.4.0' into next

4 years agoMerge branch 'release/2.4.0'
Marius Mathiesen [Mon, 26 Nov 2012 12:01:59 +0000 (13:01 +0100)]
Merge branch 'release/2.4.0'