gitorious:cjohansens-mainline.git
7 years agoStart building a components library for the UI ui-components
Christian Johansen [Mon, 21 Mar 2011 07:52:16 +0000 (08:52 +0100)]
Start building a components library for the UI

7 years agoDon't display messages from self as new in top bar
Christian Johansen [Fri, 18 Mar 2011 16:44:40 +0000 (17:44 +0100)]
Don't display messages from self as new in top bar

7 years agoFormatting
Christian Johansen [Fri, 18 Mar 2011 16:12:57 +0000 (17:12 +0100)]
Formatting

7 years agoChange commit comments/diffs routes to handle refs with weird characters
Christian Johansen [Fri, 18 Mar 2011 14:31:42 +0000 (15:31 +0100)]
Change commit comments/diffs routes to handle refs with weird characters

7 years agoOrdering of routes
Christian Johansen [Fri, 18 Mar 2011 14:27:06 +0000 (15:27 +0100)]
Ordering of routes

7 years agoFix failing tests for merge request #91
Christian Johansen [Tue, 15 Mar 2011 15:51:10 +0000 (16:51 +0100)]
Fix failing tests for merge request #91

- Created a new RoutingHelper that is always included in ApplicationController and
  ApplicationHelper, and that can also be included in helper tests that use any of
  its three methods
- Link to tag tree, not commits (as per previous change on mainline)
- Expose unshifted_polymorphic_path as helper

7 years agoAdd functional test for weird but allowed characters in tags
Peter Kjellerstedt [Mon, 29 Mar 2010 14:04:43 +0000 (16:04 +0200)]
Add functional test for weird but allowed characters in tags

7 years agoSupport retrieval of tarballs with quotes in the name
Peter Kjellerstedt [Fri, 26 Mar 2010 17:24:36 +0000 (18:24 +0100)]
Support retrieval of tarballs with quotes in the name

7 years agoSupport retrieval of tarballs with slashes in the name
Peter Kjellerstedt [Fri, 26 Mar 2010 15:09:55 +0000 (16:09 +0100)]
Support retrieval of tarballs with slashes in the name

7 years agoMake tags with slashes work
Peter Kjellerstedt [Fri, 26 Mar 2010 14:25:06 +0000 (15:25 +0100)]
Make tags with slashes work

7 years agoMake branch_and_path() support tags as well
Peter Kjellerstedt [Fri, 26 Mar 2010 14:20:52 +0000 (15:20 +0100)]
Make branch_and_path() support tags as well

It was already called with tags rather than branches in some places, so
now they will actually work.

7 years agoClamp the matching of branches in branch_and_path()
Peter Kjellerstedt [Fri, 26 Mar 2010 14:15:31 +0000 (15:15 +0100)]
Clamp the matching of branches in branch_and_path()

Previously when looking for a tag, branch_and_path() could match a
branch that had the same prefix as the tag.

7 years agoAllow periods in branch names and tags
Peter Kjellerstedt [Fri, 26 Mar 2010 14:10:19 +0000 (15:10 +0100)]
Allow periods in branch names and tags

7 years agoDecent up-to-date 500 error page
Christian Johansen [Fri, 18 Mar 2011 13:26:20 +0000 (14:26 +0100)]
Decent up-to-date 500 error page

7 years agoAlways use the project/repo URL for diffs and comments on commits
Christian Johansen [Fri, 18 Mar 2011 13:00:02 +0000 (14:00 +0100)]
Always use the project/repo URL for diffs and comments on commits

7 years agoUnique names for routes
Christian Johansen [Fri, 18 Mar 2011 12:59:40 +0000 (13:59 +0100)]
Unique names for routes

7 years agoMake sure URLs are generated correctly in the diffmode selector
Christian Johansen [Fri, 18 Mar 2011 12:49:28 +0000 (13:49 +0100)]
Make sure URLs are generated correctly in the diffmode selector

7 years agoAggressively cache the repository config action for 10 minutes at a time
Christian Johansen [Fri, 18 Mar 2011 12:44:31 +0000 (13:44 +0100)]
Aggressively cache the repository config action for 10 minutes at a time

