gitorious:bclow-gitorious.git
5 years agoFix test setup
Christian Johansen [Tue, 5 Mar 2013 06:46:20 +0000 (07:46 +0100)]
Fix test setup

5 years agoMove finders to dedicated app/finders
Christian Johansen [Tue, 5 Mar 2013 06:46:11 +0000 (07:46 +0100)]
Move finders to dedicated app/finders

5 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

5 years agobin/gitorious cleanup
Christian Johansen [Thu, 28 Feb 2013 20:32:30 +0000 (21:32 +0100)]
bin/gitorious cleanup

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

5 years agoFix example in documentation
Christian Johansen [Thu, 28 Feb 2013 14:09:02 +0000 (15:09 +0100)]
Fix example in documentation

5 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

5 years agoAdd custom hook test
Christian Johansen [Thu, 28 Feb 2013 14:08:35 +0000 (15:08 +0100)]
Add custom hook test

5 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

5 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.

5 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

Conflicts:
app/views/layouts/application.html.erb

5 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

5 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.

5 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.

5 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

5 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...

Conflicts:
test/unit/processors/push_processor_test.rb

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

5 years agoCall renamed method
Christian Johansen [Tue, 19 Feb 2013 13:37:21 +0000 (14:37 +0100)]
Call renamed method

5 years agoCompletely remove OpenID from UI if disabled
Christian Johansen [Fri, 15 Feb 2013 14:43:27 +0000 (15:43 +0100)]
Completely remove OpenID from UI if disabled

5 years agoAdd configuration option: enable_registrations
Christian Johansen [Fri, 15 Feb 2013 14:24:24 +0000 (15:24 +0100)]
Add configuration option: enable_registrations

  - Based on original work by "deltachaos":
    https://gitorious.org/gitorious/mainline/merge_requests/2246

5 years agoSend exception mails from the sender email address
Christian Johansen [Fri, 15 Feb 2013 14:08:24 +0000 (15:08 +0100)]
Send exception mails from the sender email address

5 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

5 years agoUse ps -efww rather than ps -ef
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)

Conflicts:
lib/gitorious/diagnostics.rb

5 years agoAdd config setting for default Open ID provider
Christian Johansen [Fri, 15 Feb 2013 13:54:48 +0000 (14:54 +0100)]
Add config setting for default Open ID provider

  - Based on https://gitorious.org/gitorious/mainline/merge_requests/221

5 years agoFixes the url of a comment event. The colon following the url is recognized by e...
Thomas Schamm [Sat, 18 Aug 2012 09:26:50 +0000 (11:26 +0200)]
Fixes the url of a comment event. The colon following the url is recognized by e.g. Apple Mail and others as part of the url.

5 years agoChanged edit url to _path rather than _url
Keloran [Fri, 15 Feb 2013 11:09:26 +0000 (11:09 +0000)]
Changed edit url to _path rather than _url
on nginx this can cause the url to be http://<upstream>/edit
rather than http://<site_address>/edit

Conflicts:
app/views/site/_owner_actions.html.erb

5 years agoMerge branch 'next' of gitorious.org:gitorious/mainline into next
Marius Mathiesen [Fri, 15 Feb 2013 13:20:04 +0000 (14:20 +0100)]
Merge branch 'next' of gitorious.org:gitorious/mainline into next

5 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.

Conflicts:
bin/bundle
bin/setup.rb

5 years agoAllow non-standard SSH ports
Christian Johansen [Fri, 15 Feb 2013 13:16:40 +0000 (14:16 +0100)]
Allow non-standard SSH ports

  - Originally implemented by Michael Hauspie in
    https://gitorious.org/gitorious/mainline/merge_requests/198

5 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/.

5 years agoMerge branch 'next' of gitorious.org:gitorious/mainline into next
Marius Mathiesen [Fri, 15 Feb 2013 13:09:38 +0000 (14:09 +0100)]
Merge branch 'next' of gitorious.org:gitorious/mainline into next

5 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.

Conflicts:
config/gitorious.sample.yml

5 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

Conflicts:
test/unit/hook_test.rb

5 years agoBackport openid restriction from 2.x-stable
Marius Mathiesen [Mon, 11 Feb 2013 12:53:51 +0000 (13:53 +0100)]
Backport openid restriction from 2.x-stable

5 years agoRefactor and document configuration loader
Christian Johansen [Fri, 15 Feb 2013 11:34:48 +0000 (12:34 +0100)]
Refactor and document configuration loader

5 years agoDocument configurable
Christian Johansen [Thu, 14 Feb 2013 09:32:55 +0000 (10:32 +0100)]
Document configurable

5 years agoPrefer environment-specific settings
Christian Johansen [Wed, 13 Feb 2013 13:10:09 +0000 (14:10 +0100)]
Prefer environment-specific settings

5 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

5 years agoClean up white-space/indentation in pre-receive
Christian Johansen [Wed, 13 Feb 2013 10:11:10 +0000 (11:11 +0100)]
Clean up white-space/indentation in pre-receive

5 years agoDetect and warn when users upload private SSH keys
Christian Johansen [Wed, 13 Feb 2013 10:10:38 +0000 (11:10 +0100)]
Detect and warn when users upload private SSH keys

5 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

5 years agoUpdate JSON
Christian Johansen [Tue, 12 Feb 2013 08:56:04 +0000 (09:56 +0100)]
Update JSON

  - Addresses CVE-2013-0269

