gitorious:taladars-gitorious-saltation.git
6 years agoMerge remote-tracking branch 'official/master' into saltation
Matthias Hoermann [Tue, 3 May 2011 09:48:51 +0000 (11:48 +0200)]
Merge remote-tracking branch 'official/master' into saltation

Conflicts:
app/controllers/application_controller.rb
app/controllers/commits_controller.rb
app/controllers/repositories_controller.rb
app/models/project.rb
app/views/repositories/_clone_urls.html.erb

6 years agoe|merge_requests|#7402 merged the two help boxes explaining how to push a new version...
Matthias Hoermann [Tue, 3 May 2011 08:53:07 +0000 (10:53 +0200)]
e|merge_requests|#7402 merged the two help boxes explaining how to push a new version of a merge request and made sure it is only displayed for the author of the merge request

6 years agoadded vim *.un~ files to .gitignore
Matthias Hoermann [Tue, 3 May 2011 08:04:58 +0000 (10:04 +0200)]
added vim *.un~ files to .gitignore

6 years agoadded two additional merge request status values as default for new projects
root [Mon, 2 May 2011 13:45:09 +0000 (15:45 +0200)]
added two additional merge request status values as default for new projects

6 years agoRestart git-poller after rotating in ubuntu logrotate template
Rodrigo Rosenfeld Rosas [Fri, 29 Apr 2011 17:10:13 +0000 (14:10 -0300)]
Restart git-poller after rotating in ubuntu logrotate template

6 years agoGit ref names can contain slashes, don't swallow these when creating events.
Marius Mathiesen [Tue, 26 Apr 2011 09:10:55 +0000 (11:10 +0200)]
Git ref names can contain slashes, don't swallow these when creating events.

6 years agoDon't force HTTP for searching
Marius Mathiesen [Tue, 26 Apr 2011 08:47:15 +0000 (10:47 +0200)]
Don't force HTTP for searching

6 years agoFix db:setup task to allow team creation
Rodrigo Rosenfeld Rosas [Tue, 26 Apr 2011 02:25:00 +0000 (23:25 -0300)]
Fix db:setup task to allow team creation

Seed data should go to db/seeds.rb instead of being on migrations.