7 years agoSkip sessions for the repository config action
Christian Johansen [Fri, 18 Mar 2011 12:39:26 +0000 (13:39 +0100)]
Skip sessions for the repository config action

7 years agoSimplify skipping session cookies in controllers
Christian Johansen [Fri, 18 Mar 2011 12:39:12 +0000 (13:39 +0100)]
Simplify skipping session cookies in controllers

- Change no_session to skip_session_expiry
- Introduce macro that disables session inducing before filters and skips the expiry

7 years agoResolve merge 'conflict'
Christian Johansen [Fri, 18 Mar 2011 12:26:59 +0000 (13:26 +0100)]
Resolve merge 'conflict'

7 years agoDon't disable sessions globally, only for commit comments and diffs
Christian Johansen [Fri, 18 Mar 2011 12:19:55 +0000 (13:19 +0100)]
Don't disable sessions globally, only for commit comments and diffs

7 years agoAdd html start tag(!)
Christian Johansen [Fri, 18 Mar 2011 12:04:15 +0000 (13:04 +0100)]
Add html start tag(!)

7 years agoTrailing white-space
Christian Johansen [Fri, 18 Mar 2011 12:04:04 +0000 (13:04 +0100)]
Trailing white-space

7 years agoSeparate commit comments and diffs into separate controllers
Christian Johansen [Fri, 18 Mar 2011 12:03:19 +0000 (13:03 +0100)]
Separate commit comments and diffs into separate controllers

7 years agoRemove duplicated parameter log filter
Christian Johansen [Thu, 17 Mar 2011 19:20:15 +0000 (20:20 +0100)]
Remove duplicated parameter log filter

7 years agoPerformance: Split commits#show into three actions, joined back with JavaScript ajax-commits
Christian Johansen [Thu, 17 Mar 2011 19:19:23 +0000 (20:19 +0100)]
Performance: Split commits#show into three actions, joined back with JavaScript

- Increased cacheability for commits#diffs by avoiding filters that hit the
  session
- Link to diffs and commits statically as a fallback
- Include the full URL in the diffmode selector so it works when loaded on
  another page with a different URL
- Introduced a new (temporary) JavaScript file onload.js which is loaded in
  the page's footer to execute as quickly as possible
- Don't set expire_at in the session config - it makes it impossible to not
  send a session cookie (which means caching with e.g. Varnish becomes a lot
  harder)

7 years agoWhite-space
Christian Johansen [Thu, 17 Mar 2011 14:23:42 +0000 (15:23 +0100)]
White-space

7 years agoFix XSS issue in "Getting started" box (name and email)
Christian Johansen [Thu, 17 Mar 2011 12:33:44 +0000 (13:33 +0100)]
Fix XSS issue in "Getting started" box (name and email)

7 years agoFix XSS hole in users#show for fullname
Christian Johansen [Tue, 15 Mar 2011 14:36:01 +0000 (15:36 +0100)]
Fix XSS hole in users#show for fullname

7 years agoTypo
Christian Johansen [Mon, 14 Mar 2011 13:46:25 +0000 (14:46 +0100)]
Typo

7 years agoDon't send activation mail to users that are already activated
Christian Johansen [Mon, 14 Mar 2011 13:46:21 +0000 (14:46 +0100)]
Don't send activation mail to users that are already activated

7 years agoSpelling
Christian Johansen [Mon, 14 Mar 2011 13:28:45 +0000 (14:28 +0100)]
Spelling

7 years agoMerge commit 'refs/merge-requests/140' of git://gitorious.org/gitorious/mainline...
Christian Johansen [Mon, 14 Mar 2011 08:57:19 +0000 (09:57 +0100)]
Merge commit 'refs/merge-requests/140' of git://gitorious.org/gitorious/mainline into merge-requests/140

7 years agoMerge commit 'refs/merge-requests/2227' of git://gitorious.org/gitorious/mainline...
Christian Johansen [Mon, 14 Mar 2011 08:53:23 +0000 (09:53 +0100)]
Merge commit 'refs/merge-requests/2227' of git://gitorious.org/gitorious/mainline into merge-requests/2227

