gitorious:thomas-mainline.git
6 years agoActually print login failure to user
Christian Johansen [Thu, 15 Dec 2011 12:30:07 +0000 (13:30 +0100)]
Actually print login failure to user

6 years agoFail if Crowd user cannot be created in Gitorious db
Christian Johansen [Thu, 15 Dec 2011 12:29:55 +0000 (13:29 +0100)]
Fail if Crowd user cannot be created in Gitorious db

6 years agoBe consistent with quoting style
Christian Johansen [Thu, 15 Dec 2011 12:29:37 +0000 (13:29 +0100)]
Be consistent with quoting style

6 years agoTrailing white-space again
Christian Johansen [Thu, 15 Dec 2011 12:29:15 +0000 (13:29 +0100)]
Trailing white-space again

6 years agoRemove trailing white-space
Christian Johansen [Tue, 6 Dec 2011 13:13:57 +0000 (14:13 +0100)]
Remove trailing white-space

6 years agoFix class name
Christian Johansen [Tue, 6 Dec 2011 13:13:37 +0000 (14:13 +0100)]
Fix class name

6 years agoAtlassian Crowd Support
Christian Johansen [Tue, 6 Dec 2011 13:13:26 +0000 (14:13 +0100)]
Atlassian Crowd Support

  - Not yet 100% complete
  - Rails throws reload errors in development mode
  - See authentication.sample.yml for instructions on use

6 years agoUse "host" as preferred configuration option for LDAP auth host
Christian Johansen [Tue, 6 Dec 2011 07:35:26 +0000 (08:35 +0100)]
Use "host" as preferred configuration option for LDAP auth host

6 years agoStupid, stupid debugging should never have been committed
Christian Johansen [Mon, 5 Dec 2011 08:17:31 +0000 (09:17 +0100)]
Stupid, stupid debugging should never have been committed

6 years agoDon't limit messages too much
Christian Johansen [Thu, 1 Dec 2011 07:34:20 +0000 (08:34 +0100)]
Don't limit messages too much

Limiting messages adversely affects other actions that generate messages,
e.g., creating/updating merge requests

6 years agoSet gzip mtime header to 0 in generated tarballs
Christian Johansen [Thu, 1 Dec 2011 07:29:59 +0000 (08:29 +0100)]
Set gzip mtime header to 0 in generated tarballs

6 years agoDon't allow search box to slip down and ruin the "raw blob" link
Christian Johansen [Wed, 23 Nov 2011 12:29:42 +0000 (13:29 +0100)]
Don't allow search box to slip down and ruin the "raw blob" link

- Happens when the breadcrumb is too long. This is more of a work-around
  than an actual fix, but better than today's solution

6 years agoMore white-space
Christian Johansen [Wed, 23 Nov 2011 12:28:54 +0000 (13:28 +0100)]
More white-space

6 years agoStupid typo
Christian Johansen [Wed, 23 Nov 2011 12:28:32 +0000 (13:28 +0100)]
Stupid typo

6 years agoHandle errors when viewing diff for invalid commits
Christian Johansen [Wed, 23 Nov 2011 12:10:06 +0000 (13:10 +0100)]
Handle errors when viewing diff for invalid commits

6 years agoWhite-space
Christian Johansen [Wed, 23 Nov 2011 12:09:50 +0000 (13:09 +0100)]
White-space

6 years agoPrivate mode or not, repo configuration must be unauthenticated
Christian Johansen [Wed, 23 Nov 2011 12:09:44 +0000 (13:09 +0100)]
Private mode or not, repo configuration must be unauthenticated

6 years agoFix white-space and indentation
Christian Johansen [Wed, 23 Nov 2011 12:09:13 +0000 (13:09 +0100)]
Fix white-space and indentation

6 years agoWhite-space
Christian Johansen [Wed, 23 Nov 2011 09:34:17 +0000 (10:34 +0100)]
White-space

6 years agoBundler
Christian Johansen [Wed, 23 Nov 2011 09:34:11 +0000 (10:34 +0100)]
Bundler

6 years agoDon't skip session when in private mode
Christian Johansen [Wed, 23 Nov 2011 09:32:31 +0000 (10:32 +0100)]
Don't skip session when in private mode

- Skipping the session is mainly done to prevent excess session variables
  get in the way of caching
- Skipping the session potentially opens actions up in private mode
- TODO: How to test? The filter is run at load time, which makes it hard
  to set public_mode in the test and verify that Gitorious does the right
  thing. Verified manually for now.

6 years agoremoved unnecessary line, improved varialbe name
Kuba Nowakowski [Mon, 21 Nov 2011 20:48:56 +0000 (21:48 +0100)]
removed unnecessary line, improved varialbe name

