gitorious:mainline.git
4 years agoAll repositories have project-space paths
Christian Johansen [Mon, 7 Jan 2013 09:03:57 +0000 (10:03 +0100)]
All repositories have project-space paths

4 years agoMicro test rake task leans on bin/micro-test (DRY)
Christian Johansen [Mon, 7 Jan 2013 09:03:36 +0000 (10:03 +0100)]
Micro test rake task leans on bin/micro-test (DRY)

4 years agoUpdate Resque to the latest version
Marius Mathiesen [Fri, 4 Jan 2013 13:35:00 +0000 (14:35 +0100)]
Update Resque to the latest version

4 years agoMerge branch 'feature/rails3' into next
Christian Johansen [Fri, 4 Jan 2013 09:04:37 +0000 (10:04 +0100)]
Merge branch 'feature/rails3' into next

4 years agoMerge branch 'next' into feature/rails3
Christian Johansen [Fri, 4 Jan 2013 08:32:35 +0000 (09:32 +0100)]
Merge branch 'next' into feature/rails3

Conflicts:
Gemfile
Gemfile.lock
app/helpers/application_helper.rb
app/models/repository.rb
app/views/users/edit.html.erb
config/gitorious.sample.yml
lib/gitorious.rb

4 years agoGuess what: string santization.
Marius Mathiesen [Thu, 3 Jan 2013 11:39:12 +0000 (12:39 +0100)]
Guess what: string santization.

4 years agoFix regression error: re-enable "private" checkbox in repo/new view
Thomas Kjeldahl Nilsson [Thu, 3 Jan 2013 09:14:21 +0000 (10:14 +0100)]
Fix regression error: re-enable "private" checkbox in repo/new view

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 '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 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 agoMerge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3
Christian Johansen [Mon, 17 Dec 2012 13:07:55 +0000 (14:07 +0100)]
Merge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3

4 years agoFix blob routing so Rails doesn't devour suffixes
Christian Johansen [Mon, 17 Dec 2012 13:07:27 +0000 (14:07 +0100)]
Fix blob routing so Rails doesn't devour suffixes

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 agoUnescape event rendering
Marius Mathiesen [Mon, 10 Dec 2012 13:39:06 +0000 (14:39 +0100)]
Unescape event rendering

4 years agoTurns out Users#update did (cough) nothing
Marius Mathiesen [Mon, 10 Dec 2012 11:38:27 +0000 (12:38 +0100)]
Turns out Users#update did (cough) nothing

Now there's a test to prove it too.

4 years agoMake OpenID work again
Marius Mathiesen [Mon, 10 Dec 2012 11:11:43 +0000 (12:11 +0100)]
Make OpenID work again

Gitorious (by courtesy of the gitorious_openid_auth plugin) does not
deal with OpenID directly, we rather put some information into the
Rack environment and give a 401. In order for this to be picked up by
Rack::OpenID we need to insert that middleware into our stack.

4 years agoMake Rails' data-method machinery work
Marius Mathiesen [Mon, 10 Dec 2012 09:26:48 +0000 (10:26 +0100)]
Make Rails' data-method machinery work