7 years agoHandle unsexy CSS on wiki preview and headings.
Marius Mathiesen [Fri, 11 Mar 2011 12:13:56 +0000 (13:13 +0100)]
Handle unsexy CSS on wiki preview and headings.

7 years agoFix an embarrassing "bug" that does nothing. Good nor bad.
Marius Mathiesen [Fri, 11 Mar 2011 09:30:52 +0000 (10:30 +0100)]
Fix an embarrassing "bug" that does nothing. Good nor bad.

Ultrasphinx should ignore missing database records now.

7 years agoExplicitly opt in to forgery protection
Christian Johansen [Fri, 11 Mar 2011 08:34:51 +0000 (09:34 +0100)]
Explicitly opt in to forgery protection

7 years agoFix deprecated advice in README
Christian Johansen [Thu, 10 Mar 2011 14:42:48 +0000 (15:42 +0100)]
Fix deprecated advice in README

7 years agoXSS problem in repository/new
Christian Johansen [Thu, 10 Mar 2011 14:40:58 +0000 (15:40 +0100)]
XSS problem in repository/new

7 years agoReplace our homebrew OAuth implementation with the gem version.
Marius Mathiesen [Wed, 9 Mar 2011 16:09:32 +0000 (17:09 +0100)]
Replace our homebrew OAuth implementation with the gem version.

This meant doing some more hard core stubbing where OAuth is involved

7 years agoEscape user input in vcs-git links in head
Christian Johansen [Tue, 8 Mar 2011 15:21:25 +0000 (16:21 +0100)]
Escape user input in vcs-git links in head

7 years agoDon't fail in push processor when logging user (may be nil)
Christian Johansen [Tue, 8 Mar 2011 14:37:21 +0000 (15:37 +0100)]
Don't fail in push processor when logging user (may be nil)

7 years agoMerge branch 'remove-commit-events'
Marius Mathiesen [Tue, 8 Mar 2011 13:16:41 +0000 (14:16 +0100)]
Merge branch 'remove-commit-events'

Conflicts:
app/processors/push_processor.rb

7 years agoPersuade Rails to use the Syck yaml parser
Marius Mathiesen [Tue, 8 Mar 2011 10:18:13 +0000 (11:18 +0100)]
Persuade Rails to use the Syck yaml parser

The bundled Rails version will not work with Psych.

7 years agoRecommend rake db:setup rather than rake db:migrate
Christian Johansen [Tue, 8 Mar 2011 09:34:07 +0000 (10:34 +0100)]
Recommend rake db:setup rather than rake db:migrate

7 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Tue, 8 Mar 2011 09:17:00 +0000 (10:17 +0100)]
Merge branch 'master' of gitorious.org:gitorious/mainline

7 years agoDon't recommend running Gitorious on Ruby 1.9
Christian Johansen [Tue, 8 Mar 2011 09:16:52 +0000 (10:16 +0100)]
Don't recommend running Gitorious on Ruby 1.9

7 years agoDon't attempt to load mongrel or thin in script/server
Christian Johansen [Tue, 8 Mar 2011 09:10:10 +0000 (10:10 +0100)]
Don't attempt to load mongrel or thin in script/server

7 years agoEscape @page_title
Marius Mathiesen [Tue, 8 Mar 2011 07:29:40 +0000 (08:29 +0100)]
Escape @page_title

7 years agoDon't process merge request deletions in the push processor
Christian Johansen [Mon, 7 Mar 2011 13:56:02 +0000 (14:56 +0100)]
Don't process merge request deletions in the push processor

7 years agoAllow merge request pushes to not have a username
Christian Johansen [Mon, 7 Mar 2011 10:33:50 +0000 (11:33 +0100)]
Allow merge request pushes to not have a username

7 years agoUltrasphinx seems to ignore Rails' default scope, ignoring missing records for now.
Marius Mathiesen [Mon, 7 Mar 2011 07:44:36 +0000 (08:44 +0100)]
Ultrasphinx seems to ignore Rails' default scope, ignoring missing records for now.

7 years agoGitorious-config script should returns paths with .git in them
Christian Johansen [Sat, 5 Mar 2011 06:10:39 +0000 (07:10 +0100)]
Gitorious-config script should returns paths with .git in them

