gitorious:mainline.git
5 years agoMerge branch 'next', remote-tracking branch 'gitorious/next' into next v3-rc1
Thomas Kjeldahl Nilsson [Tue, 9 Jul 2013 13:50:33 +0000 (15:50 +0200)]
Merge branch 'next', remote-tracking branch 'gitorious/next' into next

5 years agoUpgrade doc: remember bundle --deployment
Thomas Kjeldahl Nilsson [Tue, 9 Jul 2013 13:49:53 +0000 (15:49 +0200)]
Upgrade doc: remember bundle --deployment

5 years agoRemove hard-coded admin menu in repo pending
Christian Johansen [Tue, 9 Jul 2013 13:40:10 +0000 (15:40 +0200)]
Remove hard-coded admin menu in repo pending

5 years agoLoad better errors only in development in repo browser
Christian Johansen [Tue, 9 Jul 2013 13:03:03 +0000 (15:03 +0200)]
Load better errors only in development in repo browser

5 years agoSo long, slow tests
Christian Johansen [Tue, 9 Jul 2013 13:02:27 +0000 (15:02 +0200)]
So long, slow tests

Not working, not being used, causing issues with Bundler

5 years agoMerge remote-tracking branch 'gitorious/next' into next
Thomas Kjeldahl Nilsson [Tue, 9 Jul 2013 12:27:23 +0000 (14:27 +0200)]
Merge remote-tracking branch 'gitorious/next' into next

5 years agoUpdate todo
Christian Johansen [Tue, 9 Jul 2013 12:26:23 +0000 (14:26 +0200)]
Update todo

5 years agoUpdate outdated bin/create-user
Christian Johansen [Tue, 9 Jul 2013 12:26:12 +0000 (14:26 +0200)]
Update outdated bin/create-user

5 years agoMore updates to gts3 upgrade doc
Thomas Kjeldahl Nilsson [Tue, 9 Jul 2013 12:25:56 +0000 (14:25 +0200)]
More updates to gts3 upgrade doc

5 years agoSession needs to be available in "getting started" repo page
Christian Johansen [Tue, 9 Jul 2013 12:25:54 +0000 (14:25 +0200)]
Session needs to be available in "getting started" repo page

5 years agoCorrectly pass arguments in dev setup scripts
Christian Johansen [Tue, 9 Jul 2013 12:22:27 +0000 (14:22 +0200)]
Correctly pass arguments in dev setup scripts

5 years agoSpelling
Christian Johansen [Tue, 9 Jul 2013 10:47:53 +0000 (12:47 +0200)]
Spelling

5 years agoDon't test instance variables
Christian Johansen [Mon, 8 Jul 2013 14:17:49 +0000 (16:17 +0200)]
Don't test instance variables

Test response bodies instead

5 years agoAdd instruction on ts rebuild
Thomas Kjeldahl Nilsson [Mon, 8 Jul 2013 14:15:56 +0000 (16:15 +0200)]
Add instruction on ts rebuild

5 years agoAdd chruby-exec tweaks to monit/init files
Thomas Kjeldahl Nilsson [Mon, 8 Jul 2013 14:08:32 +0000 (16:08 +0200)]
Add chruby-exec tweaks to monit/init files

5 years agoTypo
Thomas Kjeldahl Nilsson [Mon, 8 Jul 2013 14:06:26 +0000 (16:06 +0200)]
Typo

5 years agoConvert UserRepository view state object to serializer
Christian Johansen [Mon, 8 Jul 2013 14:06:23 +0000 (16:06 +0200)]
Convert UserRepository view state object to serializer

5 years agoMove Project XML serializer to new app/serializers
Christian Johansen [Mon, 8 Jul 2013 13:56:25 +0000 (15:56 +0200)]
Move Project XML serializer to new app/serializers

5 years agoMerge branch 'next' of gitorious.org:gitorious/mainline into next
Christian Johansen [Mon, 8 Jul 2013 13:31:58 +0000 (15:31 +0200)]
Merge branch 'next' of gitorious.org:gitorious/mainline into next

5 years agoCSRF token for all
Christian Johansen [Mon, 8 Jul 2013 13:31:47 +0000 (15:31 +0200)]
CSRF token for all

5 years agoUpdate UI - pull in images
Christian Johansen [Mon, 8 Jul 2013 13:15:34 +0000 (15:15 +0200)]
Update UI - pull in images

5 years agoMake repo view state return correct MR url
Marius Mathiesen [Mon, 8 Jul 2013 13:04:47 +0000 (15:04 +0200)]
Make repo view state return correct MR url

