gitorious:mainline.git
5 years agoMigrate to newer Exception notification gem features/update-execption-notification
Marius Mathiesen [Tue, 8 May 2012 10:10:54 +0000 (12:10 +0200)]
Migrate to newer Exception notification gem

Will need to verify that:
- email is sent correctly
- nothing crashes
- the correct email addresses are picked up
- filtering in fact is done (passwords)

5 years agoAlso remove those files since they're no longer required
Marius Mathiesen [Tue, 8 May 2012 09:11:08 +0000 (11:11 +0200)]
Also remove those files since they're no longer required

5 years agoMake it clearer that Gitorious can be self-hosted.
Marius Mathiesen [Tue, 8 May 2012 09:08:15 +0000 (11:08 +0200)]
Make it clearer that Gitorious can be self-hosted.

Also moving from the hideous text-as-graphics trick, use text instead.

5 years agoMissed a broken functinal test in earlier commit -fixed again.
Thomas Kjeldahl Nilsson [Fri, 4 May 2012 12:14:28 +0000 (14:14 +0200)]
Missed a broken functinal test in earlier commit -fixed again.

5 years agoMake sure event for collaborator removal lists the actual "destroyer" user
Thomas Kjeldahl Nilsson [Fri, 4 May 2012 12:05:53 +0000 (14:05 +0200)]
Make sure event for collaborator removal lists the actual "destroyer" user

