System notice: In light of the Debian OpenSSL security issue we've regenerated the server keys. See this thread for instructions and the new key fingerprints.

Merge requests in mainline

A "merge request" is a notification from one repository to another that would like their changes to be merged upstream.

[open]

krawek-gitorious-clone:keep-all-commits has requested a merge with mainline:master:

save all commit events since last git-push

[open]

krawek-gitorious-clone:maint has requested a merge with mainline:master:

postgres >=8.3 support

[open]

patcitos-clone-latest:make_description_obligatory has requested a merge with mainline:master:

this branch fixes a TODO item to make project description mandatory (commit a57f2f48b)

[open]

krawek-gitorious-clone:archive has requested a merge with mainline:master:

download source tree as tgz, tbz2 or zip

[open]

dysinger:mailer has requested a merge with mainline:master:

I updated the mailer.rb and mailer_spec.rb to use activemailer/urlhelper-style urls. This let's Rails build the urls and works with all hosts and protocols (http/https).

[open]

dustins-clone:master has requested a merge with mainline:master:

I have two changes:

* Minor change: The public/dispatch* files have hard-coded OS X ruby paths. Got rid of those.

* Larger change: I added a mechanism to fetch a user and his projects in XML modeled after the git user API. I'd like to get something like this in place so I can more easily keep up with what I've got and where it is.

[open]

dysinger:ssh-read-only has requested a merge with mainline:master:

Sometimes, due to submodules or private projects, you want to have ssh read-only access to repositories.

http://gitorious.org/projects/gitorious/repos/dysinger/commits/dd55a01cd55b7d730646f6f82a97ca56c2191bfe

Shows a few line changes to allow for that.

[open]

appcast:master has requested a merge with mainline:master:

Commit e930737 contains some small fixes to the public/*.html pages

[merged]

krawek-gitorious-clone:events-maint has requested a merge with mainline:master:

Avoid crash if the user deletes the project

[merged]

fonsecas-clone:fix-project-edit-html has requested a merge with mainline:master:

This branch carries one commit which removes a trailing parenthesis from the "Edit project" action in the "Project Overview" tab.

[merged]

krawek-gitorious-clone:graph-generator has requested a merge with mainline:master:

Refactor Repository#commit_graph_data_by_author

[merged]

teknofires-clone:master has requested a merge with mainline:master:

Discovered that the auto_complete plugin has a select option that can be used to target the contents of a specific element in the popup. Still requires that there are no spaces or newlines inside the targeted element.

Tested on FireFox 2/3 and IE 6/7.

[merged]

krawek-gitorious-clone:git-daemon has requested a merge with mainline:ruby-git-daemon:

no zombie/defunct processes =)

I added a method to process the requests, now we can keep a queue of unprocessed connections and use this method to process them

in my quick&dirty test, the ruby git daemon *seems* to work better than git-daemon, at least with small projects or fast connections

[merged]

dysinger:url-magic has requested a merge with mainline:master:

from TODO.txt : "Normalize url fields (eg add http:// if it aint there) on User+Project"

[merged]

krawek-gitorious-clone:events has requested a merge with mainline:master:

log user activities on the system

[merged]

krawek-gitorious-clone:git-daemon has requested a merge with mainline:master:

A git-daemon written in ruby

[merged]

krawek-gitorious-clone:graph-generator has requested a merge with mainline:master:

only generates the graph if needed, it should be about 40% faster

[merged]

dags-clone:master has requested a merge with mainline:master:

I use the AFL for most of my projects and it is OSI approved - and even considered best practice and recommended over the similar BSD/MIT alternatives.

[merged]

dysinger:commit-log-shows-author has requested a merge with mainline:master:

Changed app/views/logs/_log.html.erb to show the author not commiter so the commit list shows the author

As it sits now, when you cherry pick from others, it shows you, the committer by way of cherry pick, prominently next to the commit - not the author.

This change represents the same behavior as most other git commit browsers such as gitnub, tig or gitk.

[merged]

dysinger:merge-request-bug has requested a merge with mainline:master:

There was some variable flopped in the merge request controller #show method. I fixed it and updated the spec. It now renders the commit diff correctly.

[merged]

dysinger:strainer has requested a merge with mainline:master:

Fix to use GitoriousConfig["repository_base_path"] for strainer instead of hard coded ~/repositories

[merged]

krawek-gitorious-clone:master has requested a merge with mainline:master:

needed for gitorious-cli (http://gitorious.org/projects/gitorious-cli)

[merged]

dustins-clone:master has requested a merge with mainline:master:

I've got three changes:

* Updated the HACKING docs a bit after my experience with getting gitorious running locally.

* Removed db/schema.rb (looks like it was expected to be ignored, but the file was still there)

* Ignore db/*.sqlite3, since they were showing up in my status

[merged]

dchelimskys-clone:master has requested a merge with mainline:master:

Hi Johan,

When I ran the specs there was one that failed due to a dependency on a specific location in the filesystem. I modified that to eliminate that dependency. You can grab that commit (if you wish) here:

git pull git@gitorious.org:gitorious/dchelimskys-clone.git master:f38b5fc

There are also some other small file tweaks and ignores you might want to add to the main repo if you grab master at HEAD.

Thanks for this fantastic tool!

Cheers,
David

[rejected]

appcast:master has requested a merge with mainline:master:

The commit f12f2d9 in Appcast clone of Gitorious fixes a migration down issue.