In order for custom HTTP methods, we need:
- rails.js (downloaded from https://github.com/rails/jquery-ujs)
- include rails.js inside <head>
- add the csrf_meta_tag to <head>

4 years agoSpeed up commit lookups for merge requests
Marius Mathiesen [Fri, 7 Dec 2012 11:17:28 +0000 (12:17 +0100)]
Speed up commit lookups for merge requests

Before this commit, Gitorious would calculate a commit delta between
two repositories, which takes a long time. Since the source repository
already contains all the commits, we look them up from the same
repository (a straight `git log`), which speeds up the lookup by a
significant factor:

Loading the commits for a merge request introducing a single new
commit changed from ~1100ms to ~100ms on a test machine.

4 years agoMerge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3
Christian Johansen [Thu, 6 Dec 2012 15:25:42 +0000 (16:25 +0100)]
Merge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3

4 years agoFix double render bug in MergeRequest#show
Christian Johansen [Thu, 6 Dec 2012 15:25:34 +0000 (16:25 +0100)]
Fix double render bug in MergeRequest#show

4 years agoPreserve safe HTML
Marius Mathiesen [Thu, 6 Dec 2012 13:33:53 +0000 (14:33 +0100)]
Preserve safe HTML

4 years agoInterpolating strings seems to confuse escaping
Marius Mathiesen [Thu, 6 Dec 2012 12:58:45 +0000 (13:58 +0100)]
Interpolating strings seems to confuse escaping

4 years agoMaking the HTML safe
Marius Mathiesen [Thu, 6 Dec 2012 12:38:35 +0000 (13:38 +0100)]
Making the HTML safe

Monkey-testing my way through this branch, one escaped HTML tag at a
time.

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 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 agoLoad messaging processors safely
Christian Johansen [Wed, 5 Dec 2012 13:28:28 +0000 (14:28 +0100)]
Load messaging processors safely

4 years agoMerge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3
Christian Johansen [Wed, 5 Dec 2012 13:03:00 +0000 (14:03 +0100)]
Merge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3

4 years agoFix messaging configuration
Christian Johansen [Wed, 5 Dec 2012 13:02:46 +0000 (14:02 +0100)]
Fix messaging configuration

4 years agoTune warning for no submodules
Christian Johansen [Wed, 5 Dec 2012 13:01:20 +0000 (14:01 +0100)]
Tune warning for no submodules

4 years agoRemove no longer supported archive links
Marius Mathiesen [Wed, 5 Dec 2012 12:29:59 +0000 (13:29 +0100)]
Remove no longer supported archive links

After this commit, we no longer generate zip links, I cannot find
anywhere to get to those anyway.

Also sanitize output in archive links.

4 years agoUnbreak pushing
Marius Mathiesen [Wed, 5 Dec 2012 11:07:02 +0000 (12:07 +0100)]
Unbreak pushing

The temp variable referenced in data/hooks/messaging.rb had been
replaced by a global

4 years agoNo `cd $GITORIOUS` should be required to run bin/*
Marius Mathiesen [Wed, 5 Dec 2012 10:40:41 +0000 (11:40 +0100)]
No `cd $GITORIOUS` should be required to run bin/*

We need to find Rails.root and chdir there before requiring
files. This has been done by the time we enter #load_config, so we'll
do it there.

4 years agoMake error_messages not output unescaped markup
Marius Mathiesen [Wed, 5 Dec 2012 09:58:32 +0000 (10:58 +0100)]
Make error_messages not output unescaped markup

4 years agoAdd initializer to notify users of missing submodules
Christian Johansen [Tue, 4 Dec 2012 12:26:52 +0000 (13:26 +0100)]
Add initializer to notify users of missing submodules

4 years agoLoad environment properly for bin/*
Christian Johansen [Tue, 4 Dec 2012 12:15:39 +0000 (13:15 +0100)]
Load environment properly for bin/*

4 years agoCorrectly load environment
Christian Johansen [Tue, 4 Dec 2012 12:05:05 +0000 (13:05 +0100)]
Correctly load environment

4 years agoMerge branch 'next' into feature/rails3
Christian Johansen [Tue, 4 Dec 2012 10:26:01 +0000 (11:26 +0100)]
Merge branch 'next' into feature/rails3

Conflicts:
app/helpers/searches_helper.rb
data/hooks/messaging.rb
db/schema.rb
lib/gitorious.rb
test/functional/admin/repositories_controller_test.rb
test/functional/searches_controller_test.rb

4 years agoToken searches helper
Christian Johansen [Tue, 4 Dec 2012 10:07:08 +0000 (11:07 +0100)]
Token searches helper

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 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 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 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'

4 years agoGitorious 2.4.0 v2.4.0
Marius Mathiesen [Mon, 26 Nov 2012 11:52:38 +0000 (12:52 +0100)]
Gitorious 2.4.0

4 years agoMore sanitization in search results
Marius Mathiesen [Mon, 26 Nov 2012 11:09:57 +0000 (12:09 +0100)]
More sanitization in search results

4 years agoTruncate and sanitize description
Marius Mathiesen [Mon, 26 Nov 2012 11:04:46 +0000 (12:04 +0100)]
Truncate and sanitize description

4 years agoDon't pass search query as an option to ThinkingSphinx
Marius Mathiesen [Mon, 26 Nov 2012 10:55:37 +0000 (11:55 +0100)]
Don't pass search query as an option to ThinkingSphinx

4 years agoWrap search results in a presenter
Marius Mathiesen [Mon, 26 Nov 2012 10:41:27 +0000 (11:41 +0100)]
Wrap search results in a presenter

Using implicit partials doesn't work really well with more search
results.

Not searching comments, since there's no easy way to build a link for it.

4 years agoThinkingSphinx </3 WillPaginate
Marius Mathiesen [Mon, 26 Nov 2012 08:52:57 +0000 (09:52 +0100)]
ThinkingSphinx </3 WillPaginate

Feeding a ThinkingSphinx::Search to WillPaginate::Collection ends up
with WP::Collection#replace not working. I suppose the "magic"
involved as coupled a wee bit too tightly with implementation details
outside WP's control.

4 years agoUpdate install scripts
Christian Johansen [Fri, 23 Nov 2012 13:49:33 +0000 (14:49 +0100)]
Update install scripts

4 years agoWillPaginate doesn't work with Thinking Sphinx
Marius Mathiesen [Fri, 23 Nov 2012 13:49:23 +0000 (14:49 +0100)]
WillPaginate doesn't work with Thinking Sphinx

4 years agoRe-introduce bin/console
Marius Mathiesen [Fri, 23 Nov 2012 11:13:05 +0000 (12:13 +0100)]
Re-introduce bin/console

4 years agoRead host and port from config when checking if site is up
Marius Mathiesen [Wed, 21 Nov 2012 12:59:51 +0000 (13:59 +0100)]
Read host and port from config when checking if site is up

4 years agoMerge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3
Marius Mathiesen [Wed, 21 Nov 2012 12:30:16 +0000 (13:30 +0100)]
Merge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3

4 years agoMake diagnostics account for remote services
Marius Mathiesen [Wed, 21 Nov 2012 12:30:12 +0000 (13:30 +0100)]
Make diagnostics account for remote services

Add isolation for controller tests (Gitorious::Diagnostics::Test is
included instead of Gitorious::Diagnostics)

4 years agoNo more deferred tests
Christian Johansen [Wed, 21 Nov 2012 12:23:01 +0000 (13:23 +0100)]
No more deferred tests

  - Fix and undefer
  - Remove a couple that no longer applies

4 years agoMerge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3
Christian Johansen [Wed, 21 Nov 2012 11:32:47 +0000 (12:32 +0100)]
Merge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3

4 years agobranch_and_path param is now a string
Christian Johansen [Wed, 21 Nov 2012 11:32:15 +0000 (12:32 +0100)]
branch_and_path param is now a string

  - This changed with the routing

4 years agoRename an index which would be invalid in Postgres
Marius Mathiesen [Wed, 21 Nov 2012 09:50:38 +0000 (10:50 +0100)]
Rename an index which would be invalid in Postgres

Postgres only allows indices with a name of < 60 characters.  This
commit creates a migration which renames the index for existing
installations and generates a schema.rb which works with db:setup for
Postgres.

4 years agoMerge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3
Christian Johansen [Wed, 21 Nov 2012 09:27:24 +0000 (10:27 +0100)]
Merge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3

4 years agoAdd big fat warning if attempting to run Gitorious on wrong Ruby version
Christian Johansen [Wed, 21 Nov 2012 09:26:40 +0000 (10:26 +0100)]
Add big fat warning if attempting to run Gitorious on wrong Ruby version

4 years agoStart work on supporting PostgreSQL
Marius Mathiesen [Wed, 21 Nov 2012 08:36:40 +0000 (09:36 +0100)]
Start work on supporting PostgreSQL

- Adding pg to Gemfile
- Get rid of some Mysql-isms

There are still a few things missing, but feel free to have a look and
submit patches. In order to get started, you will need to do a
temporary change to db/schema.rb: rename any indexes that have a name
with > 60 characters.

4 years agobranch_and_path is now a string
Christian Johansen [Tue, 20 Nov 2012 14:14:41 +0000 (15:14 +0100)]
branch_and_path is now a string

4 years agoImproved setup script and docs
Christian Johansen [Tue, 20 Nov 2012 14:07:28 +0000 (15:07 +0100)]
Improved setup script and docs

4 years agoUbuntu setup script
Christian Johansen [Tue, 20 Nov 2012 13:39:12 +0000 (14:39 +0100)]
Ubuntu setup script

4 years agoMerge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3
Christian Johansen [Tue, 20 Nov 2012 13:33:34 +0000 (14:33 +0100)]
Merge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3

4 years agoTweak install scripts
Christian Johansen [Tue, 20 Nov 2012 13:33:17 +0000 (14:33 +0100)]
Tweak install scripts

4 years agoAdd documentation for controlling Sphinx
Marius Mathiesen [Tue, 20 Nov 2012 13:20:55 +0000 (14:20 +0100)]
Add documentation for controlling Sphinx

4 years agoAdd a control script for the search engine
Marius Mathiesen [Tue, 20 Nov 2012 13:06:47 +0000 (14:06 +0100)]
Add a control script for the search engine

4 years agoEnvironment is optional
Christian Johansen [Tue, 20 Nov 2012 13:03:33 +0000 (14:03 +0100)]
Environment is optional

4 years agoBetter install scripts
Christian Johansen [Tue, 20 Nov 2012 12:50:50 +0000 (13:50 +0100)]
Better install scripts

4 years agoMerge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3
Christian Johansen [Tue, 20 Nov 2012 12:26:56 +0000 (13:26 +0100)]
Merge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3

4 years agoTune CentOS dev setup script
Christian Johansen [Tue, 20 Nov 2012 12:22:28 +0000 (13:22 +0100)]
Tune CentOS dev setup script

4 years agoTune configuration
Christian Johansen [Tue, 20 Nov 2012 12:22:11 +0000 (13:22 +0100)]
Tune configuration

4 years agoMake commits#feed cacheable
Marius Mathiesen [Tue, 20 Nov 2012 11:51:30 +0000 (12:51 +0100)]
Make commits#feed cacheable

4 years agoAvoid potential nil in hooks messaging configuration
Christian Johansen [Tue, 20 Nov 2012 09:28:51 +0000 (10:28 +0100)]
Avoid potential nil in hooks messaging configuration

4 years agoMerge branch 'next' into feature/rails3
Christian Johansen [Tue, 20 Nov 2012 09:07:11 +0000 (10:07 +0100)]
Merge branch 'next' into feature/rails3

Conflicts:
test/unit/team_test.rb

4 years agoFix typo in config sample
Christian Johansen [Tue, 20 Nov 2012 08:52:08 +0000 (09:52 +0100)]
Fix typo in config sample

4 years agoImproved configuration upgrade script
Christian Johansen [Tue, 20 Nov 2012 07:18:02 +0000 (08:18 +0100)]
Improved configuration upgrade script

4 years agoUpgrade instructions and script
Christian Johansen [Mon, 19 Nov 2012 14:58:49 +0000 (15:58 +0100)]
Upgrade instructions and script

4 years agoThe GitoriousConfig constant is dead
Christian Johansen [Mon, 19 Nov 2012 13:36:11 +0000 (14:36 +0100)]
The GitoriousConfig constant is dead

  - Long live the GitoriousConfig constant

4 years agoUnescape favicon
Christian Johansen [Mon, 19 Nov 2012 12:28:39 +0000 (13:28 +0100)]
Unescape favicon

4 years agoMove Team configuration to after_initialize
Christian Johansen [Mon, 19 Nov 2012 10:14:35 +0000 (11:14 +0100)]
Move Team configuration to after_initialize

4 years agoAdditional view paths
Christian Johansen [Mon, 19 Nov 2012 09:06:32 +0000 (10:06 +0100)]
Additional view paths

4 years agoClean up sample configuration
Christian Johansen [Mon, 19 Nov 2012 08:59:52 +0000 (09:59 +0100)]
Clean up sample configuration

4 years agoenable_ldap_authorization setting
Christian Johansen [Mon, 19 Nov 2012 08:56:29 +0000 (09:56 +0100)]
enable_ldap_authorization setting

4 years agoFully configure SSH daemon
Christian Johansen [Mon, 19 Nov 2012 08:55:46 +0000 (09:55 +0100)]
Fully configure SSH daemon

4 years agoAccess more configuration settings through the new system
Christian Johansen [Mon, 19 Nov 2012 08:54:52 +0000 (09:54 +0100)]
Access more configuration settings through the new system

4 years agoRename hide_git_clone_urls -> enable_git_daemon
Christian Johansen [Mon, 19 Nov 2012 08:09:52 +0000 (09:09 +0100)]
Rename hide_git_clone_urls -> enable_git_daemon

4 years agoSanitize access of system_message config
Christian Johansen [Mon, 19 Nov 2012 08:01:19 +0000 (09:01 +0100)]
Sanitize access of system_message config