7 years agoPut Gitorious standalone resolver under lib/gitorious
Christian Johansen [Sat, 5 Mar 2011 06:10:18 +0000 (07:10 +0100)]
Put Gitorious standalone resolver under lib/gitorious

7 years agoFix label on license agreement page
Rodrigo Rosenfeld Rosas [Mon, 28 Feb 2011 03:29:09 +0000 (00:29 -0300)]
Fix label on license agreement page

7 years agoUpdate pt-BR translation
Rodrigo Rosenfeld Rosas [Sun, 27 Feb 2011 17:10:29 +0000 (14:10 -0300)]
Update pt-BR translation

7 years agoAdding a standalone configuration script that resolves URL->FS path
Marius Mathiesen [Fri, 4 Mar 2011 13:01:14 +0000 (14:01 +0100)]
Adding a standalone configuration script that resolves URL->FS path

This could be used from scripts needing access to the path on the file
system for a repository (currently achieved by calling the Rails app).

This script will only load a minimal environment, for faster loading.

7 years agoMerge branch 'remove-commit-events'
Christian Johansen [Fri, 4 Mar 2011 12:42:22 +0000 (13:42 +0100)]
Merge branch 'remove-commit-events'

7 years agoMerge commit 'refs/merge-requests/2226' of git://gitorious.org/gitorious/mainline...
Christian Johansen [Fri, 4 Mar 2011 12:30:54 +0000 (13:30 +0100)]
Merge commit 'refs/merge-requests/2226' of git://gitorious.org/gitorious/mainline into merge-requests/2226

7 years agoUpdate docs to install gems with bundler
Christian Johansen [Fri, 4 Mar 2011 12:27:28 +0000 (13:27 +0100)]
Update docs to install gems with bundler

7 years agoMerge branch 'bundler'
Christian Johansen [Fri, 4 Mar 2011 12:13:48 +0000 (13:13 +0100)]
Merge branch 'bundler'

7 years agoFix a bug where db:migrate on a fresh install would fail.
Marius Mathiesen [Fri, 4 Mar 2011 10:02:24 +0000 (11:02 +0100)]
Fix a bug where db:migrate on a fresh install would fail.

The Project class now contains a default scope, which is applied whenever
the Project class is used (also in migrations).

This commit re-opens the Project class and temporarily disables this scope,
which  makes rake db:migrate usable again.

7 years agoRemoving spaces between lines in the code viewer
Lincoln de Sousa [Thu, 3 Mar 2011 02:17:38 +0000 (23:17 -0300)]
Removing spaces between lines in the code viewer

Makes it easier to read files with a lot of lines and makes it near to
what programmers usually see in their computers.

7 years agoAdding support for suspending projects.
Marius Mathiesen [Wed, 23 Feb 2011 13:37:44 +0000 (14:37 +0100)]
Adding support for suspending projects.

By suspending a project it will not be available at all, neither from the Rails console
nor the app. This means one can neither browse, pull or push to/from the repository.

7 years agoMake the commit listing for a PUSH_SUMMARY event render correctly:
Marius Mathiesen [Tue, 22 Feb 2011 14:48:15 +0000 (15:48 +0100)]
Make the commit listing for a PUSH_SUMMARY event render correctly:

- In reverse chronological order
- The link to view more commits shown properly

7 years agoWhen proposing a merge request, suggest merging to the current repository's parent
Marius Mathiesen [Tue, 22 Feb 2011 13:16:40 +0000 (14:16 +0100)]
When proposing a merge request, suggest merging to the current repository's parent

This should fix issues where the delta is too big and Grit will time out.

7 years agoUpdate NEWS with information about the updates to the event system
Marius Mathiesen [Fri, 18 Feb 2011 12:38:55 +0000 (13:38 +0100)]
Update NEWS with information about the updates to the event system

7 years agoRemoving the obsolete processor and test.
Marius Mathiesen [Fri, 18 Feb 2011 12:25:45 +0000 (13:25 +0100)]
Removing the obsolete processor and test.

Also fixed up the WebHookProcessorTest to work without depending on the now obsolete
PushEventProcessor.

