gitorious:saurs-mainline.git
7 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Fri, 14 Oct 2011 10:35:51 +0000 (12:35 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

7 years agoRead Git version at boot time
Christian Johansen [Fri, 14 Oct 2011 10:35:39 +0000 (12:35 +0200)]
Read Git version at boot time

7 years agoMaking the LDAP test script a little more robust
Marius Mathiesen [Fri, 14 Oct 2011 10:33:56 +0000 (12:33 +0200)]
Making the LDAP test script a little more robust

7 years agoMerge commit 'refs/merge-requests/176' of gitorious.org:gitorious/mainline
Christian Johansen [Fri, 14 Oct 2011 10:25:04 +0000 (12:25 +0200)]
Merge commit 'refs/merge-requests/176' of gitorious.org:gitorious/mainline

7 years agoResolve merge conflict
Christian Johansen [Fri, 14 Oct 2011 10:23:56 +0000 (12:23 +0200)]
Resolve merge conflict

7 years agoShow the actually used Git version in the FAQ
Peter Kjellerstedt [Fri, 14 Oct 2011 09:29:43 +0000 (11:29 +0200)]
Show the actually used Git version in the FAQ

7 years agoShow the correct server name in the FAQ
Peter Kjellerstedt [Fri, 14 Oct 2011 09:29:24 +0000 (11:29 +0200)]
Show the correct server name in the FAQ

7 years agoCorrect erroneous embedded tag
Peter Kjellerstedt [Fri, 14 Oct 2011 09:28:48 +0000 (11:28 +0200)]
Correct erroneous embedded tag

7 years agoExtract terms of service related links
Marius Mathiesen [Wed, 12 Oct 2011 12:12:29 +0000 (14:12 +0200)]
Extract terms of service related links

7 years agoA string value will never evaluate to a number
Marius Mathiesen [Wed, 12 Oct 2011 11:49:14 +0000 (13:49 +0200)]
A string value will never evaluate to a number

7 years agoUse the public host&port, not the private ones
Marius Mathiesen [Wed, 12 Oct 2011 11:40:45 +0000 (13:40 +0200)]
Use the public host&port, not the private ones

gitorious_client_{host,port} are used internally.

7 years agoSome SMTP servers won't accept this address format
Marius Mathiesen [Wed, 12 Oct 2011 07:02:14 +0000 (09:02 +0200)]
Some SMTP servers won't accept this address format

7 years agoAllow for configuring a From: address in email
Marius Mathiesen [Wed, 12 Oct 2011 06:30:50 +0000 (08:30 +0200)]
Allow for configuring a From: address in email

This would default to no-reply@<gitorious_host> previously,
introducing a gitorious.yml parameter

7 years agoHide watch button for anonymous users
Marius Mathiesen [Wed, 12 Oct 2011 06:12:02 +0000 (08:12 +0200)]
Hide watch button for anonymous users

7 years agoInform that SSH fingerprint hasn't been configured
Marius Mathiesen [Wed, 12 Oct 2011 05:30:47 +0000 (07:30 +0200)]
Inform that SSH fingerprint hasn't been configured

7 years agoFixing misguiding comment
Marius Mathiesen [Wed, 12 Oct 2011 05:27:06 +0000 (07:27 +0200)]
Fixing misguiding comment

7 years agoAllow gitorious.yml to specify 'plugins'
Christian Johansen [Tue, 11 Oct 2011 13:08:38 +0000 (15:08 +0200)]
Allow gitorious.yml to specify 'plugins'

- Specify additional files to load after Rails is loaded by setting
  the property post_load to an array of files, relative to Rails.root
- This feature is not guaranteed to stick around

7 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Tue, 11 Oct 2011 11:49:59 +0000 (13:49 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

7 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Tue, 11 Oct 2011 11:49:01 +0000 (13:49 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

7 years agoAllow for additional links in the footer via gitorious.yml
Marius Mathiesen [Tue, 11 Oct 2011 11:48:49 +0000 (13:48 +0200)]
Allow for additional links in the footer via gitorious.yml

7 years agoExtract project meta to separate template
Christian Johansen [Tue, 11 Oct 2011 11:48:44 +0000 (13:48 +0200)]
Extract project meta to separate template

- Allows overriding from local installations

7 years agoSupport providing the real SSH fingerprint in gitorious.yml
Marius Mathiesen [Tue, 11 Oct 2011 11:14:10 +0000 (13:14 +0200)]
Support providing the real SSH fingerprint in gitorious.yml

7 years agoThis copyright statement didn't make any sense
Marius Mathiesen [Tue, 11 Oct 2011 10:40:17 +0000 (12:40 +0200)]
This copyright statement didn't make any sense

7 years agoClean up white-space and formatting
Christian Johansen [Fri, 7 Oct 2011 20:29:44 +0000 (22:29 +0200)]
Clean up white-space and formatting

7 years agoDon't use images for text in the footer logo
Christian Johansen [Fri, 7 Oct 2011 20:06:58 +0000 (22:06 +0200)]
Don't use images for text in the footer logo

7 years agoMissing helper methods
Christian Johansen [Fri, 7 Oct 2011 20:06:49 +0000 (22:06 +0200)]
Missing helper methods

7 years agoFAQ routing updates
Christian Johansen [Fri, 7 Oct 2011 20:06:32 +0000 (22:06 +0200)]
FAQ routing updates

7 years agoRender footer links from partial
Christian Johansen [Fri, 7 Oct 2011 20:06:23 +0000 (22:06 +0200)]
Render footer links from partial

- Reduces duplication between layouts

7 years agoNew faq route
Christian Johansen [Fri, 7 Oct 2011 20:05:09 +0000 (22:05 +0200)]
New faq route

7 years agoWhitespace. The trailing sort. Kill it.
Christian Johansen [Fri, 7 Oct 2011 20:04:57 +0000 (22:04 +0200)]
Whitespace. The trailing sort. Kill it.

7 years agoAllow local TOS and privacy policy pages
Christian Johansen [Fri, 7 Oct 2011 20:04:30 +0000 (22:04 +0200)]
Allow local TOS and privacy policy pages

- Set up routing for additional about pages
- Allow new pages to be rendered in site specific contexts

7 years agoRudimentary support for naming a Gitorious install
Christian Johansen [Fri, 7 Oct 2011 13:06:45 +0000 (15:06 +0200)]
Rudimentary support for naming a Gitorious install

- Add setting to the sample configuration
- Use the name in the login form
- Eventually; use name lookup other places the app identifies itself
  as "Gitorious"

7 years agoDon't show defunkt register link in private mode
Christian Johansen [Fri, 7 Oct 2011 12:55:41 +0000 (14:55 +0200)]
Don't show defunkt register link in private mode

7 years agoWarn when configured to add non-existant view paths
Christian Johansen [Fri, 7 Oct 2011 12:47:38 +0000 (14:47 +0200)]
Warn when configured to add non-existant view paths

7 years agoShow license descriptions with JavaScript
Christian Johansen [Fri, 7 Oct 2011 12:39:58 +0000 (14:39 +0200)]
Show license descriptions with JavaScript

- Only shows license descriptions when they're available (i.e. does
  not change existing behavior without additional configuration)
- Only shows license descriptions in the right column if explicitly
  configured to do so

7 years agoMake license label configurable
Christian Johansen [Wed, 5 Oct 2011 12:54:27 +0000 (14:54 +0200)]
Make license label configurable

- This is a temporary fix
- Allows the license field to be used for other kinds of
  classifications, useful for local installs where hosted code
  may or may not be OSS

7 years agoFormat view in a readable manner
Christian Johansen [Wed, 5 Oct 2011 12:53:17 +0000 (14:53 +0200)]
Format view in a readable manner

7 years agoMerge commit 'refs/merge-requests/175' of git://gitorious.org/gitorious/mainline
Christian Johansen [Wed, 5 Oct 2011 12:13:00 +0000 (14:13 +0200)]
Merge commit 'refs/merge-requests/175' of git://gitorious.org/gitorious/mainline

7 years agoMake the Clone & push urls look ok again
Peter Kjellerstedt [Wed, 5 Oct 2011 11:52:07 +0000 (13:52 +0200)]
Make the Clone & push urls look ok again

Not all combinations of enabled git/http/ssh protocols were supported by
the stylesheets for the Clone & push urls. In addition, the selectors
used to determine the width of the URL field were not deterministic,
making it impossible to set the width for all combinations correctly.

7 years agoProper formatting (no tabs)
Christian Johansen [Wed, 5 Oct 2011 11:49:18 +0000 (13:49 +0200)]
Proper formatting (no tabs)

7 years agoEscape ampersand in markup
Christian Johansen [Wed, 5 Oct 2011 11:48:36 +0000 (13:48 +0200)]
Escape ampersand in markup

7 years agoRender license descriptions in projects/new markup
Christian Johansen [Wed, 5 Oct 2011 11:48:25 +0000 (13:48 +0200)]
Render license descriptions in projects/new markup

- Makes descriptions available for JavaScript on the page
- Does not display descriptions by default

7 years agoProject licenses configuration can not be hash
Christian Johansen [Wed, 5 Oct 2011 11:47:42 +0000 (13:47 +0200)]
Project licenses configuration can not be hash

- The hash has no guaranteed order, which makes it hard to display
  licenses as desired.
- Use an array of hashes to provide descriptions of licenses

7 years agoTrailing white-space. Kill it. With fire.
Christian Johansen [Wed, 5 Oct 2011 11:46:44 +0000 (13:46 +0200)]
Trailing white-space. Kill it. With fire.

7 years agoMake available licenses configurable
Christian Johansen [Wed, 5 Oct 2011 11:11:14 +0000 (13:11 +0200)]
Make available licenses configurable

- Load licenses from the gitorious.yml setting 'license' if provided
- The setting can be an array, or a hash (in which case licenses can
  come with a description)

7 years agoMake project licenses proper objects
Christian Johansen [Wed, 5 Oct 2011 09:30:46 +0000 (11:30 +0200)]
Make project licenses proper objects

7 years agoMove project licenses to a separate class
Christian Johansen [Wed, 5 Oct 2011 09:13:57 +0000 (11:13 +0200)]
Move project licenses to a separate class

7 years agoKill trailing white-space
Christian Johansen [Wed, 5 Oct 2011 09:13:37 +0000 (11:13 +0200)]
Kill trailing white-space

7 years agoFormatting. No tabs please.
Christian Johansen [Wed, 5 Oct 2011 09:06:17 +0000 (11:06 +0200)]
Formatting. No tabs please.

7 years agoThere is no such thing as a "CSS class"
Christian Johansen [Wed, 5 Oct 2011 09:01:16 +0000 (11:01 +0200)]
There is no such thing as a "CSS class"

7 years agoMove repository helper method to repository helper
Christian Johansen [Wed, 5 Oct 2011 08:59:41 +0000 (10:59 +0200)]
Move repository helper method to repository helper

- Only used on place, has no business living in the application helper
- Simplify implementation

7 years agoCorrect class name for clone URL field
Christian Johansen [Wed, 5 Oct 2011 08:58:43 +0000 (10:58 +0200)]
Correct class name for clone URL field

- Account for the possibility that there is no git:// or ssh:// URL
- Simplify method

7 years agoExplicitly require Gitorious authentication
Christian Johansen [Wed, 5 Oct 2011 08:30:51 +0000 (10:30 +0200)]
Explicitly require Gitorious authentication

- Relying on Rails' autoloading from an initializer does not work
  well in development mode (i.e. where classes are autoloaded)
- Explicitly require the authentication configuration from the
  initializer
- Explicit is better than implicit anyway

7 years agoResolve merge conflict
Christian Johansen [Mon, 3 Oct 2011 21:40:24 +0000 (23:40 +0200)]
Resolve merge conflict

7 years agoAdd ability to hide git:// URLs from repo pages
Christian Johansen [Mon, 3 Oct 2011 21:24:49 +0000 (23:24 +0200)]
Add ability to hide git:// URLs from repo pages

- Add setting in default configuration file
- Add helper methods in repository model
- Refactor clone_urls helper template by the use of a helper method
  which reduces duplication
- Add tests

7 years agoMove owner related actions on the dashboard into a separate partial
Marius Mathiesen [Mon, 3 Oct 2011 12:39:14 +0000 (14:39 +0200)]
Move owner related actions on the dashboard into a separate partial

7 years agoAdding rake task for removing generated CSS files.
Marius Mathiesen [Mon, 3 Oct 2011 12:11:54 +0000 (14:11 +0200)]
Adding rake task for removing generated CSS files.

7 years agoMerge commit 'refs/merge-requests/172' of gitorious.org:gitorious/mainline
Marius Mathiesen [Fri, 30 Sep 2011 12:25:47 +0000 (14:25 +0200)]
Merge commit 'refs/merge-requests/172' of gitorious.org:gitorious/mainline

7 years agoMake branch_and_path() search tags before branches
Peter Kjellerstedt [Fri, 30 Sep 2011 07:25:13 +0000 (09:25 +0200)]
Make branch_and_path() search tags before branches

If a tag name begins with a branch name we would previously identify the
branch name and the later part of the tag name would instead be
considered part of the path. E.g., if the branch is named "dev/test" and
the tag is "dev/test/1", then "dev/test/1/src" would previously result
in branch_ref="dev/test" and path="1/src" whereas it will now be
branch_ref="dev/test/1" and path="src".

7 years agoGenerate events correctly for tags with slashes
Peter Kjellerstedt [Thu, 29 Sep 2011 15:14:07 +0000 (17:14 +0200)]
Generate events correctly for tags with slashes

7 years agoFix the box-shadow for disable_hover elements
Peter Kjellerstedt [Wed, 28 Sep 2011 17:31:58 +0000 (19:31 +0200)]
Fix the box-shadow for disable_hover elements

7 years agoMake the last double_row item look correct
Peter Kjellerstedt [Wed, 28 Sep 2011 16:37:52 +0000 (18:37 +0200)]
Make the last double_row item look correct

Without this the first line of the last double_row item got a bottom
border and rounded corners when one hovered the mouse over it.

7 years agoAdd disable_hover CSS attribute for tag links
Peter Kjellerstedt [Wed, 28 Sep 2011 14:43:57 +0000 (16:43 +0200)]
Add disable_hover CSS attribute for tag links

This was already done for branches, but for some reason it was missing
for tags.

7 years agoPrevent LDAP authentication with an empty password
Peter Kjellerstedt [Wed, 28 Sep 2011 14:23:46 +0000 (16:23 +0200)]
Prevent LDAP authentication with an empty password

Some LDAP servers seem to allow the LDAP bind to succeed if the
specified password is empty.

7 years agoAllow displaying SSH URLs for situations where no other protcols are available
Marius Mathiesen [Thu, 29 Sep 2011 06:27:56 +0000 (08:27 +0200)]
Allow displaying SSH URLs for situations where no other protcols are available

Specify always_display_ssh_url: true in gitorious.yml to enable

7 years agoWhen creating users from LDAP: replace . with -
Marius Mathiesen [Fri, 23 Sep 2011 12:43:42 +0000 (14:43 +0200)]
When creating users from LDAP: replace . with -

7 years agoPreliminary callback support
Marius Mathiesen [Wed, 21 Sep 2011 13:32:06 +0000 (15:32 +0200)]
Preliminary callback support

post_authenticate will be called after successful LDAP authentication

7 years agoProvide a default authentication configuration with examples
Marius Mathiesen [Mon, 19 Sep 2011 12:14:01 +0000 (14:14 +0200)]
Provide a default authentication configuration with examples

7 years agoTransform the username entered by the user.
Marius Mathiesen [Mon, 19 Sep 2011 11:31:05 +0000 (13:31 +0200)]
Transform the username entered by the user.

Since Gitorious' database practices some quite strict validations, we
pass what's in the LDAP tree through a transformation first:

- before saving a new user account
- when calling User.find_by_login

7 years agoImplement auto-registration through LDAP
Marius Mathiesen [Mon, 19 Sep 2011 09:38:30 +0000 (11:38 +0200)]
Implement auto-registration through LDAP

Also adding a small script for testing LDAP credentials. Could prove useful when configuring.

7 years agoAdding support for authentication over LDAP.
Marius Mathiesen [Mon, 19 Sep 2011 08:46:36 +0000 (10:46 +0200)]
Adding support for authentication over LDAP.

7 years agoConfigure LDAP Authentication with sensible defaults
Marius Mathiesen [Mon, 19 Sep 2011 08:00:05 +0000 (10:00 +0200)]
Configure LDAP Authentication with sensible defaults

Also adding ruby-net-ldap requirement

7 years agoAdd other authentication modules when reading config/authentication.yml
Marius Mathiesen [Mon, 19 Sep 2011 07:25:49 +0000 (09:25 +0200)]
Add other authentication modules when reading config/authentication.yml

Basic initialization and configuration of LDAP included.

7 years agoLoad authentication configuration during initialization
Marius Mathiesen [Fri, 16 Sep 2011 12:40:34 +0000 (14:40 +0200)]
Load authentication configuration during initialization

config/authentication.yml can be used to configure authentication. Still no new features...

7 years agoExtracting authentication out of the User model.
Marius Mathiesen [Fri, 16 Sep 2011 11:08:31 +0000 (13:08 +0200)]
Extracting authentication out of the User model.

The plan is to introduce several authentication backends; in order to do this
we're basically wrapping these into Gitorious::Authentication.methods - which is an
array of objects responding to authenticate.

No new backends yet.

7 years agoAdd OpenID integration test
Rodrigo Rosenfeld Rosas [Tue, 30 Aug 2011 19:25:24 +0000 (16:25 -0300)]
Add OpenID integration test

7 years agoThis requires a patch version
Marius Mathiesen [Tue, 13 Sep 2011 11:49:55 +0000 (13:49 +0200)]
This requires a patch version

7 years agoNo need to make things more complicated than necessary.
Marius Mathiesen [Tue, 13 Sep 2011 05:20:10 +0000 (07:20 +0200)]
No need to make things more complicated than necessary.

Thanks, Rodrigo!

7 years agoRemoving obsolete script
Marius Mathiesen [Mon, 12 Sep 2011 12:19:49 +0000 (14:19 +0200)]
Removing obsolete script

7 years agoSanitize the page parameter before putting it into flash
Marius Mathiesen [Mon, 12 Sep 2011 09:05:33 +0000 (11:05 +0200)]
Sanitize the page parameter before putting it into flash

7 years agoExclude layout when rendering Git timeouts for XHR requests
Marius Mathiesen [Mon, 12 Sep 2011 06:46:44 +0000 (08:46 +0200)]
Exclude layout when rendering Git timeouts for XHR requests

7 years agoDefault the API Graph controller to 100 commits
Christian Johansen [Sun, 11 Sep 2011 19:20:28 +0000 (21:20 +0200)]
Default the API Graph controller to 100 commits

7 years agoDefault CSS file isn't all.css anymore, it's gts-common.css
Christian Johansen [Tue, 6 Sep 2011 10:53:20 +0000 (12:53 +0200)]
Default CSS file isn't all.css anymore, it's gts-common.css

This was recently changed to avoid different bundles using the same cached name

7 years agoUp version
Christian Johansen [Tue, 6 Sep 2011 07:40:50 +0000 (09:40 +0200)]
Up version

7 years agoShort description of new messaging API in README
Christian Johansen [Tue, 6 Sep 2011 07:25:36 +0000 (09:25 +0200)]
Short description of new messaging API in README

7 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Mon, 5 Sep 2011 13:25:41 +0000 (15:25 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

7 years agoRestrict pagination beyond available data in all controllers
Christian Johansen [Mon, 5 Sep 2011 13:21:59 +0000 (15:21 +0200)]
Restrict pagination beyond available data in all controllers

- Introduce new testing macro that automates testing of this aspect
- Apply pagination sanitation to all controllers
- Update existing tests to use new macro

7 years agoDisallow paging beyond available content in projects controller
Christian Johansen [Mon, 5 Sep 2011 11:10:44 +0000 (13:10 +0200)]
Disallow paging beyond available content in projects controller

7 years agoConsistent style in project unit test
Christian Johansen [Mon, 5 Sep 2011 09:31:30 +0000 (11:31 +0200)]
Consistent style in project unit test

- Consistent use of double quotes
- Uncomment a test
- Clean up language (some tests are automatically converted from RSpec and
  sound slightly Yoda-ish)

7 years agoRemove trailing space (yes, again)
Christian Johansen [Mon, 5 Sep 2011 09:07:05 +0000 (11:07 +0200)]
Remove trailing space (yes, again)

7 years agoHandle pagination errors when viewing pages with no content
Christian Johansen [Mon, 5 Sep 2011 09:06:52 +0000 (11:06 +0200)]
Handle pagination errors when viewing pages with no content

- Add pagination wrapper to application controller
- Implement helper for teams page, avoiding trouble when paginating
  teams or events for a single team
- Add english i18n messages for the two above cases

7 years agoStyle clean-up
Christian Johansen [Mon, 5 Sep 2011 07:40:37 +0000 (09:40 +0200)]
Style clean-up

- Remove trailing white-space
- Be consistent about single vs double quotes
- Improve language (tests have once been automatically converted from RSpec)

7 years agoThis was reported to fail, doesn't seem to do so.
Marius Mathiesen [Mon, 5 Sep 2011 07:16:04 +0000 (09:16 +0200)]
This was reported to fail, doesn't seem to do so.

7 years agoAutomatic refill killed what was supposed to be a heading
Christian Johansen [Mon, 5 Sep 2011 06:05:39 +0000 (08:05 +0200)]
refill killed what was supposed to be a heading

7 years agoDo not allow sidebar buttons to overflow
Peter Kjellerstedt [Fri, 2 Sep 2011 22:39:19 +0000 (00:39 +0200)]
Do not allow sidebar buttons to overflow

This also adds title attributes to all buttons that are expected to
overflow (branches, tags and download), and it removes the "branch "
prefix from the titles of the branch buttons on the commit log view for
consistency.

7 years agoShow abbreviated SHAs for diff links in the sidebar
Peter Kjellerstedt [Fri, 2 Sep 2011 09:03:53 +0000 (11:03 +0200)]
Show abbreviated SHAs for diff links in the sidebar

7 years agoShow diff links correctly in the sidebar
Peter Kjellerstedt [Fri, 2 Sep 2011 09:02:43 +0000 (11:02 +0200)]
Show diff links correctly in the sidebar

7 years agoMenu option "About" is "About", not "About Gitorious"
Christian Johansen [Fri, 2 Sep 2011 15:19:46 +0000 (17:19 +0200)]
Menu option "About" is "About", not "About Gitorious"

7 years agoRefill sample config file (80col)
Christian Johansen [Fri, 2 Sep 2011 15:19:31 +0000 (17:19 +0200)]
Refill sample config file (80col)

7 years agoAllow installs to provide custom view paths, to override views
Christian Johansen [Fri, 2 Sep 2011 15:19:16 +0000 (17:19 +0200)]
Allow installs to provide custom view paths, to override views

- Use with care, see gitorious.sample.yml