gitorious:mainline.git
6 years agoThis requires a patch version v2.0.2
Marius Mathiesen [Tue, 13 Sep 2011 11:49:55 +0000 (13:49 +0200)]
This requires a patch version

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

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

6 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

6 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

6 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

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

6 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

6 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

6 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

6 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

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

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

6 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

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

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

6 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

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

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

6 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

6 years agoFormat CSS in a human-readable way
Christian Johansen [Fri, 2 Sep 2011 15:18:11 +0000 (17:18 +0200)]
Format CSS in a human-readable way

6 years agoChange gitorious-com partial to footer-blurb
Christian Johansen [Fri, 2 Sep 2011 15:17:54 +0000 (17:17 +0200)]
Change gitorious-com partial to footer-blurb

- Allows for easier overriding in themed installs

6 years agoFormatting
Christian Johansen [Fri, 2 Sep 2011 15:17:02 +0000 (17:17 +0200)]
Formatting

6 years agoRemove trailing white-space
Christian Johansen [Fri, 2 Sep 2011 15:16:24 +0000 (17:16 +0200)]
Remove trailing white-space

6 years agoExtract the screenshot carousel on the frontpage to a separate partial
Christian Johansen [Fri, 2 Sep 2011 15:16:12 +0000 (17:16 +0200)]
Extract the screenshot carousel on the frontpage to a separate partial

- Allows for reuse in overridden templates

6 years agoAllow gitorious.yml to specify custom logo image
Christian Johansen [Fri, 2 Sep 2011 15:15:24 +0000 (17:15 +0200)]
Allow gitorious.yml to specify custom logo image

6 years agoRemove trailing white-space
Christian Johansen [Fri, 2 Sep 2011 15:14:23 +0000 (17:14 +0200)]
Remove trailing white-space

6 years agoAllow gitorious.yml to specify the favicon URL
Christian Johansen [Fri, 2 Sep 2011 15:14:10 +0000 (17:14 +0200)]
Allow gitorious.yml to specify the favicon URL

6 years agoInclude stylesheets with a helper
Christian Johansen [Fri, 2 Sep 2011 15:12:39 +0000 (17:12 +0200)]
Include stylesheets with a helper

- Allows extra stylesheets configured in gitorious.yml
- Uses unique cache-names, rather than the collision prone :cache => true
  (this means there will be no more all.css - the default bundle will be named
  gts-common.css from now on).

6 years agoRemove trailing white-space
Christian Johansen [Fri, 2 Sep 2011 15:08:39 +0000 (17:08 +0200)]
Remove trailing white-space

6 years agoTrailing white-space
Christian Johansen [Fri, 2 Sep 2011 15:05:49 +0000 (17:05 +0200)]
Trailing white-space

6 years agoMerge commit 'refs/merge-requests/160' of gitorious.org:gitorious/mainline
Christian Johansen [Thu, 1 Sep 2011 18:57:24 +0000 (20:57 +0200)]
Merge commit 'refs/merge-requests/160' of gitorious.org:gitorious/mainline

6 years ago0 doesn't need a unit
Christian Johansen [Thu, 1 Sep 2011 18:56:07 +0000 (20:56 +0200)]
0 doesn't need a unit

6 years agoKill trailing space
Christian Johansen [Thu, 1 Sep 2011 13:35:53 +0000 (15:35 +0200)]
Kill trailing space

6 years agoNo redundant margin for the footer
Christian Johansen [Thu, 1 Sep 2011 11:24:49 +0000 (13:24 +0200)]
No redundant margin for the footer

- Also, no redundant trailing white-space

6 years agoMenu links should be text, not images
Christian Johansen [Thu, 1 Sep 2011 11:24:17 +0000 (13:24 +0200)]
Menu links should be text, not images

6 years agoRemove duplicate menu link
Christian Johansen [Thu, 1 Sep 2011 11:23:46 +0000 (13:23 +0200)]
Remove duplicate menu link

6 years agoAllow images in the wiki.
Marius Mathiesen [Wed, 31 Aug 2011 13:50:45 +0000 (15:50 +0200)]
Allow images in the wiki.

This became impossible during a previous cleanup operation, consider this a bugfix

6 years agoChange the display format of Project creation date.
Marius Mathiesen [Thu, 25 Aug 2011 12:09:50 +0000 (14:09 +0200)]
Change the display format of Project creation date.

6 years agoCleaning up script/gitorious
Marius Mathiesen [Tue, 9 Aug 2011 09:29:21 +0000 (11:29 +0200)]
Cleaning up script/gitorious

- Setting PATH isn't our business.
  Hint: "PermitUserEnvironment yes" in sshd_config and set ~git/.ssh/environment