7 years agoLoad commits for an event through the class which is marshalled
Marius Mathiesen [Wed, 16 Feb 2011 11:38:36 +0000 (12:38 +0100)]
Load commits for an event through the class which is marshalled

This will resolve Marshal loading errors when the class is not loaded yet,
will resolve issues which would seem to stem from the caching engine

7 years agoWiki UI updates
Marius Mathiesen [Tue, 15 Feb 2011 13:21:23 +0000 (14:21 +0100)]
Wiki UI updates

- Add a sidebar to all pages
- Provide link to git access instructions w/separate controller action

7 years agoMerge commit 'refs/merge-requests/2205' of gitorious.org:gitorious/mainline
Marius Mathiesen [Mon, 14 Feb 2011 14:25:59 +0000 (15:25 +0100)]
Merge commit 'refs/merge-requests/2205' of gitorious.org:gitorious/mainline

7 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Marius Mathiesen [Mon, 14 Feb 2011 14:23:04 +0000 (15:23 +0100)]
Merge branch 'master' of gitorious.org:gitorious/mainline

7 years agoSlightly improved readability of session domain name check
Marius Mathiesen [Mon, 14 Feb 2011 14:18:32 +0000 (15:18 +0100)]
Slightly improved readability of session domain name check

7 years agoMerge commit 'refs/merge-requests/2206' of gitorious.org:gitorious/mainline into...
Marius Mathiesen [Mon, 14 Feb 2011 14:06:35 +0000 (15:06 +0100)]
Merge commit 'refs/merge-requests/2206' of gitorious.org:gitorious/mainline into merge-requests/2206

7 years agoMake sure database connections are re-established in the push_processor.
Marius Mathiesen [Mon, 14 Feb 2011 12:54:47 +0000 (13:54 +0100)]
Make sure database connections are re-established in the push_processor.

7 years agoMerge request #83, resolve conflict
Christian Johansen [Sat, 12 Feb 2011 22:10:49 +0000 (23:10 +0100)]
Merge request #83, resolve conflict

7 years agoMerge commit 'refs/merge-requests/84' of git://gitorious.org/gitorious/mainline into...
Christian Johansen [Sat, 12 Feb 2011 21:59:21 +0000 (22:59 +0100)]
Merge commit 'refs/merge-requests/84' of git://gitorious.org/gitorious/mainline into merge-requests/84

7 years agoMerge commit 'refs/merge-requests/101' of git://gitorious.org/gitorious/mainline...
Christian Johansen [Sat, 12 Feb 2011 21:56:45 +0000 (22:56 +0100)]
Merge commit 'refs/merge-requests/101' of git://gitorious.org/gitorious/mainline into merge-requests/101

7 years agoMerge commit 'refs/merge-requests/122' of git://gitorious.org/gitorious/mainline...
Christian Johansen [Sat, 12 Feb 2011 21:37:40 +0000 (22:37 +0100)]
Merge commit 'refs/merge-requests/122' of git://gitorious.org/gitorious/mainline into merge-requests/122

7 years agoMerge commit 'refs/merge-requests/133' of git://gitorious.org/gitorious/mainline...
Christian Johansen [Sat, 12 Feb 2011 21:24:53 +0000 (22:24 +0100)]
Merge commit 'refs/merge-requests/133' of git://gitorious.org/gitorious/mainline into merge-requests/133

7 years agoMerge commit 'refs/merge-requests/134' of git://gitorious.org/gitorious/mainline...
Christian Johansen [Sat, 12 Feb 2011 21:23:21 +0000 (22:23 +0100)]
Merge commit 'refs/merge-requests/134' of git://gitorious.org/gitorious/mainline into merge-requests/134

7 years agoMerge commit 'refs/merge-requests/135' of git://gitorious.org/gitorious/mainline...
Christian Johansen [Sat, 12 Feb 2011 21:21:20 +0000 (22:21 +0100)]
Merge commit 'refs/merge-requests/135' of git://gitorious.org/gitorious/mainline into merge-requests/135

7 years agoMerge commit 'refs/merge-requests/141' of git://gitorious.org/gitorious/mainline...
Christian Johansen [Sat, 12 Feb 2011 21:19:54 +0000 (22:19 +0100)]
Merge commit 'refs/merge-requests/141' of git://gitorious.org/gitorious/mainline into merge-requests/141