It should use the *project* as project and parent as target.

5 years agoAdd avatar path to user view state
Christian Johansen [Mon, 8 Jul 2013 12:52:34 +0000 (14:52 +0200)]
Add avatar path to user view state

5 years agoAdd some additional info on bundler and pg deps
Thomas Kjeldahl Nilsson [Mon, 8 Jul 2013 12:33:38 +0000 (14:33 +0200)]
Add some additional info on bundler and pg deps

5 years agoHandle duplicate slug in projects
Marius Mathiesen [Mon, 8 Jul 2013 11:10:15 +0000 (13:10 +0200)]
Handle duplicate slug in projects

Rails now raises an ActiveRecord::RecordNotUnique where it previously
returned false on save - deal with this.

5 years agoUnescape label in Projects#edit
Marius Mathiesen [Mon, 8 Jul 2013 10:56:33 +0000 (12:56 +0200)]
Unescape label in Projects#edit

5 years agoImplement model_name in validators
Marius Mathiesen [Mon, 8 Jul 2013 10:49:06 +0000 (12:49 +0200)]
Implement model_name in validators

If we don't do this, forms rendered with errors will reference the
incorrect model, causing the app to crash.

5 years agoOnly display state changes when there are any
Christian Johansen [Mon, 8 Jul 2013 07:20:25 +0000 (09:20 +0200)]
Only display state changes when there are any

5 years agoAdd coverage
Christian Johansen [Fri, 5 Jul 2013 14:18:38 +0000 (16:18 +0200)]
Add coverage

5 years agoUpdate UI (CSS)
Christian Johansen [Fri, 5 Jul 2013 14:08:06 +0000 (16:08 +0200)]
Update UI (CSS)

5 years agoFix failing test due to missing stub
Christian Johansen [Fri, 5 Jul 2013 14:05:00 +0000 (16:05 +0200)]
Fix failing test due to missing stub

5 years agoUser#email is unique
Christian Johansen [Fri, 5 Jul 2013 13:56:53 +0000 (15:56 +0200)]
User#email is unique

5 years agoFix repo admin menu glitch in getting started page
Christian Johansen [Fri, 5 Jul 2013 13:47:35 +0000 (15:47 +0200)]
Fix repo admin menu glitch in getting started page

5 years agoMerge branch 'next' of gitorious.org:gitorious/mainline into next
Christian Johansen [Fri, 5 Jul 2013 13:42:45 +0000 (15:42 +0200)]
Merge branch 'next' of gitorious.org:gitorious/mainline into next

5 years agoDon't hard-code repo admin menu in small header
Christian Johansen [Fri, 5 Jul 2013 13:42:15 +0000 (15:42 +0200)]
Don't hard-code repo admin menu in small header

5 years agoMake bin/git-proxy run in production by default
Marius Mathiesen [Fri, 5 Jul 2013 13:08:50 +0000 (15:08 +0200)]
Make bin/git-proxy run in production by default

Also document that bundler must be installed

5 years agoMerge branch 'next' of gitorious.org:gitorious/mainline into next
Marius Mathiesen [Fri, 5 Jul 2013 12:43:46 +0000 (14:43 +0200)]
Merge branch 'next' of gitorious.org:gitorious/mainline into next

5 years agoFix broken install instructions
Marius Mathiesen [Fri, 5 Jul 2013 12:43:41 +0000 (14:43 +0200)]
Fix broken install instructions

5 years agoMerge remote-tracking branch 'gitorious/next' into next
Thomas Kjeldahl Nilsson [Fri, 5 Jul 2013 12:28:53 +0000 (14:28 +0200)]
Merge remote-tracking branch 'gitorious/next' into next

5 years agoAdd assumptions to upgrade instructions
Thomas Kjeldahl Nilsson [Fri, 5 Jul 2013 12:28:21 +0000 (14:28 +0200)]
Add assumptions to upgrade instructions

5 years agoUpdate UI
Christian Johansen [Fri, 5 Jul 2013 12:23:42 +0000 (14:23 +0200)]
Update UI

5 years agoCapture all Rugged:ReferenceErrors
Christian Johansen [Fri, 5 Jul 2013 09:33:12 +0000 (11:33 +0200)]
Capture all Rugged:ReferenceErrors

5 years agoMerge branch 'next' of gitorious.org:gitorious/mainline into next
Christian Johansen [Fri, 5 Jul 2013 09:20:27 +0000 (11:20 +0200)]
Merge branch 'next' of gitorious.org:gitorious/mainline into next