- Use ruby -d to enable debugging
- Commented code is misleading.

6 years agoMove all path helper methods to routing helper
Tero Hänninen [Tue, 19 Jul 2011 08:36:40 +0000 (11:36 +0300)]
Move all path helper methods to routing helper

6 years agoCaching the Git log output
Marius Mathiesen [Fri, 15 Jul 2011 09:41:36 +0000 (11:41 +0200)]
Caching the Git log output

6 years agoRequiring the latest and greatest Capillary version
Marius Mathiesen [Fri, 15 Jul 2011 08:58:34 +0000 (10:58 +0200)]
Requiring the latest and greatest Capillary version

6 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Marius Mathiesen [Fri, 15 Jul 2011 07:18:06 +0000 (09:18 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

6 years agoAdding a controller which generates Capillary JSON log data for a repository
Marius Mathiesen [Fri, 15 Jul 2011 07:18:00 +0000 (09:18 +0200)]
Adding a controller which generates Capillary JSON log data for a repository

- Mapped under the /api namespace
- Shells out to git via Gitorious::GitShell
- Times out after 10 seconds, returns an empty array if this happens
- Graphs with --all -50

6 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Fri, 15 Jul 2011 05:22:42 +0000 (07:22 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

6 years agoFix environment loading in git-proxy script
Christian Johansen [Fri, 15 Jul 2011 05:21:49 +0000 (07:21 +0200)]
Fix environment loading in git-proxy script

6 years agoPrepare for git tree rendering
Marius Mathiesen [Thu, 14 Jul 2011 08:59:53 +0000 (10:59 +0200)]
Prepare for git tree rendering

- reserve the /api namespace
- require the Capillary gem

6 years agoWhitespace fix
Christian Johansen [Tue, 12 Jul 2011 10:27:10 +0000 (12:27 +0200)]
Whitespace fix

6 years agoResolve merge conflict from master
Christian Johansen [Mon, 11 Jul 2011 11:36:30 +0000 (13:36 +0200)]
Resolve merge conflict from master

6 years agoSomewhat more consistent coding style in CSS files
Christian Johansen [Thu, 7 Jul 2011 13:54:11 +0000 (15:54 +0200)]
Somewhat more consistent coding style in CSS files

6 years agoAdd fix for overflowing download link in right column
Christian Johansen [Thu, 7 Jul 2011 12:43:44 +0000 (14:43 +0200)]
Add fix for overflowing download link in right column

6 years agoAdd Gitorious::VERSION constant and simple changelog script/rake task v2.0.0
Christian Johansen [Tue, 5 Jul 2011 13:07:31 +0000 (15:07 +0200)]
Add Gitorious::VERSION constant and simple changelog script/rake task

6 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Mon, 4 Jul 2011 08:13:51 +0000 (10:13 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

6 years agoDon't cache external.css (login page) and onload.js
Christian Johansen [Mon, 4 Jul 2011 08:13:34 +0000 (10:13 +0200)]
Don't cache external.css (login page) and onload.js

- :cache => true for CSS/JS assumes the filename "all.(js|css)"
- "all.css" is already created by another set of CSS files
- "all.js" is already used by another set of JS files
- Result: login page got way too much CSS, causing freaky rendering
- Result: onload.js was not loaded in production. Rather all.js was loaded
  twice, causing double event listeners and whatnot

6 years agoMissing equals sign
Christian Johansen [Mon, 4 Jul 2011 08:10:55 +0000 (10:10 +0200)]
Missing equals sign

6 years agoFix a bug where rendering inline commit summaries would fail on 1.9
Marius Mathiesen [Thu, 30 Jun 2011 08:35:43 +0000 (10:35 +0200)]
Fix a bug where rendering inline commit summaries would fail on 1.9

dom_id(an_object) calls an_object#id, which raises a warning on 1.8,
and fails on 1.9. Using the underlying commit's id attribute instead.

6 years agoMerge commit '0ef9b600868e565232b9f2bb2ec7129665d4fd3e'
Christian Johansen [Mon, 27 Jun 2011 08:16:30 +0000 (10:16 +0200)]
Merge commit '0ef9b600868e565232b9f2bb2ec7129665d4fd3e'

6 years agoOnly caches url reservations after Rails initialization completes
Rodrigo Rosenfeld Rosas [Sat, 21 May 2011 20:24:08 +0000 (17:24 -0300)]
Only caches url reservations after Rails initialization completes

6 years agoFix typo
Rodrigo Rosenfeld Rosas [Mon, 23 May 2011 23:17:00 +0000 (20:17 -0300)]
Fix typo

6 years agomake "reserved?" implementation clearer and faster in some cases
Rodrigo Rosenfeld Rosas [Sat, 21 May 2011 20:23:15 +0000 (17:23 -0300)]
make "reserved?" implementation clearer and faster in some cases

6 years agorefactoring: replace vendored hodel_3000_compliant_logger with its gem
Rodrigo Rosenfeld Rosas [Mon, 16 May 2011 16:46:30 +0000 (12:46 -0400)]
refactoring: replace vendored hodel_3000_compliant_logger with its gem

6 years agoRemove vendored state-machine plugin as it was already included in Gemfile
Rodrigo Rosenfeld Rosas [Mon, 16 May 2011 16:34:26 +0000 (12:34 -0400)]
Remove vendored state-machine plugin as it was already included in Gemfile

6 years agoUse 2 spaces instead of tabs in sessions/new.html.erb
Rodrigo Rosenfeld Rosas [Fri, 27 May 2011 00:49:31 +0000 (21:49 -0300)]
Use 2 spaces instead of tabs in sessions/new.html.erb

6 years agoRemoves unused partial view
Rodrigo Rosenfeld Rosas [Sat, 4 Jun 2011 19:17:30 +0000 (16:17 -0300)]
Removes unused partial view

6 years agoDuplicated (redundant) oauth dependency in Gemfile
Rodrigo Rosenfeld Rosas [Sun, 5 Jun 2011 22:40:36 +0000 (19:40 -0300)]
Duplicated (redundant) oauth dependency in Gemfile

6 years agoFix Gemfile.lock
Rodrigo Rosenfeld Rosas [Thu, 16 Jun 2011 23:56:28 +0000 (20:56 -0300)]
Fix Gemfile.lock

6 years agoManually assign password and confirmation in create_admin script
Christian Johansen [Wed, 22 Jun 2011 13:32:38 +0000 (15:32 +0200)]
Manually assign password and confirmation in create_admin script

6 years agoAdd camelize for when messaging is required outside the rails env
Christian Johansen [Wed, 22 Jun 2011 13:31:14 +0000 (15:31 +0200)]
Add camelize for when messaging is required outside the rails env

6 years agoFix CSS and JS includes
Christian Johansen [Tue, 21 Jun 2011 06:15:09 +0000 (08:15 +0200)]
Fix CSS and JS includes

- Don't use stylesheet_include_tag for Google fonts (adds .css suffix)

- Use include tags for all local files

6 years agoUpdate link to Google font
Christian Johansen [Tue, 21 Jun 2011 06:09:09 +0000 (08:09 +0200)]
Update link to Google font

6 years agoAllow blank avatars
Christian Johansen [Thu, 16 Jun 2011 17:21:42 +0000 (19:21 +0200)]
Allow blank avatars

6 years agoAllow bmp, svg and ico for user avatars too
Christian Johansen [Thu, 16 Jun 2011 12:15:56 +0000 (14:15 +0200)]
Allow bmp, svg and ico for user avatars too

6 years agoOnly allow gif/jpg/png files for avatars
Christian Johansen [Thu, 16 Jun 2011 09:50:06 +0000 (11:50 +0200)]
Only allow gif/jpg/png files for avatars

6 years agoDon't allow destructive actions via GET etc
Christian Johansen [Thu, 16 Jun 2011 08:20:03 +0000 (10:20 +0200)]
Don't allow destructive actions via GET etc

- Verify HTTP methods for destructive actions in UserController
- Disallow mass-assignment of password and password_confirmation in User
- Add test helper to verify method verification

6 years agoAllow id and href attributes in wiki markup
Christian Johansen [Wed, 15 Jun 2011 07:52:02 +0000 (09:52 +0200)]
Allow id and href attributes in wiki markup

6 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Wed, 15 Jun 2011 07:03:06 +0000 (09:03 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

6 years agoAdd tuxml for xml test output to Gemfile
Christian Johansen [Wed, 15 Jun 2011 07:02:55 +0000 (09:02 +0200)]
Add tuxml for xml test output to Gemfile

6 years agoPrevent Ultrasphinx from freaking out on an unknown adapter (jdbcmysql)
Marius Mathiesen [Tue, 14 Jun 2011 13:53:01 +0000 (15:53 +0200)]
Prevent Ultrasphinx from freaking out on an unknown adapter (jdbcmysql)

This is basically a backport of
github.com/fauna/ultrasphinx/commit/4ecdbbf4ed89d9edd8aaa9607b97adc569798150
and aliases SQL_FUNCTIONS and DEFAULTS for jdbcmysql to mysql

6 years agoConvert open_merge_request_count to a string, otherwise breaks on JRuby
Marius Mathiesen [Tue, 14 Jun 2011 13:26:45 +0000 (15:26 +0200)]
Convert open_merge_request_count to a string, otherwise breaks on JRuby

6 years agoPrepare for JRuby compatibility
Marius Mathiesen [Tue, 14 Jun 2011 13:20:52 +0000 (15:20 +0200)]
Prepare for JRuby compatibility

- Require activerecord JDBC on JRuby
- Update to latest RDiscount, which works on JRuby 1.6

6 years agoMessaging API refactor: Publishers now implement do_publish(queue, message)
Christian Johansen [Mon, 13 Jun 2011 06:19:12 +0000 (08:19 +0200)]
Messaging API refactor: Publishers now implement do_publish(queue, message)

- There's no longer a need to implement the inject(queue) method
- do_message is passed the queue name as a string and the message
  as a JSON string

6 years agoThe sanitizer didn't work exactly as I expected.
Marius Mathiesen [Fri, 10 Jun 2011 13:23:27 +0000 (15:23 +0200)]
The sanitizer didn't work exactly as I expected.

Passing along a much richer set of tags to be allowed.

6 years agoAllow inserting certain tags inside Wiki pages
Marius Mathiesen [Fri, 10 Jun 2011 13:08:48 +0000 (15:08 +0200)]
Allow inserting certain tags inside Wiki pages

After being processed by the markup renderer, wiki contents are sanitized.
This commit whitelists certain tags (table- and dl-related) to not be sanitized away.

6 years agoMerge branch 'master' into unified-messaging-api
Christian Johansen [Fri, 10 Jun 2011 13:01:01 +0000 (15:01 +0200)]
Merge branch 'master' into unified-messaging-api

6 years agoFix syntax error in script
Christian Johansen [Thu, 9 Jun 2011 13:34:23 +0000 (15:34 +0200)]
Fix syntax error in script

6 years agoAdd the new partial
Christian Johansen [Thu, 9 Jun 2011 07:28:05 +0000 (09:28 +0200)]
Add the new partial

6 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Thu, 9 Jun 2011 07:17:26 +0000 (09:17 +0200)]
Merge branch 'master' of gitorious.org:gitorious/mainline

6 years agoAdd 'commercial Gitorious support' to all footers
Christian Johansen [Thu, 9 Jun 2011 07:17:15 +0000 (09:17 +0200)]
Add 'commercial Gitorious support' to all footers

6 years agoText updates to /about and /contact
Marius Mathiesen [Wed, 8 Jun 2011 12:59:32 +0000 (14:59 +0200)]
Text updates to /about and /contact

Clarify that Gitorious AS maintains Gitorious and gitorious.org,
add information about professional offerings to /about and /contact
pages.

6 years agoAdd link to professional services in footer
Christian Johansen [Wed, 8 Jun 2011 12:36:35 +0000 (14:36 +0200)]
Add link to professional services in footer

6 years agoProper formatting of frontpage template
Christian Johansen [Wed, 8 Jun 2011 11:28:06 +0000 (13:28 +0200)]
Proper formatting of frontpage template

6 years agoSomewhat consistent formatting of CSS
Christian Johansen [Wed, 8 Jun 2011 11:24:24 +0000 (13:24 +0200)]
Somewhat consistent formatting of CSS

6 years agoAdd information about Gitorious professional services to frontpage
Christian Johansen [Wed, 8 Jun 2011 11:19:31 +0000 (13:19 +0200)]
Add information about Gitorious professional services to frontpage

6 years agoSend should take symbol
Christian Johansen [Tue, 7 Jun 2011 07:36:24 +0000 (09:36 +0200)]
Send should take symbol

6 years agoCreate the breadcrumb so that it gets rendered when accessed 159
Pedro Kiefer [Tue, 7 Jun 2011 03:38:56 +0000 (00:38 -0300)]
Create the breadcrumb so that it gets rendered when accessed

6 years agoDefine Resque worker task in separate rake file
Christian Johansen [Mon, 6 Jun 2011 13:03:46 +0000 (15:03 +0200)]
Define Resque worker task in separate rake file

6 years agoResolve merge conflict
Christian Johansen [Mon, 6 Jun 2011 12:52:25 +0000 (14:52 +0200)]
Resolve merge conflict

6 years agoEnsure that HTTPS is enforced in links/references if use_ssl if on 158
Shane O'Grady [Fri, 3 Jun 2011 15:19:35 +0000 (16:19 +0100)]
Ensure that HTTPS is enforced in links/references if use_ssl if on

Use GitoriousConfig['scheme'] instead of "http" which will honour the use_ssl parameter.

6 years agoFix Resque worker instructions to use Bundler
Christian Johansen [Fri, 3 Jun 2011 12:13:12 +0000 (14:13 +0200)]
Fix Resque worker instructions to use Bundler