6 years agomuch simpler solution with tests
Kuba Nowakowski [Mon, 21 Nov 2011 18:00:39 +0000 (19:00 +0100)]
much simpler solution with tests

6 years agoincluding commit diff in notification body
Kuba Nowakowski [Mon, 21 Nov 2011 12:10:13 +0000 (13:10 +0100)]
including commit diff in notification body

6 years agoreverted orignal mainline files
Kuba Nowakowski [Mon, 21 Nov 2011 10:23:11 +0000 (11:23 +0100)]
reverted orignal mainline files

6 years agoin case of push_summary event adds commit diff to email notification
Kuba Nowakowski [Thu, 17 Nov 2011 20:17:17 +0000 (21:17 +0100)]
in case of push_summary event adds commit diff to email notification

6 years agoReplace all dots with dashes when converting LDAP users to Gitorious users
Christian Johansen [Fri, 4 Nov 2011 17:08:24 +0000 (18:08 +0100)]
Replace all dots with dashes when converting LDAP users to Gitorious users

6 years agoConfusing error in sample configuration
Christian Johansen [Fri, 4 Nov 2011 07:29:24 +0000 (08:29 +0100)]
Confusing error in sample configuration

6 years agoMerge branch 'merge-requests/178'
Christian Johansen [Tue, 1 Nov 2011 13:00:21 +0000 (14:00 +0100)]
Merge branch 'merge-requests/178'

6 years agoResolve merge conflict
Christian Johansen [Tue, 1 Nov 2011 13:00:15 +0000 (14:00 +0100)]
Resolve merge conflict

6 years agoMerge commit 'refs/merge-requests/180' of gitorious.org:gitorious/mainline
Christian Johansen [Tue, 1 Nov 2011 12:14:38 +0000 (13:14 +0100)]
Merge commit 'refs/merge-requests/180' of gitorious.org:gitorious/mainline

6 years agoClean up some comments from environment.rb
Tero Hänninen [Mon, 31 Oct 2011 10:51:33 +0000 (12:51 +0200)]
Clean up some comments from environment.rb

6 years agoSupport login in with non-email
Marius Mathiesen [Wed, 26 Oct 2011 14:09:12 +0000 (16:09 +0200)]
Support login in with non-email

Prompting for email will be misleading when users enter
eg. LDAP credentials.

6 years agoUse specified site name in generated email.
Marius Mathiesen [Wed, 26 Oct 2011 08:21:03 +0000 (10:21 +0200)]
Use specified site name in generated email.

6 years agoAllow passing html options to footer link
Marius Mathiesen [Tue, 25 Oct 2011 10:32:28 +0000 (12:32 +0200)]
Allow passing html options to footer link

6 years agoUpdated patch to retain "simple_tls" as default encryption. To use
Martin Sandiford [Sun, 23 Oct 2011 07:32:35 +0000 (18:02 +1030)]
Updated patch to retain "simple_tls" as default encryption.  To use
an unencrypted connection, specify "none" for the "encryption" key.
Added some guidance into the authentication.sample.yml file.

6 years agoUse unencrypted connections if ldap "encryption" config key is not set.
Martin Sandiford [Sat, 22 Oct 2011 05:01:26 +0000 (15:31 +1030)]
Use unencrypted connections if ldap "encryption" config key is not set.