5 years agoProper clone/merge buttons in UI3 repo header
Christian Johansen [Fri, 5 Jul 2013 09:20:08 +0000 (11:20 +0200)]
Proper clone/merge buttons in UI3 repo header

5 years agoRender repo description, not project description
Marius Mathiesen [Fri, 5 Jul 2013 09:03:27 +0000 (11:03 +0200)]
Render repo description, not project description

5 years agoClone and merge paths in user/repo view state
Christian Johansen [Fri, 5 Jul 2013 08:55:29 +0000 (10:55 +0200)]
Clone and merge paths in user/repo view state

5 years agoBackport merge request #238
Marius Mathiesen [Fri, 5 Jul 2013 07:57:42 +0000 (09:57 +0200)]
Backport merge request #238

Thanks, plinio!

5 years agoRecommend ruby-install and chruby in upgrade notes
Marius Mathiesen [Fri, 5 Jul 2013 07:52:09 +0000 (09:52 +0200)]
Recommend ruby-install and chruby in upgrade notes

5 years agoMoar custom backticks kthxbye
Marius Mathiesen [Fri, 5 Jul 2013 07:34:17 +0000 (09:34 +0200)]
Moar custom backticks kthxbye

5 years agoUpdate upgrade instructions
Marius Mathiesen [Fri, 5 Jul 2013 07:30:10 +0000 (09:30 +0200)]
Update upgrade instructions

5 years agoMerge commit 'refs/merge-requests/240' of git://gitorious.org/gitorious/mainline...
Christian Johansen [Thu, 4 Jul 2013 22:23:01 +0000 (00:23 +0200)]
Merge commit 'refs/merge-requests/240' of git://gitorious.org/gitorious/mainline into next

5 years agobump virtus in Gemfile.lock 240
Ken Dreyer [Thu, 4 Jul 2013 17:14:21 +0000 (11:14 -0600)]
bump virtus in Gemfile.lock

We accidentally went down a virtus version during the merge in
371a74cf01a44b9f985ff432b0a3e46dce156c16.

Bump virtus back up to 1.0.0.beta1 to avoid a crash bug in virtus.

5 years agoadjust Gemfile for Ruby 1.8.7 compatibility
Ken Dreyer [Thu, 4 Jul 2013 17:02:52 +0000 (11:02 -0600)]
adjust Gemfile for Ruby 1.8.7 compatibility

nokogiri 1.6 requires Ruby 1.9.2. Lock it down so we only pull in 1.5.x.

shoulda-matchers 2.2 requires Ruby 1.9.2. When running on the ruby_18
platform, restrict its version to 1.x.

5 years agotests: align "private" repo parameter with controller expectations
Ken Dreyer [Thu, 4 Jul 2013 00:01:43 +0000 (18:01 -0600)]
tests: align "private" repo parameter with controller expectations

Technically the "private" parameter is not a part of the "project"
parameter set. In the "new" view for a project, "private" is a separate
parameter that stands on its own.

Ideally, during a new project creation, the controller is supposed to
merge() "private" into a larger hash along with "project". That works in
Ruby 2.0.0, but it does not work properly in Ruby 1.8.7. Since the test
did not properly reflect what the view currently sends the controller,
just fix the test.

5 years agofix SearchesControllerTest on Ruby 1.8.7
Ken Dreyer [Thu, 4 Jul 2013 00:03:56 +0000 (18:03 -0600)]
fix SearchesControllerTest on Ruby 1.8.7

When run through "bundler exec rake", the test suite was running through
rake_test_loader, which finds all the tests and calls "require" on each
one simultaneously. Since SearchesControllerTest loads test_helper
differently than all the other tests, Ruby 1.8.7 tries to initialize
Rails twice.

Fix searches_controller_test.rb to load test_helper like all the other
tests.

This was originally fixed as a part of
92b76b1fc3bd343b90e6b5856492507daf5e84a2, but it looks like it was
accidentally lost during the merge in
9c36317887d269697c987497008fe6eecf1e0eb4.

5 years agoAdd CI reporter
Christian Johansen [Thu, 4 Jul 2013 14:12:14 +0000 (16:12 +0200)]
Add CI reporter

5 years agoUpdate setup docs
Marius Mathiesen [Thu, 4 Jul 2013 13:00:40 +0000 (15:00 +0200)]
Update setup docs

5 years agoMake getting started for anonymous users
Christian Johansen [Thu, 4 Jul 2013 13:00:31 +0000 (15:00 +0200)]
Make getting started for anonymous users

