gitorious:mainline.git
6 years agoMerge commit 'refs/merge-requests/204' of gitorious.org:gitorious/mainline
Marius Mathiesen [Tue, 10 Jul 2012 06:51:04 +0000 (08:51 +0200)]
Merge commit 'refs/merge-requests/204' of gitorious.org:gitorious/mainline

6 years agoAdd project approval workflow
Thomas Kjeldahl Nilsson [Fri, 29 Jun 2012 10:12:11 +0000 (12:12 +0200)]
Add project approval workflow

Enabled by existing only_site_admins_can_create_projects setting.
Site admins can still create projects like usual. Regular users
are redirected to a separate project proposal page, where they input
title and description. Submit, and message is fired off to each site
admin, prompting for reviewing the new proposal at /admin/project_proposals.
Rejection removes the proposal and notifies useser. Approval
creates a proper new project with same title and description as
the proposal. Both rejections and approvals are notified to the
originating user with a message/mail.

6 years agoAdd client ssl certificate authentication support.
Thomas Kjeldahl Nilsson [Sat, 30 Jun 2012 09:05:43 +0000 (11:05 +0200)]
Add client ssl certificate authentication support.

Kudos to Sebastian Noack (sebastian.noack@googlemail.com)
for this patch!

6 years agoAdd option to use different hostname for cloning.
Thomas Kjeldahl Nilsson [Fri, 29 Jun 2012 09:00:26 +0000 (11:00 +0200)]
Add option to use different hostname for cloning.

Thanks to Sebastian Noack for this patch.

6 years agoUpdate outdated ubuntu script samples.
Thomas Kjeldahl Nilsson [Fri, 29 Jun 2012 08:53:54 +0000 (10:53 +0200)]
Update outdated ubuntu script samples.

Kudos to Mike Gabriel for this patch!

6 years agoAdd option to make new projects and repos private by default.
Thomas Kjeldahl Nilsson [Tue, 26 Jun 2012 16:34:10 +0000 (18:34 +0200)]
Add option to make new projects and repos private by default.

Added repos_and_projects_private_by_default config option
(see gitorious.sample.yml). Newly created projects and repos
will be made private by default (but can be made public after
creation). + minor UX tweaks for private repo mode.

6 years agoAdd custom serverside git hooks
Thomas Kjeldahl Nilsson [Mon, 25 Jun 2012 18:25:09 +0000 (20:25 +0200)]
Add custom serverside git hooks

Custom pre-receive,post-receive,update hooks now included, see
the .sample files in /data/hooks. Shared by all repositories,
called after Gitorious has run its regular hooks. Enable them
by copying from {pre-receive,post-receive,update}.sample to
{pre-receive,post-receive,update}. Documentation and sample
debug code included in each sample file.

6 years agoFix SQL injection via nested hashes in conditions
Justin Collins [Sat, 2 Jun 2012 02:02:11 +0000 (19:02 -0700)]
Fix SQL injection via nested hashes in conditions

6 years agoMerge request 202: implement Kerberos authentication
Marius Mathiesen [Tue, 12 Jun 2012 12:17:23 +0000 (14:17 +0200)]
Merge request 202: implement Kerberos authentication

6 years agoUse slashes instead of dashes in plain repo path, get proper paths
Thomas Kjeldahl Nilsson [Fri, 8 Jun 2012 13:02:56 +0000 (15:02 +0200)]
Use slashes instead of dashes in plain repo path, get proper paths

6 years agoMade hashed, sharded repo paths toggleable. Non-sharded is the new
Thomas Kjeldahl Nilsson [Fri, 8 Jun 2012 11:29:18 +0000 (13:29 +0200)]
Made hashed, sharded repo paths toggleable. Non-sharded is the new
default.

(See enable_repository_dir_sharding in config/gitorious.sample.yml)
Repo names are no longer hashed and sharded on disc, but stored in
more readable folder names in top level repository dir. Hashing and
sharding of repo names needs to be enabled only in installatins
hosting very large numbers of repositories where it's possible to
hit filesystem-specific max entries per folder.

6 years agoDon't list tracking repos in /admin/repositories, they aren't created in first place
Thomas Kjeldahl Nilsson [Thu, 7 Jun 2012 11:24:44 +0000 (13:24 +0200)]
Don't list tracking repos in /admin/repositories, they aren't created in first place

6 years agoOnly render "manage read access" link if private repos are enabled
Thomas Kjeldahl Nilsson [Wed, 6 Jun 2012 08:06:43 +0000 (10:06 +0200)]
Only render "manage read access" link if private repos are enabled

6 years agoAdded lock icon for private project view (repo list)
Thomas Kjeldahl Nilsson [Wed, 6 Jun 2012 07:44:59 +0000 (09:44 +0200)]
Added lock icon for private project view (repo list)

6 years agoFixed bug #102, message recipients autocomplete works again.
Thomas Kjeldahl Nilsson [Tue, 5 Jun 2012 12:35:12 +0000 (14:35 +0200)]
Fixed bug #102, message recipients autocomplete works again.

Seems to have been broken due to merge conflict resolution
(git show 6a6a6c)

6 years agoAdded missing patch (.empy? tests) from issue tracker bug #80
Thomas Kjeldahl Nilsson [Fri, 1 Jun 2012 08:31:00 +0000 (10:31 +0200)]
Added missing patch (.empy? tests) from issue tracker bug #80

6 years agoMerge commit 'refs/merge-requests/205' of gitorious.org:gitorious/mainline
Marius Mathiesen [Fri, 1 Jun 2012 07:45:20 +0000 (09:45 +0200)]
Merge commit 'refs/merge-requests/205' of gitorious.org:gitorious/mainline