5 years agoUpdate Rails
Christian Johansen [Tue, 12 Feb 2013 08:53:46 +0000 (09:53 +0100)]
Update Rails

  - Addresses CVE-2013-0276
  - Addresses CVE-2013-0277

5 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

5 years agoLess gitignore files
Christian Johansen [Mon, 11 Feb 2013 12:12:37 +0000 (13:12 +0100)]
Less gitignore files

5 years agoUpdated .gitignore
Christian Johansen [Mon, 11 Feb 2013 09:38:51 +0000 (10:38 +0100)]
Updated .gitignore

5 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)

5 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.

5 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

5 years agoDon't require ruby-only gems in Jruby
Marius Mathiesen [Wed, 30 Jan 2013 13:32:32 +0000 (14:32 +0100)]
Don't require ruby-only gems in Jruby

5 years agoMerge branch 'next' of gitorious.org:gitorious/mainline into next
Thomas Kjeldahl Nilsson [Wed, 30 Jan 2013 13:02:24 +0000 (14:02 +0100)]
Merge branch 'next' of gitorious.org:gitorious/mainline into next

5 years agoInclude year in ssh list upload date field
Thomas Kjeldahl Nilsson [Wed, 30 Jan 2013 13:01:23 +0000 (14:01 +0100)]
Include year in ssh list upload date field

5 years agoMake tests pass with MR #219
Marius Mathiesen [Wed, 30 Jan 2013 11:41:16 +0000 (12:41 +0100)]
Make tests pass with MR #219

Also make PushEventLogger#calculate_commit_count return an actual number.

5 years agoUse git rev-list --count instead of log for calculate_commit_count
Robin Stocker [Wed, 24 Oct 2012 11:08:47 +0000 (13:08 +0200)]
Use git rev-list --count instead of log for calculate_commit_count

This is more efficient because Git does not have to parse commit
messages and IO is minimized.

5 years agoAdded general restart script which hides details of passenger and unicorn restarts
Thomas Kjeldahl Nilsson [Tue, 29 Jan 2013 20:56:31 +0000 (21:56 +0100)]
Added general restart script which hides details of passenger and unicorn restarts

5 years agoUpdate AUTHORS file
Christian Johansen [Mon, 28 Jan 2013 09:46:45 +0000 (10:46 +0100)]
Update AUTHORS file

5 years agoUse the user (not gitorious_user) entry in unicorn sample config
Marius Mathiesen [Thu, 24 Jan 2013 13:37:30 +0000 (14:37 +0100)]
Use the user (not gitorious_user) entry in unicorn sample config

5 years agoTreat extra_html_data as safe
Marius Mathiesen [Wed, 23 Jan 2013 13:09:34 +0000 (14:09 +0100)]
Treat extra_html_data as safe

It still gets rendered twice, though

5 years agoremoving unneeded line from Rakefile
David Rios [Wed, 16 Jan 2013 19:23:17 +0000 (17:23 -0200)]
removing unneeded line from Rakefile

as of Rails 3.x and Thinking Sphinx 2.x a require for thinking_sphinx/tasks is not needed anymore.

5 years agoUpdate to Rails 3.2.11
Marius Mathiesen [Wed, 9 Jan 2013 08:03:23 +0000 (09:03 +0100)]
Update to Rails 3.2.11

This solves the vulnerability CVE-2013-0155, and all installations
should be updated immediately.

5 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

5 years agoSpelling
Christian Johansen [Tue, 8 Jan 2013 11:07:48 +0000 (12:07 +0100)]
Spelling

5 years agoThinking Sphinx syntax
Christian Johansen [Tue, 8 Jan 2013 11:07:22 +0000 (12:07 +0100)]
Thinking Sphinx syntax

5 years agoGit has a new home now
Christian Johansen [Tue, 8 Jan 2013 11:06:43 +0000 (12:06 +0100)]
Git has a new home now

5 years agoCorrect search routing
Christian Johansen [Mon, 7 Jan 2013 12:43:34 +0000 (13:43 +0100)]
Correct search routing

5 years agoMakr authenticated_system non-Rails friendly
Christian Johansen [Mon, 7 Jan 2013 12:40:18 +0000 (13:40 +0100)]
Makr authenticated_system non-Rails friendly

5 years agoAllow mime-types to upgrade when needed
Christian Johansen [Mon, 7 Jan 2013 09:46:00 +0000 (10:46 +0100)]
Allow mime-types to upgrade when needed

5 years agoUpdate to Rails 3.2.10
Marius Mathiesen [Mon, 7 Jan 2013 12:04:17 +0000 (13:04 +0100)]
Update to Rails 3.2.10

Renaming the classes in app/models/finders to match what Rails would
expect, otherwise an unproblematic upgrade.

5 years agoAdd app/presenters to micro test paths
Christian Johansen [Mon, 7 Jan 2013 09:04:55 +0000 (10:04 +0100)]
Add app/presenters to micro test paths

5 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

5 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)

5 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

5 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

5 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

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

5 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

5 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.

5 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

5 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

5 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

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

5 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

5 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

5 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

5 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

5 years agoUnescape event rendering
Marius Mathiesen [Mon, 10 Dec 2012 13:39:06 +0000 (14:39 +0100)]
Unescape event rendering

5 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.

5 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.

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

5 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.

5 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

5 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

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

5 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

5 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.

5 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

5 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

5 years agoLoad messaging processors safely
Christian Johansen [Wed, 5 Dec 2012 13:28:28 +0000 (14:28 +0100)]
Load messaging processors safely

5 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

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

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