5 years agoMerge branch 'next' of gitorious.org:gitorious/mainline into next
Christian Johansen [Thu, 4 Jul 2013 12:53:13 +0000 (14:53 +0200)]
Merge branch 'next' of gitorious.org:gitorious/mainline into next

Conflicts:
Gemfile.lock

5 years agoUpdate Gemfile
Christian Johansen [Thu, 4 Jul 2013 12:46:25 +0000 (14:46 +0200)]
Update Gemfile

5 years agoLink repo in repo header
Christian Johansen [Thu, 4 Jul 2013 12:36:37 +0000 (14:36 +0200)]
Link repo in repo header

5 years agoLink repo in repo header
Christian Johansen [Thu, 4 Jul 2013 12:36:37 +0000 (14:36 +0200)]
Link repo in repo header

5 years agoMerge branch 'next' of gitorious.org:gitorious/mainline into next
Christian Johansen [Thu, 4 Jul 2013 08:56:49 +0000 (10:56 +0200)]
Merge branch 'next' of gitorious.org:gitorious/mainline into next

5 years agoUpdate docs with /usr/bin/gitorious shim
Marius Mathiesen [Thu, 4 Jul 2013 12:29:01 +0000 (14:29 +0200)]
Update docs with /usr/bin/gitorious shim

5 years agoDisabling rack-cache causing empty responses
Marius Mathiesen [Thu, 4 Jul 2013 12:03:20 +0000 (14:03 +0200)]
Disabling rack-cache causing empty responses

When running in RAILS_ENV=production and memcached not being available,
an empty response would be rendered from actions setting Cache-Control
headers. Starting memcached would fix it, as would turning caching off
in environments/production.rb.