7 years agoMerge commit 'refs/merge-requests/2225' of git://gitorious.org/gitorious/mainline...
Christian Johansen [Sat, 12 Feb 2011 21:06:51 +0000 (22:06 +0100)]
Merge commit 'refs/merge-requests/2225' of git://gitorious.org/gitorious/mainline into merge-requests/2225

7 years agoHandle situations where a committer's email is not a Gitorious user
Marius Mathiesen [Fri, 11 Feb 2011 13:56:38 +0000 (14:56 +0100)]
Handle situations where a committer's email is not a Gitorious user

7 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Fri, 11 Feb 2011 12:13:01 +0000 (13:13 +0100)]
Merge branch 'master' of gitorious.org:gitorious/mainline

7 years agoUse User#login when logging from the PushProcessor, makes it easier to find the user...
Marius Mathiesen [Fri, 11 Feb 2011 12:12:01 +0000 (13:12 +0100)]
Use User#login when logging from the PushProcessor, makes it easier to find the user than by title

7 years agoAdd a link to favorites from profile page
Marius Mathiesen [Fri, 11 Feb 2011 12:07:56 +0000 (13:07 +0100)]
Add a link to favorites from profile page

7 years agoDo some logging from the PushProcessor
Marius Mathiesen [Fri, 11 Feb 2011 10:37:52 +0000 (11:37 +0100)]
Do some logging from the PushProcessor

7 years agoDescribe changed links on trees page in changelog
Christian Johansen [Fri, 11 Feb 2011 10:04:26 +0000 (11:04 +0100)]
Describe changed links on trees page in changelog

7 years agoWeb hook messages should only be pushed once, not once for each hook
Marius Mathiesen [Fri, 11 Feb 2011 09:54:42 +0000 (10:54 +0100)]
Web hook messages should only be pushed once, not once for each hook

Also extracted our testing SHAs into test_helper

7 years agoLet the users set whether they by default want favorites to trigger email.
Marius Mathiesen [Fri, 11 Feb 2011 08:53:29 +0000 (09:53 +0100)]
Let the users set whether they by default want favorites to trigger email.

The feature has been there for some time, but the UI has not exposed it for some reason.

7 years agoSupply a more meaningful error message for users connecting via SSH directly
Marius Mathiesen [Fri, 11 Feb 2011 08:13:42 +0000 (09:13 +0100)]
Supply a more meaningful error message for users connecting via SSH directly

7 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Marius Mathiesen [Fri, 11 Feb 2011 08:05:11 +0000 (09:05 +0100)]
Merge branch 'master' of gitorious.org:gitorious/mainline

7 years agoHandle wiki updates and web hooks from the PushProcessor.
Marius Mathiesen [Thu, 10 Feb 2011 14:53:47 +0000 (15:53 +0100)]
Handle wiki updates and web hooks from the PushProcessor.

This means the PushProcessor should be able to work as a drop-in replacement
for the old PushEventProcessor

- One new class for each, performs its work outside the processor
- Added Repository#browse_url
- The wiki commit parser now uses a SHA object

7 years agoIntroducing a new push processor which will replace PushEventProcessor
Marius Mathiesen [Thu, 10 Feb 2011 10:28:59 +0000 (11:28 +0100)]
Introducing a new push processor which will replace PushEventProcessor

The new processor delegates most tasks to its collaborators, but does not currently support
wiki updates and web hooks.

- SHAs will be 40 characters, not 32
- Rename the queue from push_event to push

7 years agoIndentation
Christian Johansen [Wed, 9 Feb 2011 21:57:31 +0000 (22:57 +0100)]
Indentation

7 years agoLink to trees in right column when viewing trees
Christian Johansen [Wed, 9 Feb 2011 21:57:25 +0000 (22:57 +0100)]
Link to trees in right column when viewing trees

7 years agoResolve long-standing bug: new tag events should link to tree, not commit
Christian Johansen [Wed, 9 Feb 2011 16:30:13 +0000 (17:30 +0100)]
Resolve long-standing bug: new tag events should link to tree, not commit