Commit Graph

94 Commits

Author SHA1 Message Date
Jean-Philippe Lang abc0b0ea3e Don't use a disabled SCM as a default repository SCM (#779).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8653 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-15 22:23:56 +00:00
Jean-Philippe Lang 1bd5e58c84 Adds support for multiple repositories per project (#779).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8650 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-15 18:19:19 +00:00
Jean-Philippe Lang fb1a2fd7cd Resourcified repositories for CRUD operations to prepare for multiple SCM per project (#779).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8648 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-15 14:23:06 +00:00
Etienne Massip 59789c7997 Moved Date months/weeks calculations used in Graph to lib.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8540 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-07 19:02:10 +00:00
Etienne Massip 90010d1f3b Removed code duplicated in lib.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8206 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-14 18:07:27 +00:00
Toshi MARUYAMA 4ae7f82f3a do not annotate text files which exceed the size limit for viewing (#9484)
Contributed by Antonio García-Domínguez.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7728 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-05 03:47:03 +00:00
Toshi MARUYAMA e33ce24849 scm: controller: include parents in changesets (#5501)
Contributed by Jan Topiński.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7715 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-03 08:11:38 +00:00
Toshi MARUYAMA 1f4ff3687c Rails3: controller: repositories: use to_s for revision parameter
On Rails 3.0 and Ruby 1.8.7, following error raises.

Error:
test_revision(RepositoriesControllerTest):
NoMethodError: undefined method `strip' for 1:Fixnum
    app/controllers/repositories_controller.rb:252:in `find_repository'
    test/functional/repositories_controller_test.rb:44:in `test_revision'

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7622 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-09 23:34:53 +00:00
Toshi MARUYAMA d84565220b remove trailing white-spaces from app/controllers/repositories_controller.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6891 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-08-31 12:01:01 +00:00
Jean-Philippe Lang 93c2b92a4b Separation of RSS/API auth actions.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6197 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-07-09 08:56:07 +00:00
Jean-Baptiste Barth 115d227298 Do not cache I18n strings when truncating a long diff (#5089).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6073 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-13 22:09:01 +00:00
Toshi MARUYAMA 5543ec5f5a scm: code clean up repositories controller.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5875 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-21 06:16:19 +00:00
Toshi MARUYAMA 782f7ca3bf scm: remove trailing white-spaces from repositories controller.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5874 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-21 06:15:34 +00:00
Toshi MARUYAMA 57c5b4ea74 scm: use repository merge_extra_info() to save extra_ parameter (#8365, #7047).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5770 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-13 03:52:18 +00:00
Toshi MARUYAMA ab430a13b5 scm: switch to save repository setting params in "extra_" or not (#8365, #7047).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5769 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-13 03:51:43 +00:00
Toshi MARUYAMA 615c81f3df scm: code clean up Repositories Controller.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5708 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-08 09:47:42 +00:00
Toshi MARUYAMA 69bb041c46 scm: set disable a button if scm is not selected in project scm setting.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5625 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-04 04:59:28 +00:00
Toshi MARUYAMA ca5ce92cfc scm: code clean up RepositoriesController.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5617 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-03 07:32:50 +00:00
Toshi MARUYAMA f15b12556f scm: set mime type in downloading file.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5210 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-22 16:56:52 +00:00
Toshi MARUYAMA 79eba572af scm: fix non ascii text files displaying (#6256).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5204 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-22 15:31:17 +00:00
Toshi MARUYAMA b6dfa0b081 scm: recovery showing "root @ branch" in repository tree viewing.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5139 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-15 08:21:26 +00:00
Toshi MARUYAMA 66c979d63c scm: fix diff revision param validation.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4860 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-17 14:17:04 +00:00
Toshi MARUYAMA 3493bb1d37 scm: space and tab cleanup of app/controllers/repositories_controller.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4817 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-12 09:44:46 +00:00
Toshi MARUYAMA 4957f91639 scm: fix non ASCII filename downloaded from repo is broken on Internet Explorer (#7288).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4816 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-12 09:44:23 +00:00
Toshi MARUYAMA 6e1fa1603b scm: use format_revision() for history, view and annotate (#3724).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4733 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-21 13:22:08 +00:00
Jean-Philippe Lang e14e244f7b Use #blank? instead of #nil? || #empty?.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4711 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-14 20:24:03 +00:00
Jean-Philippe Lang 7d0b1b3830 Respond with 404 instead of 500 when revision/entry is not found in the repository (#7307).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4710 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-14 20:22:36 +00:00
Toshi MARUYAMA 98b3a50657 scm: fix error on revision page for empty revision (#7307).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4703 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-13 12:04:30 +00:00
Toshi MARUYAMA ebb19c5863 scm: changing two revision diff text at SCM adapter level (#3724).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4698 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-11 16:04:07 +00:00
Toshi MARUYAMA 2e1bcb2abf Changing revision label and identifier at SCM adapter level (#3724, #6092)
Contributed by Yuya Nishihara.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4613 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-02 09:45:05 +00:00
Jean-Philippe Lang 03397f605c Fixes valid revision regexp.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4549 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-20 18:47:54 +00:00
Jean-Philippe Lang 84dd413f22 Restore rev param validation that was removed in r2840.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4542 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-18 18:37:49 +00:00
Jean-Philippe Lang 3bf6790826 Add "Repository" menu item after repository creation (#5328).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3680 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-17 12:51:46 +00:00
Eric Davis e5d300af0a Refactor: Pull up several #find_project methods to ApplicationController
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3370 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-05 16:57:02 +00:00
Jean-Philippe Lang 488c192286 Removes "xxx and return" calls (#4446).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3185 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-18 14:22:18 +00:00
Jean-Philippe Lang 07aa3c55bd Contextual quick search (#3263).
Eg. when viewing issues, the quick search will search issues only.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2943 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 17:07:18 +00:00
Jean-Philippe Lang 30ad78e57d Fixed: RepositoriesController#revision may show wrong revision (#3779).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2898 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-09-20 15:20:22 +00:00
Eric Davis 7b0cb6aba8 Upgraded to Rails 2.3.4 (#3597)
* Ran the Rails upgrade
* Upgraded to Rails Engines 2.3.2
* Added a plugin to let Engines override application views.
* Converted tests to use the new classes:
** ActionController::TestCase for functional
** ActiveSupport::TestCase for units
* Converted ActiveRecord::Error message to a string.
* ActiveRecord grouping returns an ordered hash which doesn't have #sort!
* Updated the I18n storage_units format.
* Added some default initializers from a fresh rails app
* Changed the order of check_box_tags and hidden_field_tags.  The hidden tag
  needs to appear first in Rails 2.3, otherwise it will override any value in
  the check_box_tag.
* Removed the custom handler for when the cookie store is tampered with.
  Rails 2.3 removed the TamperedWithCookie exception and instead Rails will not
  load the data from it when it's been tampered with (e.g. no user login).
* Fixed mail layouts, 2.3 has problems with implicit multipart emails that
  use layouts.  Also removed some custom Redmine mailer code.
* Fixed a bug that occurred in tests where the "required" span tag would be
  added to the :field_status translation.  This resulted in an email string of:

    <li>Status<span class="required"> *</span><span class="required"> *</span>

  Instead of:

    <li>Status: New</li>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2887 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-09-13 17:14:35 +00:00
Jean-Philippe Lang 5b97570693 SCM:
* add latest changesets for the current directory when browsing the repository and a link to the full log
* ability to diff a directory (#3575)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2849 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-09-01 12:13:17 +00:00
Jean-Philippe Lang a4d7a03b14 SCM browser:
* don't show repository commits when showing a subfolder
* remove obsolete view browse.rhtml

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2843 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-08-17 14:26:13 +00:00
Eric Davis c28b044d68 Added branch and tag support to the git repository viewer. (#1406)
Many thanks to Adam Soltys and everyone else who tested this patch.

* Updated git test repository so it has a branch with some differences from the master branch
* Moved redmine diff class into a module so as not to clash with diff-lcs gem which is required by grit
* Find changesets from all branches, not just master
* Got revision browsing working
* Got file actions working properly
* Allow browsing by short form of commit identifier
* Added a method to retrieve repository branches
* Allow browsing by branch names as well as commit numbers
* Handle the case where a git repository has no master branch
* Expand revision box and handle finding revisions by first 8 characters
* Added branches dropdown to repository show page
* Combined repository browse and show into a single action.  Moved branch/revision navigation into a partial.
* Renamed partial navigation -> breadcrumbs
* Made it so latest revisions list uses branch and path context
* Preserve current path when changing branch or revision
* Perform slightly more graceful error handling in the case of invalid repository URLs
* Allow branch names to contain periods
* Allow dashes in branch names
* Sort branches by name
* Adding tags dropdown
* Need to disable both branches and tags dropdowns before submitting revision form
* Support underscores in revision (branch/tag) names
* Making file history sensitive to current branch/tag/revision, adding common navigation to changes page
* Updated translation files to include labels for 'branch', 'tag', and 'view all revisions'
* Reenable fields after submit so they don't look disabled and don't stay disabled on browser back button
* Instead of dashes just use empty string for default dropdown value
* Individual entry views now sport the upgraded revision navigation
* Don't display dropdowns with no entries
* Consider all revisions when doing initial load
* Fixed bug grabbing changesets.  Thanks to Bernhard Furtmueller for catching.
* Always check the entire log to find new revisions, rather than trying to go forward from the latest known one
* Added some cleverness to avoid selecting the whole changesets table any time someone views the repository root
* File copies and renames being detected properly
* Return gracefully if no revisions are found in the git log
* Applied patch from Babar Le Lapin to improve Windows compatibility

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2840 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-08-15 22:41:40 +00:00
Jean-Philippe Lang 81b84f641d Fixed: links to changesets in activity and atom feeds uses project id instead project identifier (#3137).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2663 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-04-07 17:30:56 +00:00
Jean-Philippe Lang 1c5a2ddfb0 Limit the size of repository files displayed inline too.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2505 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-02-21 16:04:51 +00:00
Jean-Philippe Lang fe28193e4e Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2493 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-02-21 11:04:50 +00:00
Jean-Philippe Lang ab5e07e83e Adds a setting to limit the number of revisions displayed on a repository file log (default=100).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2350 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-02-01 19:54:50 +00:00
Jean-Philippe Lang 3f80a89a69 Show view/annotate/download links on repositories/entries and repositories/annotate views (#2367).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2167 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-12-22 20:33:01 +00:00
Jean-Philippe Lang 7cea286c23 Fixes repository user mapping submission when a repository username is blank (#2339, Conflicting types for parameter containers).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2137 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-12-15 18:02:25 +00:00
Jean-Philippe Lang 6f68a36679 Eager-load users.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2007 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-11-10 19:09:00 +00:00
Jean-Philippe Lang 79c33bbc83 Maps repository users to Redmine users (#1383).
Users with same username or email are automatically mapped. Mapping can be manually adjusted in repository settings. Multiple usernames can be mapped to the same Redmine user.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2006 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-11-10 18:59:06 +00:00
Jean-Philippe Lang 3520961eae Render the commit changes list as a tree (#1896).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1870 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-09-17 16:39:23 +00:00