This patch disables the Rack
cache (https://github.com/rails/rails/issues/8366); you should put
something other than Rack in front of Gitorious anyway.

5 years agoRender text response with proper content type
Marius Mathiesen [Thu, 4 Jul 2013 10:59:28 +0000 (12:59 +0200)]
Render text response with proper content type

5 years agoMerge branch 'next' of gitorious.org:gitorious/mainline into next
Christian Johansen [Thu, 4 Jul 2013 08:56:49 +0000 (10:56 +0200)]
Merge branch 'next' of gitorious.org:gitorious/mainline into next

5 years agoDon't redirect repository to source browser when not ready
Christian Johansen [Thu, 4 Jul 2013 08:54:18 +0000 (10:54 +0200)]
Don't redirect repository to source browser when not ready

5 years agoskip better_errors code on Ruby 1.8.7 239
Ken Dreyer [Wed, 3 Jul 2013 20:49:47 +0000 (14:49 -0600)]
skip better_errors code on Ruby 1.8.7

5 years agoSyntax highlight commands in readme
Marius Mathiesen [Wed, 3 Jul 2013 13:24:12 +0000 (15:24 +0200)]
Syntax highlight commands in readme

5 years agoFix missing requires in push processor
Marius Mathiesen [Wed, 3 Jul 2013 13:05:47 +0000 (15:05 +0200)]
Fix missing requires in push processor

5 years agoRequest merge button
Christian Johansen [Wed, 3 Jul 2013 12:31:26 +0000 (14:31 +0200)]
Request merge button

5 years agoAdd requires for production
Marius Mathiesen [Wed, 3 Jul 2013 11:14:17 +0000 (13:14 +0200)]
Add requires for production

5 years agoUpdate production JS
Christian Johansen [Wed, 3 Jul 2013 11:10:45 +0000 (13:10 +0200)]
Update production JS

5 years agoFix visual glitch in Chrome on ref selector
Christian Johansen [Wed, 3 Jul 2013 10:05:01 +0000 (12:05 +0200)]
Fix visual glitch in Chrome on ref selector

5 years agoShip a zeus init file to bypass cucumber etc
Marius Mathiesen [Wed, 3 Jul 2013 09:25:31 +0000 (11:25 +0200)]
Ship a zeus init file to bypass cucumber etc

5 years agoExplicit requires for production
Marius Mathiesen [Wed, 3 Jul 2013 09:25:04 +0000 (11:25 +0200)]
Explicit requires for production

5 years agoBetter repository browser errors
Christian Johansen [Wed, 3 Jul 2013 09:06:14 +0000 (11:06 +0200)]
Better repository browser errors

5 years agoUpdate todo
Christian Johansen [Wed, 3 Jul 2013 08:07:18 +0000 (10:07 +0200)]
Update todo

5 years agoSite-specific footer links for Dolt too
Christian Johansen [Wed, 3 Jul 2013 08:06:58 +0000 (10:06 +0200)]
Site-specific footer links for Dolt too

5 years agoMerge branch 'next' of gitorious.org:gitorious/mainline into next
Christian Johansen [Wed, 3 Jul 2013 07:53:52 +0000 (09:53 +0200)]
Merge branch 'next' of gitorious.org:gitorious/mainline into next

5 years agoFix missing require
Christian Johansen [Wed, 3 Jul 2013 07:42:08 +0000 (09:42 +0200)]
Fix missing require

5 years agoRepositories#show redirects to repo browser
Christian Johansen [Wed, 3 Jul 2013 07:19:13 +0000 (09:19 +0200)]
Repositories#show redirects to repo browser

5 years agoOnly use better_errors in 1.9 or above
Thomas Kjeldahl Nilsson [Wed, 3 Jul 2013 06:57:57 +0000 (08:57 +0200)]
Only use better_errors in 1.9 or above

5 years agoWorking "watch" buttons on repository page
Christian Johansen [Wed, 3 Jul 2013 06:50:33 +0000 (08:50 +0200)]
Working "watch" buttons on repository page

5 years agoResolve issue in removing SSH keys
Marius Mathiesen [Tue, 2 Jul 2013 13:51:48 +0000 (15:51 +0200)]
Resolve issue in removing SSH keys

The processor would receive an SSH key ID for a key which has been
removed from the database.

We'll send the payload to look for in the authorized_keys file instead.

5 years agoMerge branch 'next' of gitorious.org:gitorious/mainline into next
Christian Johansen [Tue, 2 Jul 2013 13:20:04 +0000 (15:20 +0200)]
Merge branch 'next' of gitorious.org:gitorious/mainline into next

5 years agoMake source code browser default action for repositories
Christian Johansen [Tue, 2 Jul 2013 13:19:53 +0000 (15:19 +0200)]
Make source code browser default action for repositories

5 years agoTry to generate kosher Watch links
Marius Mathiesen [Tue, 2 Jul 2013 12:59:16 +0000 (14:59 +0200)]
Try to generate kosher Watch links

5 years agoExtract Repositories#show as RepositoryActivities#index
Christian Johansen [Tue, 2 Jul 2013 12:56:24 +0000 (14:56 +0200)]
Extract Repositories#show as RepositoryActivities#index

5 years agoFix broken processor
Marius Mathiesen [Tue, 2 Jul 2013 12:19:57 +0000 (14:19 +0200)]
Fix broken processor

5 years agoFix NameError due to missing form builder
Marius Mathiesen [Tue, 2 Jul 2013 11:42:34 +0000 (13:42 +0200)]
Fix NameError due to missing form builder

5 years agoUpdate todo
Christian Johansen [Tue, 2 Jul 2013 11:37:47 +0000 (13:37 +0200)]
Update todo

5 years agoMerge branch 'next' of gitorious.org:gitorious/mainline into next
Christian Johansen [Tue, 2 Jul 2013 11:27:16 +0000 (13:27 +0200)]
Merge branch 'next' of gitorious.org:gitorious/mainline into next

5 years agoTweak commit/log UI details
Christian Johansen [Tue, 2 Jul 2013 11:26:50 +0000 (13:26 +0200)]
Tweak commit/log UI details

Add JavaScript
Add graph/capillary
Remove old capillary JS stuff

5 years agoBetterErrors
Marius Mathiesen [Tue, 2 Jul 2013 11:04:45 +0000 (13:04 +0200)]
BetterErrors

The commit message says it all

5 years agoMerge branch 'next' of gitorious.org:gitorious/mainline into next
Christian Johansen [Tue, 2 Jul 2013 10:41:45 +0000 (12:41 +0200)]
Merge branch 'next' of gitorious.org:gitorious/mainline into next

5 years agoAdd script to bundle UI in Gitorious
Christian Johansen [Tue, 2 Jul 2013 10:41:14 +0000 (12:41 +0200)]
Add script to bundle UI in Gitorious

This way, deployments no longer need to initialize sub modules

5 years agoGTS3 UI and layout for commit page and graph page
Thomas Kjeldahl Nilsson [Mon, 24 Jun 2013 10:49:42 +0000 (12:49 +0200)]
GTS3 UI and layout for commit page and graph page

5 years agoUpdate rake - no more bundle exec rake!
Marius Mathiesen [Tue, 2 Jul 2013 08:25:13 +0000 (10:25 +0200)]
Update rake - no more bundle exec rake!