6 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Tue, 19 Apr 2011 07:24:03 +0000 (09:24 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

6 years agoCache trees with both ref and commit sha
Christian Johansen [Tue, 19 Apr 2011 07:23:51 +0000 (09:23 +0200)]
Cache trees with both ref and commit sha

- Avoids caching URLs in a specific SHA as master and so on

6 years agoFix XSS hole in repositories#new
Christian Johansen [Tue, 19 Apr 2011 07:23:19 +0000 (09:23 +0200)]
Fix XSS hole in repositories#new

6 years agoMake the MR favorite summary a little shorter
Marius Mathiesen [Wed, 13 Apr 2011 09:43:07 +0000 (11:43 +0200)]
Make the MR favorite summary a little shorter

6 years agoMake /favorites display the id for merge request for better context
Marius Mathiesen [Wed, 13 Apr 2011 07:18:51 +0000 (09:18 +0200)]
Make /favorites display the id for merge request for better context

6 years agoDon't include the overly generic project URL in merge request notifications
Marius Mathiesen [Tue, 12 Apr 2011 11:02:55 +0000 (13:02 +0200)]
Don't include the overly generic project URL in merge request notifications

6 years agoAdd license to git-proxy script
Christian Johansen [Mon, 11 Apr 2011 07:44:28 +0000 (09:44 +0200)]
Add license to git-proxy script

6 years agoMerge branch 'git-proxy'
Christian Johansen [Mon, 11 Apr 2011 07:40:32 +0000 (09:40 +0200)]
Merge branch 'git-proxy'

6 years agoAdding script/git-proxy as an alternative to script/git-daemon
Christian Johansen [Mon, 11 Apr 2011 06:52:37 +0000 (08:52 +0200)]
Adding script/git-proxy as an alternative to script/git-daemon

- The git-proxy script converts paths so they can be used directly with
  the native git-daemon
- Gemfile is updated with a new group for the git_proxy
- See script/git-proxy for information on usage

6 years agoDefine the default scope of projects with an array rather than a hash
Christian Johansen [Mon, 11 Apr 2011 07:16:42 +0000 (09:16 +0200)]
Define the default scope of projects with an array rather than a hash

- Fixes bug on Ruby 1.9 where {:suspended_at=>nil} is put unencoded
  into the SQL query

6 years agoFix a bug where a user's commit_repositories would not be displayed on his dashboard
Marius Mathiesen [Thu, 7 Apr 2011 13:32:06 +0000 (15:32 +0200)]
Fix a bug where a user's commit_repositories would not be displayed on his dashboard

6 years agoMerge commit 'refs/merge-requests/2224' of gitorious.org:gitorious/mainline
Marius Mathiesen [Thu, 7 Apr 2011 13:12:28 +0000 (15:12 +0200)]
Merge commit 'refs/merge-requests/2224' of gitorious.org:gitorious/mainline

6 years agoMake the notification of updated merge requests include a link to the merge request.
Marius Mathiesen [Thu, 7 Apr 2011 12:59:55 +0000 (14:59 +0200)]
Make the notification of updated merge requests include a link to the merge request.

6 years agoEvents for merge request updates should only be generated once
Marius Mathiesen [Mon, 4 Apr 2011 13:55:03 +0000 (15:55 +0200)]
Events for merge request updates should only be generated once

MergeRequest#push_new_branch_to_tracking_repo already does this, so there's
no need to do it inside update_from_push!

6 years agoTypo in link to non-javascript fallback URL
Marius Mathiesen [Fri, 1 Apr 2011 13:59:15 +0000 (15:59 +0200)]
Typo in link to non-javascript fallback URL

6 years agoCorrect scheme for forgot password link
Christian Johansen [Mon, 28 Mar 2011 22:11:28 +0000 (00:11 +0200)]
Correct scheme for forgot password link

6 years agoUse https in forgot password emails if use_ssl is true
Christian Johansen [Mon, 28 Mar 2011 22:03:17 +0000 (00:03 +0200)]
Use https in forgot password emails if use_ssl is true

6 years agoConvenience: Expose scheme in GitoriousConfig
Christian Johansen [Mon, 28 Mar 2011 22:02:46 +0000 (00:02 +0200)]
Convenience: Expose scheme in GitoriousConfig

* "https" when use_ssl is true
* "http" otherwise

6 years agoUse https://secure.gravatar.com when serving SSL content
Christian Johansen [Sun, 27 Mar 2011 19:51:20 +0000 (21:51 +0200)]
Use https://secure.gravatar.com when serving SSL content

6 years agoFix failing SSL requirement tests
Christian Johansen [Wed, 23 Mar 2011 12:52:35 +0000 (13:52 +0100)]
Fix failing SSL requirement tests

- The enforce_ssl context logs in a user, as SSL is only enforced for
  non-sensitive pages when the user is logged (to avoid needless session
  cookies).
- The login_as test helper now sets session_options[:expire_after] to
  trigger the correct filter behavior

6 years agoThe skip_session_expiry filter needs to be prepended to the filter chain
Christian Johansen [Wed, 23 Mar 2011 12:17:42 +0000 (13:17 +0100)]
The skip_session_expiry filter needs to be prepended to the filter chain

- The SslRequirement is included in ApplicationController and will always
  be loaded before the skip_session macro is called (as it is intended for
  inheriting controllers). Prepending the filter ensures the session expiry
  is cleared _before_ ApplicationController#ssl_required? is called (this
  method checks for request.session_options[:expire_after].nil? before
  checking logged_in?

6 years agoMerge branch 'master' into enforce-ssl
Christian Johansen [Wed, 23 Mar 2011 12:02:58 +0000 (13:02 +0100)]
Merge branch 'master' into enforce-ssl

6 years agoUse the skip_session filter for config and writable_by
Christian Johansen [Wed, 23 Mar 2011 12:02:53 +0000 (13:02 +0100)]
Use the skip_session filter for config and writable_by

- These actions are for internal usage and will never require a cookie
- Also removed "skip_before_filter :public_and_logged_in" as :skip_session
  does that for us.

6 years agoDon't use ActiveRecord as backend for session cookies
Christian Johansen [Wed, 23 Mar 2011 12:01:32 +0000 (13:01 +0100)]
Don't use ActiveRecord as backend for session cookies

- Storing sessions in the database requires cleanup jobs
- Storing sessions in the database causes LOTS of DB traffic
- We use sessions sparingly

6 years agoDon't check for current user in ssl_required? when the skip_session filter is used
Christian Johansen [Wed, 23 Mar 2011 12:00:02 +0000 (13:00 +0100)]
Don't check for current user in ssl_required? when the skip_session filter is used

The login? check causes Rails to force a session cookie, breaking the intention
of the skip_session filter. HTTPS is still used if the user is already on HTTPS.

6 years agoNever redirect user from https to http
Christian Johansen [Mon, 21 Mar 2011 13:55:40 +0000 (14:55 +0100)]
Never redirect user from https to http

6 years agoDon't require SSL when user is ':false'
Christian Johansen [Mon, 21 Mar 2011 13:26:24 +0000 (14:26 +0100)]
Don't require SSL when user is ':false'

6 years agoAdd integration test for SSL browsing
Christian Johansen [Mon, 21 Mar 2011 11:52:41 +0000 (12:52 +0100)]
Add integration test for SSL browsing

6 years agoMerge conflict fix
Christian Johansen [Mon, 21 Mar 2011 11:20:08 +0000 (12:20 +0100)]
Merge conflict fix

6 years agoImproved SSL support in Gitorious
Christian Johansen [Thu, 17 Mar 2011 11:40:26 +0000 (12:40 +0100)]
Improved SSL support in Gitorious

- Adds an option to gitorious.yml: use_ssl
- Forces SSL on all pages when user is logged in and on all pages requiring
  user input (even when logged out, such as the register and login pages)
- Removes the direct access to SslRequirement in environments/development.rb
  (use development in gitorious.yml instead)
- Adds tests to all functional controllers, ensuring SSL requirements are
  documented
- Adds helpers and a macro to test SSL enforcement
- Uses secure cookies

6 years agoHandle Errno::EISDIR in commits#index
Christian Johansen [Mon, 21 Mar 2011 09:14:53 +0000 (10:14 +0100)]
Handle Errno::EISDIR in commits#index

- This error is triggered by Grit when it think it has a SHA

6 years agoWhite-space
Christian Johansen [Mon, 21 Mar 2011 09:00:33 +0000 (10:00 +0100)]
White-space

6 years agoWhen viewing non-existent heads in commits#index, redirect to current head
Christian Johansen [Mon, 21 Mar 2011 09:00:25 +0000 (10:00 +0100)]
When viewing non-existent heads in commits#index, redirect to current head

- Previous behavior was to find the first head which doesn't make sense

6 years agoMerge commit 'refs/merge-requests/142' of gitorious.org:gitorious/mainline into merge...
Christian Johansen [Mon, 21 Mar 2011 07:54:36 +0000 (08:54 +0100)]
Merge commit 'refs/merge-requests/142' of gitorious.org:gitorious/mainline into merge_requests/142

6 years agoUpdate pt-BR translations
Rodrigo Rosenfeld Rosas [Fri, 18 Mar 2011 17:03:59 +0000 (14:03 -0300)]
Update pt-BR translations

6 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

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

6 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

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

6 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

6 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

6 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

6 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

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

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

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

6 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

6 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

6 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

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

6 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

6 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

6 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

6 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

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

6 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

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

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

6 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

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

6 years agoPerformance: Split commits#show into three actions, joined back with JavaScript
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)

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

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

6 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

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

6 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

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

6 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

6 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

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

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

6 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

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

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

6 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

6 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

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

6 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

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

6 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

6 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

6 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

6 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

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

6 years agorubygems dependency fix for 1.5
Matthias Hoermann [Mon, 7 Mar 2011 14:58:39 +0000 (15:58 +0100)]
rubygems dependency fix for 1.5

6 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

6 years agoadded support for repo URL mapping (for transition phase)
Matthias Hoermann [Mon, 7 Mar 2011 13:15:34 +0000 (14:15 +0100)]
added support for repo URL mapping (for transition phase)

6 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

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

6 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

6 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

6 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