6 years agoMerge branch 'master' of gitorious.org:gitorious/mainline v2.1.0
Christian Johansen [Fri, 21 Oct 2011 21:39:15 +0000 (23:39 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

6 years agoFriendlier sample Gitorious configuration
Christian Johansen [Fri, 21 Oct 2011 21:39:02 +0000 (23:39 +0200)]
Friendlier sample Gitorious configuration

- Includes more documentation
- Default more settings, so less settings need to be explicitly
  specified in the configuration
- Trim down test configuration to the bare required minimum

6 years agoRemove useless .htaccess
Christian Johansen [Fri, 21 Oct 2011 11:54:08 +0000 (13:54 +0200)]
Remove useless .htaccess

6 years agoFix XML parse errors in Atom feeds
Marius Mathiesen [Fri, 21 Oct 2011 07:58:21 +0000 (09:58 +0200)]
Fix XML parse errors in Atom feeds

6 years agoConfigurable Git binary
Christian Johansen [Thu, 20 Oct 2011 12:36:00 +0000 (14:36 +0200)]
Configurable Git binary

6 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Marius Mathiesen [Thu, 20 Oct 2011 12:00:42 +0000 (14:00 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

6 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Marius Mathiesen [Thu, 20 Oct 2011 11:57:00 +0000 (13:57 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

6 years agoFix bug in merge request diff rendering
Marius Mathiesen [Thu, 20 Oct 2011 11:56:49 +0000 (13:56 +0200)]
Fix bug in merge request diff rendering

- Bypass jQuery's "smart" content type detection
- Handle non-set project ivar in merge request versions controller

6 years agoUse Grit's git binary in Gitorious::GitShell
Christian Johansen [Thu, 20 Oct 2011 11:44:47 +0000 (13:44 +0200)]
Use Grit's git binary in Gitorious::GitShell

6 years agoUp timeout in the log graph git shell
Christian Johansen [Thu, 20 Oct 2011 11:35:55 +0000 (13:35 +0200)]
Up timeout in the log graph git shell

6 years agoGraph controller should respond with 503 on timeouts
Christian Johansen [Thu, 20 Oct 2011 11:17:57 +0000 (13:17 +0200)]
Graph controller should respond with 503 on timeouts

- Timeouts are handled as errors
- JavaScript provides better feedback

6 years agoAvoid new lines in HTML attributes
Christian Johansen [Thu, 20 Oct 2011 07:23:42 +0000 (09:23 +0200)]
Avoid new lines in HTML attributes

6 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Thu, 20 Oct 2011 07:03:25 +0000 (09:03 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

6 years agoMerge commit 'refs/merge-requests/174' of gitorious.org:gitorious/mainline
Christian Johansen [Thu, 20 Oct 2011 06:59:10 +0000 (08:59 +0200)]
Merge commit 'refs/merge-requests/174' of gitorious.org:gitorious/mainline

6 years agoWhitespace
Christian Johansen [Thu, 20 Oct 2011 06:54:13 +0000 (08:54 +0200)]
Whitespace

6 years agoPre-select default license in projects/new form
Christian Johansen [Thu, 20 Oct 2011 06:54:07 +0000 (08:54 +0200)]
Pre-select default license in projects/new form

6 years agoMake stomp user and passcode configurable
Scott McLeod [Wed, 19 Oct 2011 17:28:41 +0000 (13:28 -0400)]
Make stomp user and passcode configurable

6 years agoAdd script to create an authorized_keys file
Peter Kjellerstedt [Wed, 19 Oct 2011 11:24:50 +0000 (13:24 +0200)]
Add script to create an authorized_keys file

6 years agoDiscourage our spammers a little.
Marius Mathiesen [Mon, 17 Oct 2011 08:34:55 +0000 (10:34 +0200)]
Discourage our spammers a little.

Decreasinbg the number of messages a user can send to 5 each day.

6 years agoFix tests for sender_email_address
Peter Kjellerstedt [Fri, 14 Oct 2011 15:29:41 +0000 (17:29 +0200)]
Fix tests for sender_email_address

Also comment out the configuration of sender_email_address in
config/gitorious.sample.yml as that is a more sensible default.

6 years agoSimulate HTTPS for functional tests when use_ssl is true
Peter Kjellerstedt [Tue, 4 Oct 2011 09:36:24 +0000 (11:36 +0200)]
Simulate HTTPS for functional tests when use_ssl is true

If the test environment is configured with use_ssl = true (which it is
in config/gitorious.sample.yml) then make sure HTTPS is enabled in the
simulated request.

6 years agoUse the right scheme when validating URLs in events
Peter Kjellerstedt [Mon, 3 Oct 2011 07:24:26 +0000 (09:24 +0200)]
Use the right scheme when validating URLs in events

6 years agoFix a bug in diff rendering for merge requests
Marius Mathiesen [Fri, 14 Oct 2011 13:09:25 +0000 (15:09 +0200)]
Fix a bug in diff rendering for merge requests

6 years agoUpdate buster-core
Christian Johansen [Fri, 14 Oct 2011 12:17:16 +0000 (14:17 +0200)]
Update buster-core

6 years agoMake assets:clear rake task complete
Christian Johansen [Fri, 14 Oct 2011 11:57:25 +0000 (13:57 +0200)]
Make assets:clear rake task complete

6 years ago2.1.0
Christian Johansen [Fri, 14 Oct 2011 11:28:25 +0000 (13:28 +0200)]
2.1.0

6 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Marius Mathiesen [Fri, 14 Oct 2011 10:37:40 +0000 (12:37 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

6 years agoAdding rake task for removing cached javascript and CSS
Marius Mathiesen [Fri, 14 Oct 2011 10:37:28 +0000 (12:37 +0200)]
Adding rake task for removing cached javascript and CSS

6 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

6 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

6 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

6 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

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

6 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

6 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

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

6 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

6 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

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

6 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

6 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

6 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

6 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

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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

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

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

6 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

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

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

6 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

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

6 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

6 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

6 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