5 years agoTweaked commiter removal feedback message (see bug report #64)
Thomas Kjeldahl Nilsson [Fri, 4 May 2012 11:12:17 +0000 (13:12 +0200)]
Tweaked commiter removal feedback message (see bug report #64)

5 years agoMake sure top commit is selected by default in merge request page.
Thomas Kjeldahl Nilsson [Fri, 4 May 2012 10:07:00 +0000 (12:07 +0200)]
Make sure top commit is selected by default in merge request page.

Note: hack-ish temporary solution, remove/replace when we get the
merge request page properly redesigned.

5 years agoFixed user admin check for diagnostic page
Thomas Kjeldahl Nilsson [Fri, 4 May 2012 09:24:01 +0000 (11:24 +0200)]
Fixed user admin check for diagnostic page

5 years agoTerms of service label in openid builder dialog now clickable.
Thomas Kjeldahl Nilsson [Fri, 4 May 2012 09:01:58 +0000 (11:01 +0200)]
Terms of service label in openid builder dialog now clickable.

5 years agoOpenID login "remember me" checkbox label now clickable like regular login.
Thomas Kjeldahl Nilsson [Fri, 4 May 2012 08:34:24 +0000 (10:34 +0200)]
OpenID login "remember me" checkbox label now clickable like regular login.

5 years agoTag 2.2.1 v2.2.1
Marius Mathiesen [Thu, 3 May 2012 07:21:02 +0000 (09:21 +0200)]
Tag 2.2.1

5 years agoRemoved unused helper which causes problems with sync messaging
Thomas Kjeldahl Nilsson [Thu, 3 May 2012 07:19:15 +0000 (09:19 +0200)]
Removed unused helper which causes problems with sync messaging

5 years agoOnly cache repo events for a minute at a time v2.2.0
Christian Johansen [Mon, 30 Apr 2012 12:20:47 +0000 (14:20 +0200)]
Only cache repo events for a minute at a time

5 years agoPurge aggressively cached events
Christian Johansen [Mon, 30 Apr 2012 11:10:30 +0000 (13:10 +0200)]
Purge aggressively cached events

5 years agoUpdated meta for release 2.2.0
Christian Johansen [Mon, 30 Apr 2012 10:44:22 +0000 (12:44 +0200)]
Updated meta for release 2.2.0

5 years agoMake sure cache expires the projects activity feed entries, just like repository...
Thomas Kjeldahl Nilsson [Mon, 30 Apr 2012 10:14:51 +0000 (12:14 +0200)]
Make sure cache expires the projects activity feed entries, just like repository#show

5 years agoUse the supplied Git binary when reporting which git version is used.
Marius Mathiesen [Fri, 27 Apr 2012 09:16:55 +0000 (11:16 +0200)]
Use the supplied Git binary when reporting which git version is used.

5 years agoGraph requests are heavy, let's cache them
Thomas Kjeldahl Nilsson [Fri, 27 Apr 2012 08:43:40 +0000 (10:43 +0200)]
Graph requests are heavy, let's cache them

5 years agoTiny affordance: confirmation if about to remove last admin
Thomas Kjeldahl Nilsson [Thu, 26 Apr 2012 20:52:27 +0000 (22:52 +0200)]
Tiny affordance: confirmation if about to remove last admin
committership on repo.

5 years agoCan now transfer project ownership to teams which already have committerships on...
Thomas Kjeldahl Nilsson [Thu, 26 Apr 2012 19:25:44 +0000 (21:25 +0200)]
Can now transfer project ownership to teams which already have committerships on project repos.

5 years agoImproved suspend user feature.
Thomas Kjeldahl Nilsson [Mon, 16 Apr 2012 08:19:28 +0000 (10:19 +0200)]
Improved suspend user feature.

Suspend user logic is moved into new module Gitorious::UserAdministration,
and expanded to clear out ssh keys, cull current session and remove
users committerships and team memberships. All this is reported back in the
web UI after suspension is done. Also added a suspend_user script which takes
the account email address and performs the same suspend operation as the
web UI button.

Also added helper functions to detect of potential orphaned teams, admin-less
teams, which can be acted upon in custom automated workflows where one needs
to ensure that no projects or teams are orphaned when the owner/sole admin
is suspended.

5 years agoRe-introduce Memcache caching of events in Repositories#show.
Marius Mathiesen [Thu, 26 Apr 2012 08:52:27 +0000 (10:52 +0200)]
Re-introduce Memcache caching of events in Repositories#show.

5 years agoFix caching for Projects#show when not using private repositories
Christian Johansen [Wed, 25 Apr 2012 19:03:42 +0000 (21:03 +0200)]
Fix caching for Projects#show when not using private repositories

  - Don't perform the filter check on uncached events on instances
    that are not using private repositories
  - Don't cache events for projects when using private repositories.
    They can be cached, but if so, the current user needs to be part
    of the cache key.

5 years agoOnly perform authorization when private repos are enabled
Marius Mathiesen [Tue, 24 Apr 2012 10:05:00 +0000 (12:05 +0200)]
Only perform authorization when private repos are enabled

Since the authorization in the controllers uses current_user, which
initializes a session, we bypass this if the server isn't configured with
private repositories.

This means that content should be cacheable again.

5 years agoRename un_suspend to unsuspend
Christian Johansen [Thu, 19 Apr 2012 09:22:50 +0000 (11:22 +0200)]
Rename un_suspend to unsuspend

5 years agoMerge branch 'private-repos'
Christian Johansen [Wed, 18 Apr 2012 09:10:05 +0000 (11:10 +0200)]
Merge branch 'private-repos'

Conflicts:
Gemfile
Gemfile.lock
app/controllers/merge_requests_controller.rb
app/helpers/application_helper.rb
app/models/user.rb
test/unit/repository_test.rb
test/unit/user_test.rb

5 years agoFix tests that fails in `rake tests` but passes in isolation
Christian Johansen [Wed, 18 Apr 2012 07:49:45 +0000 (09:49 +0200)]
Fix tests that fails in `rake tests` but passes in isolation

5 years agoOops
Christian Johansen [Tue, 17 Apr 2012 13:48:41 +0000 (15:48 +0200)]
Oops

5 years agoMake tests pass when run with entire suite
Christian Johansen [Tue, 17 Apr 2012 13:45:37 +0000 (15:45 +0200)]
Make tests pass when run with entire suite

5 years agoFix public? and private? for repositories
Christian Johansen [Tue, 17 Apr 2012 08:30:30 +0000 (10:30 +0200)]
Fix public? and private? for repositories

  - Should also account for project accessibility

5 years agoUpdated prettifer syntax coloring lib, see Bug #85 in the issue tracker.
Thomas Kjeldahl Nilsson [Wed, 11 Apr 2012 09:36:56 +0000 (11:36 +0200)]
Updated prettifer syntax coloring lib, see Bug #85 in the issue tracker.

5 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Thomas Kjeldahl Nilsson [Wed, 4 Apr 2012 10:41:56 +0000 (12:41 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

5 years agoMerge branch 'master' of gitorious.org:~thomanil/gitorious/thomas-mainline
Thomas Kjeldahl Nilsson [Wed, 4 Apr 2012 07:39:41 +0000 (09:39 +0200)]
Merge branch 'master' of gitorious.org:~thomanil/gitorious/thomas-mainline

5 years agoMaking wikize() available from template
Thomas Kjeldahl Nilsson [Wed, 4 Apr 2012 07:38:11 +0000 (09:38 +0200)]
Making wikize() available from template

5 years agoSupport comparing annotated tags to normal branches.
Marius Mathiesen [Tue, 3 Apr 2012 12:58:34 +0000 (14:58 +0200)]
Support comparing annotated tags to normal branches.

Discussed in https://issues.gitorious.org/issues/38, fix
contributed by Peter Kjellerstedt.

5 years agoBe less greeedy when extracting context for MR comments.
Marius Mathiesen [Tue, 3 Apr 2012 12:18:43 +0000 (14:18 +0200)]
Be less greeedy when extracting context for MR comments.

Don't extract lines from every line with the same diff tuple, just the current
blob. This should resolve issue #69

5 years agoFixed bug #52, now autocompleting multiple commasep. message receivers.
Thomas Kjeldahl Nilsson [Fri, 30 Mar 2012 12:49:45 +0000 (14:49 +0200)]
Fixed bug #52, now autocompleting multiple commasep. message receivers.

The problem is in (our old version of) the jquery autocomplete plugin -
it has no concept of multiple slugs in autocompleted input fields.

Solved for now by hacking support for multiple commaseparated fields
into autocomplete.js. In the longterm we should probably upgrade to a
newer version of the autocomplete plugin, though.

5 years agoIn fact, let's start that git daemon too.
Marius Mathiesen [Fri, 30 Mar 2012 12:20:26 +0000 (14:20 +0200)]
In fact, let's start that git daemon too.

5 years agoAdd a Procfile for dead simple development setup
Marius Mathiesen [Fri, 30 Mar 2012 12:18:13 +0000 (14:18 +0200)]
Add a Procfile for dead simple development setup

You can now start (and stop) all (most) Gitorious components with a
single command: foreman.

If you include Bundler's binstubs,

  bundle install --binstubs

you'll end up with all Gem binaries in the current environment inside
(by default) bin/. There you'll find the foreman command too, which you can
invoke like this:

  foreman start

Once you do that, a set of processes will be started for you, including a Stomp server
and a script/poller instance. Each process will have its output colored by Foreman
so you can easily see what comes from where. Once you're done, simply Ctrl-C
in the terminal, and all services will be gone.

Foreman also lets you export Upstart tasks, which may make sense in your
environment. Have a look at http://blog.daviddollar.org/2011/05/06/introducing-foreman.html
for the details.

5 years agoAdd a development group in Gemfile to support developing with foreman
Marius Mathiesen [Fri, 30 Mar 2012 12:03:14 +0000 (14:03 +0200)]
Add a development group in Gemfile to support developing with foreman

Since Gitorious uses Bundler, all required gems need to be in the Gemfile,
also for development. Adding those dependencies here.

5 years agoFixed bug #74, wiki preview works again
Thomas Kjeldahl Nilsson [Fri, 30 Mar 2012 11:36:43 +0000 (13:36 +0200)]
Fixed bug #74, wiki preview works again

5 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Thomas Kjeldahl Nilsson [Thu, 29 Mar 2012 13:24:55 +0000 (15:24 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

5 years agoMerge branch 'self-diagnostics'
Thomas Kjeldahl Nilsson [Thu, 29 Mar 2012 13:19:42 +0000 (15:19 +0200)]
Merge branch 'self-diagnostics'

5 years agothe summary diagnostic page now has to be turned explicitly on w/ option
Thomas Kjeldahl Nilsson [Thu, 29 Mar 2012 13:13:31 +0000 (15:13 +0200)]
the summary diagnostic page now has to be turned explicitly on w/ option

5 years agoFinal code review found some tweaks
Thomas Kjeldahl Nilsson [Thu, 29 Mar 2012 12:59:26 +0000 (14:59 +0200)]
Final code review found some tweaks

5 years agoDeferring mail config test till next iteration
Thomas Kjeldahl Nilsson [Thu, 29 Mar 2012 08:23:32 +0000 (10:23 +0200)]
Deferring mail config test till next iteration

5 years agoTweaked queue service test
Thomas Kjeldahl Nilsson [Wed, 28 Mar 2012 11:00:58 +0000 (13:00 +0200)]
Tweaked queue service test

5 years agoFixed messed up aggregate test
Thomas Kjeldahl Nilsson [Wed, 28 Mar 2012 10:33:26 +0000 (12:33 +0200)]
Fixed messed up aggregate test

5 years agoGit operations needs some setup, do it later
Thomas Kjeldahl Nilsson [Wed, 28 Mar 2012 10:24:51 +0000 (12:24 +0200)]
Git operations needs some setup, do it later

5 years agoMade file ownership more robust and testable
Thomas Kjeldahl Nilsson [Wed, 28 Mar 2012 09:58:19 +0000 (11:58 +0200)]
Made file ownership more robust and testable

5 years agoAdded test coverage and made more tests pass on running ubuntu
Thomas Kjeldahl Nilsson [Wed, 28 Mar 2012 08:56:06 +0000 (10:56 +0200)]
Added test coverage and made more tests pass on running ubuntu

5 years agoDon't allow users and groups as names in Gitorious
Marius Mathiesen [Tue, 27 Mar 2012 12:29:23 +0000 (14:29 +0200)]
Don't allow users and groups as names in Gitorious

Resolves issue #8

5 years agoAdded login and admin filter, extracted css styling
Thomas Kjeldahl Nilsson [Tue, 27 Mar 2012 11:36:12 +0000 (13:36 +0200)]
Added login and admin filter, extracted css styling

5 years agoStarted adding tests
Thomas Kjeldahl Nilsson [Tue, 27 Mar 2012 11:27:59 +0000 (13:27 +0200)]
Started adding tests

5 years agoFixed issue #82
Thomas Kjeldahl Nilsson [Tue, 27 Mar 2012 11:06:38 +0000 (13:06 +0200)]
Fixed issue #82

Added helpful help text stating that deny-force-push also blocks you from removing remote branches.

5 years agoTweaked test texts and structure
Thomas Kjeldahl Nilsson [Tue, 27 Mar 2012 10:58:16 +0000 (12:58 +0200)]
Tweaked test texts and structure

5 years agoSuspended users thrown to login screen quicker.
Thomas Kjeldahl Nilsson [Thu, 22 Mar 2012 20:23:18 +0000 (21:23 +0100)]
Suspended users thrown to login screen quicker.

Before, a suspended user could keep playing in valid session
until choosing to log out voluntarily. Now, the suspended user
is thrown out as soon as he hits a :login_required filter in the
controllers (ie. when trying to perform any destructive action).

5 years agoFixed typo in test description
Thomas Kjeldahl Nilsson [Thu, 22 Mar 2012 19:32:44 +0000 (20:32 +0100)]
Fixed typo in test description

5 years agoExtract user suspension into model method + remove keys.
Thomas Kjeldahl Nilsson [Thu, 22 Mar 2012 19:24:55 +0000 (20:24 +0100)]
Extract user suspension into model method + remove keys.

Moved some user suspension logic from controller into user model.
Added test coverage. Also, note that suspend / unsuspend is not completely
symmetrical: suspend kills ssh keys and sets suspend timestamp, unsuspend only
wipes the timestamp - an unsuspended user has to reupload his ssh keys
to start pushing code again.

5 years agoHide git:// urls if a repository is private. Resolves #84
Marius Mathiesen [Thu, 22 Mar 2012 14:27:50 +0000 (15:27 +0100)]
Hide git:// urls if a repository is private. Resolves #84

5 years agoMerge branch 'sitewiki-admin-only-updates'
Thomas Kjeldahl Nilsson [Thu, 22 Mar 2012 14:05:49 +0000 (15:05 +0100)]
Merge branch 'sitewiki-admin-only-updates'

5 years agoOnly site admin can update site wiki.
Thomas Kjeldahl Nilsson [Wed, 21 Mar 2012 13:55:57 +0000 (14:55 +0100)]
Only site admin can update site wiki.

5 years agoTrying to resolve #77
Marius Mathiesen [Thu, 22 Mar 2012 13:50:29 +0000 (14:50 +0100)]
Trying to resolve #77

Backport from Grit upstream, unsure how rock-solid this is, but at least
it doesn't crash the server anymore.

5 years agoAdd rake task for displaying unreleased commits
Marius Mathiesen [Thu, 22 Mar 2012 13:14:07 +0000 (14:14 +0100)]
Add rake task for displaying unreleased commits

Could be helpful when writing a version tag message.
Also moving the changelog task into the versioning namespace, keeping the
old changelog task along for backwards-compat, albeit undocumented.

5 years agoResolving issue #68, clicking inline comment links in MRs would fail
Marius Mathiesen [Thu, 22 Mar 2012 10:23:33 +0000 (11:23 +0100)]
Resolving issue #68, clicking inline comment links in MRs would fail

The view did not render the merge request version, which is required
to locate the line the comment relates to, causing a request to
MergeRequests#version with a version of undefined. This patch
re-introduces this as data-merge-request-version in the HTML, which
should be picked up in the JS.

Also removing a bug when jumping from such links to the comment inside the
diff, commented out  a call to highlighting seems to remove this (JS) error

5 years agoTweaked test scope and methods
Thomas Kjeldahl Nilsson [Tue, 20 Mar 2012 14:12:20 +0000 (15:12 +0100)]
Tweaked test scope and methods

5 years agoadded more real tests
Thomas Kjeldahl Nilsson [Fri, 16 Mar 2012 15:43:59 +0000 (16:43 +0100)]
added more real tests

5 years agoHandle the error situation described in issue #68
Marius Mathiesen [Fri, 16 Mar 2012 14:30:51 +0000 (15:30 +0100)]
Handle the error situation described in issue #68

If a requested merge request version doesn't exist, Gitorious would
throw an error.

This looks like a data integrity issue, this commit will log the error
condition and render a blank page when it occurs.

5 years agoResolve issue 66 (reply to inline comments broken)
Marius Mathiesen [Fri, 16 Mar 2012 13:04:42 +0000 (14:04 +0100)]
Resolve issue 66 (reply to inline comments broken)

Quoting a CSS attribute selector seems to do the trick

5 years agoTweaked index page
Thomas Kjeldahl Nilsson [Fri, 16 Mar 2012 11:38:23 +0000 (12:38 +0100)]
Tweaked index page

5 years agoAdded tests for mem and cpu checks
Thomas Kjeldahl Nilsson [Fri, 16 Mar 2012 08:07:56 +0000 (09:07 +0100)]
Added tests for mem and cpu checks

5 years agoadded authorized_keys to index page, needs backend support
Thomas Kjeldahl Nilsson [Fri, 16 Mar 2012 07:41:49 +0000 (08:41 +0100)]
added authorized_keys to index page, needs backend support

5 years agoTodo updates
Thomas Kjeldahl Nilsson [Thu, 15 Mar 2012 13:49:28 +0000 (14:49 +0100)]
Todo updates

5 years agoExtracted host system metrics thresholds into constants
Thomas Kjeldahl Nilsson [Thu, 15 Mar 2012 11:15:41 +0000 (12:15 +0100)]
Extracted host system metrics thresholds into constants

5 years agoKilling sidebar for now
Thomas Kjeldahl Nilsson [Thu, 15 Mar 2012 09:53:18 +0000 (10:53 +0100)]
Killing sidebar for now

5 years agoCreated tests in diagnostics module, wired them all up in controller and view
Thomas Kjeldahl Nilsson [Thu, 15 Mar 2012 09:47:27 +0000 (10:47 +0100)]
Created tests in diagnostics module, wired them all up in controller and view

5 years agoExtracted actual health check functions to module
Thomas Kjeldahl Nilsson [Thu, 15 Mar 2012 08:53:52 +0000 (09:53 +0100)]
Extracted actual health check functions to module

5 years agoTweaked diagnostic page further
Thomas Kjeldahl Nilsson [Thu, 15 Mar 2012 08:31:34 +0000 (09:31 +0100)]
Tweaked diagnostic page further

5 years agoAdded reminder, tweaked markup
Thomas Kjeldahl Nilsson [Thu, 15 Mar 2012 08:14:01 +0000 (09:14 +0100)]
Added reminder, tweaked markup

5 years agoAdded more host system stuff
Thomas Kjeldahl Nilsson [Thu, 15 Mar 2012 08:12:03 +0000 (09:12 +0100)]
Added more host system stuff

5 years agoTinkered a little more with content of the index page
Thomas Kjeldahl Nilsson [Thu, 15 Mar 2012 07:49:11 +0000 (08:49 +0100)]
Tinkered a little more with content of the index page

5 years agoSketched out more tests and structure
Thomas Kjeldahl Nilsson [Thu, 15 Mar 2012 07:23:48 +0000 (08:23 +0100)]
Sketched out more tests and structure

5 years agoAdded route, page, controller
Thomas Kjeldahl Nilsson [Thu, 15 Mar 2012 06:34:30 +0000 (07:34 +0100)]
Added route, page, controller

5 years agoDecoupled throttling decision a little from the config flag, made it settable and... 2243
Thomas Kjeldahl Nilsson [Fri, 9 Mar 2012 10:27:16 +0000 (11:27 +0100)]
Decoupled throttling decision a little from the config flag, made it settable and testable from our code. Added simple test. Moved the throttle conditional to actual instance method, so the check happens during runtime not onetime when loading the module at eval.

5 years agoReadability tweak
Thomas Kjeldahl Nilsson [Wed, 7 Mar 2012 13:11:31 +0000 (14:11 +0100)]
Readability tweak

5 years agoAdded option to disable record throttling. Throttling still on by default.
Thomas Kjeldahl Nilsson [Wed, 7 Mar 2012 13:01:34 +0000 (14:01 +0100)]
Added option to disable record throttling. Throttling still on by default.

5 years agoUpdated Gemfile.lock
Christian Johansen [Sat, 3 Mar 2012 22:23:31 +0000 (23:23 +0100)]
Updated Gemfile.lock

5 years agoFix private project/repository creation
Christian Johansen [Sat, 3 Mar 2012 22:23:24 +0000 (23:23 +0100)]
Fix private project/repository creation

5 years agoRun private repos tests with the right user
Christian Johansen [Thu, 1 Mar 2012 08:10:25 +0000 (09:10 +0100)]
Run private repos tests with the right user

5 years agoUndo state in tests
Christian Johansen [Thu, 1 Mar 2012 08:10:14 +0000 (09:10 +0100)]
Undo state in tests

5 years agoSite admins should see everything
Christian Johansen [Thu, 1 Mar 2012 08:01:46 +0000 (09:01 +0100)]
Site admins should see everything

5 years agoDon't show git timeout when successfully displaying diffs
Christian Johansen [Thu, 1 Mar 2012 07:14:56 +0000 (08:14 +0100)]
Don't show git timeout when successfully displaying diffs

5 years agoDon't attempt to add user when group was filled in. Resolves #80
Christian Johansen [Thu, 1 Mar 2012 07:01:20 +0000 (08:01 +0100)]
Don't attempt to add user when group was filled in. Resolves #80

5 years agoRemove dead image reference
Christian Johansen [Thu, 1 Mar 2012 06:56:52 +0000 (07:56 +0100)]
Remove dead image reference

5 years agoRename committership authorization to database authorization
Christian Johansen [Wed, 29 Feb 2012 07:25:33 +0000 (08:25 +0100)]
Rename committership authorization to database authorization

5 years agoFilter paginated
Christian Johansen [Wed, 29 Feb 2012 07:11:29 +0000 (08:11 +0100)]
Filter paginated

5 years agoCloning a private repository makes a new private repository
Christian Johansen [Wed, 29 Feb 2012 06:53:06 +0000 (07:53 +0100)]
Cloning a private repository makes a new private repository

5 years agoRemove troublesome and unused dependency
Christian Johansen [Tue, 28 Feb 2012 16:03:02 +0000 (17:03 +0100)]
Remove troublesome and unused dependency

5 years agoRequire clones of private repositories to become private
Christian Johansen [Tue, 28 Feb 2012 15:57:00 +0000 (16:57 +0100)]
Require clones of private repositories to become private

5 years agoCherry-pick cleanup
Christian Johansen [Tue, 28 Feb 2012 14:27:44 +0000 (15:27 +0100)]
Cherry-pick cleanup