6 years agoA few UX tweaks to make repo access mgt clearer and more separate from committerships.
Thomas Kjeldahl Nilsson [Thu, 31 May 2012 12:29:41 +0000 (14:29 +0200)]
A few UX tweaks to make repo access mgt clearer and more separate from committerships.

6 years agoAdded lock icon to private projects/repos and manage access button
Thomas Kjeldahl Nilsson [Tue, 29 May 2012 13:16:11 +0000 (15:16 +0200)]
Added lock icon to private projects/repos and manage access button

6 years agoAdded capability for user to delete own account.
Thomas Kjeldahl Nilsson [Tue, 22 May 2012 13:38:32 +0000 (15:38 +0200)]
Added capability for user to delete own account.

User can now delete his own account from the dashboard.
Must accept a confirmation first, and cannot delete account
before all personal repos and projects are deleted first
(UI will prompt for this if needed).

Created needed controller action, delete link in view, and User#deletable?
helper method

Localized feedback flash messages, implemented User#deletable (needs test)

User now actually being deleted, plus added functional tests

Added test for User#deletable?

Add UI confirmation step to user deletion

Added icon to user account delete button

6 years agorandomize database password for external auth users 205
Ken Dreyer [Tue, 22 May 2012 21:39:50 +0000 (15:39 -0600)]
randomize database password for external auth users

The LDAPAuthentication and CrowdAuthentication class set a default
static password of "left_blank" in auto_register(). This allows an
unexpected method of entry: when the DatabaseAuthentication plugin is
also active, lib/gitorious/authentication.rb will cycle through all the
auth plugins, and the DatabaseAuthentication plugin could allow a
malicious user to login with this "left_blank" password string.

Modify the external authentication plugins to randomize the user's local
database password immediately after auto registration.

6 years agoadd "status" options to centos init.d scripts 204
Ken Dreyer [Fri, 18 May 2012 16:18:24 +0000 (10:18 -0600)]
add "status" options to centos init.d scripts

Add a "status" option to the git-daemon, git-poller, and stomp init.d
scripts for RHEL/CentOS. The "status" option is useful for tracking the
services' states in Puppet.

6 years agoUpdate to latest version of capillary.rb
Marius Mathiesen [Fri, 18 May 2012 07:23:52 +0000 (09:23 +0200)]
Update to latest version of capillary.rb

6 years agoimplement Kerberos authentication 202
Ken Dreyer [Sun, 22 Apr 2012 04:43:33 +0000 (22:43 -0600)]
implement Kerberos authentication

Add a new Gitorious::Authentication provider, KerberosAuthentication.
Instead of supporting username+password authentication, this module
checks the request.env HTTP request object from Rails.

mod_auth_kerb does not have a "pass-through" mechanism. If you fail
Kerberos auth, then mod_auth_kerb will display a 401 error. This means
that we must use mod_auth_kerb on a URL that will not interfere with
other password-based authentication mechanisms. Add a new "http" action
to the sessions controller to satisfy this requirement. I intend this to
be a general interface for any web server-integrated authentication
mechanism (eg mod_auth_kerb, or mod_ssl, etc).

Add a new "Kerberos" option to the login form.

Add a 401 HTTP error page. The sample Apache configuration shows how to
configure this error page with mod_auth_kerb.

Add some basic tests for the KerberosAuthentication plugin.

6 years agowrap authenticate() parameters in a credential object
Ken Dreyer [Sun, 22 Apr 2012 04:42:28 +0000 (22:42 -0600)]
wrap authenticate() parameters in a credential object

The authentication plugin API previously took a simple username and
password string pair. In preparation for alternative authentication
mechanisms, wrap the username and password inside a generic "credential"
object and pass that to authenticate(). This
Gitorious::Authentication::Credential object can contain a username and
password, but it can also be extended to support other kinds of
authentication.

6 years agoFixed LDAP error that occurs when a user's mail entry is not the first record returne... 2245
Carl Youngblood [Wed, 16 May 2012 10:07:04 +0000 (12:07 +0200)]
Fixed LDAP error that occurs when a user's mail entry is not the first record returned from the LDAP search in auto_register

6 years agoAdded extra path thing for Ruby 1.9
git version control [Sun, 22 Jan 2012 14:32:54 +0000 (14:32 +0000)]
Added extra path thing for Ruby 1.9

6 years agoPass some more data to LDAP callback classes:
Marius Mathiesen [Fri, 11 May 2012 13:03:19 +0000 (15:03 +0200)]
Pass some more data to LDAP callback classes:

- The base DN to search for self
- The search filter to find self

6 years agoMerge commit 'refs/merge-requests/2244' of gitorious.org:gitorious/mainline into...
Marius Mathiesen [Thu, 10 May 2012 07:38:25 +0000 (09:38 +0200)]
Merge commit 'refs/merge-requests/2244' of gitorious.org:gitorious/mainline into merge-requests/2244

6 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

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

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

6 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

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

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

6 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

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

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

6 years agosubstitute will_paginate by render_pagination_links, which fixes left or right text... 2244
Thomas Schamm [Thu, 3 May 2012 16:57:45 +0000 (18:57 +0200)]
substitute will_paginate by render_pagination_links, which fixes left or right text brackets on Previous and Next buttons

6 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

6 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

6 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

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

6 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

6 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

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

6 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

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

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

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

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

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

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

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

6 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

6 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

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

6 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

6 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

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

6 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

6 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

6 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

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

6 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

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

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

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

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

6 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

6 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

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

6 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

6 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

6 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

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

6 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

6 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

6 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

6 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

6 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

6 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

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

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

6 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

6 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).

6 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

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

6 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

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

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

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

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

6 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

6 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

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

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

6 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

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

6 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