summaryrefslogtreecommitdiffstats
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
...
* No memcached TTL on MergeRequestVersion diffsJohan Sørensen2009-11-041-3/+3
| | | | | But tack on a version to the memcached key so we have some way of expiring them, should the need arise
* Create an Event when commenting on a MergeRequestVersion as wellJohan Sørensen2009-11-041-6/+6
|
* Display comments on both merge request and versions in the comment listingMarius Mathiesen2009-11-041-0/+5
|
* Render a list of comments both to the merge and the diffs affected.Marius Mathiesen2009-11-042-3/+21
| | | | - When new diffs are loaded, the comments are loaded too
* Support for commenting on Merge Request versions.Marius Mathiesen2009-11-041-0/+4
|
* Only include comments for the current sha range (merge request versions)Marius Mathiesen2009-11-041-2/+5
|
* When a merge request version has comments, render these alongside the diff.Marius Mathiesen2009-11-042-1/+8
| | | | | - A comment always returns a sha range, even when involving a single commit - A merge request version returns comments for a path
* Hooking comments to merge request versionsMarius Mathiesen2009-11-042-0/+11
|
* Search in repositories for projectMarius Mathiesen2009-11-042-2/+13
| | | | | | | Project#search_repositories takes a regexp and finds repos which somehow match the regexp: - repo name - owner name - team name
* The by_users named scope in repository now has a fresh subsetMarius Mathiesen2009-11-031-1/+5
| | | | Pass along a limit to repositories.by_users.fresh
* Make sure tracking repositories aren't included in the `clones` scopeJohan Sørensen2009-10-301-1/+2
|
* Don't create an extra version event when creating a new merge requestJohan Sørensen2009-10-222-15/+27
| | | | | | | | | The "New version 1" event created when a new merge request is created just leads to clutter and provide only what the MERGE_REQUEST_CREATED event already does Also clean up a few of the silly long lines (lets keep within 82 chars or so shall we)
* Skip the limit clause in Group::all_participating_in_projectsJohan Sørensen2009-10-071-7/+3
|
* Make sure Group::all_participating_in_projects really includes all the groupsJohan Sørensen2009-10-071-3/+6
|
* Merge commit 'refs/merge-requests/1645' of gitorious.org:gitorious/mainlineJohan Sørensen2009-10-021-0/+4
|\ | | | | | | | | * gitorious.org:gitorious/mainline: When changing ownership of a project to a group, the group is granted commit rights to all the repositories in that project.
| * When changing ownership of a project to a group, the group is granted commit ↵August Lilleaas2009-09-291-0/+4
| | | | | | | | rights to all the repositories in that project.
* | The representation of the first and last commit should be reversed.Marius Mathiesen2009-09-301-1/+1
| |
* | Omit the merge base from the sha specification of a merge request version.Marius Mathiesen2009-09-301-4/+5
| | | | | | | | | | Since the backend now includes the previous commit when displaying the diff, the sha specification should not include it; rather start at the first and end at the last affected commit.
* | Changed the notation for a commit range from "a..b" to "a-b"Marius Mathiesen2009-09-291-4/+10
| | | | | | | | | | | | ... since we include the commit previous to a. Also moved some of the code for merge request selection to a "class", made the loading from a uri hash work nicely.
* | Diff from the commit before the current one to display a more correct diff.Marius Mathiesen2009-09-281-3/+13
| | | | | | | | | | - Also use the full sha in the location hash to make the commis retrievable from ruby-git
* | Adding caching to the commit diffsMarius Mathiesen2009-09-281-3/+11
| |
* | Cleaning up the merge request diff viewMarius Mathiesen2009-09-281-1/+13
| | | | | | | | | | | | - Extracted the diff view to a partial - Renamed MergeRequestVersion#commits -> diffs - JS hooks, CSS fixes
* | Extract the diffs only from MergeRequestVersionMarius Mathiesen2009-09-281-5/+20
| | | | | | | | | | Introduced a new model to facilitate fetching diffs with Grit's somewhat broken git-ruby in this respect
* | Display the diffs on the merge request page.Marius Mathiesen2009-09-281-0/+15
| | | | | | | | Select a single or range of shas, load these from MergeRequestVersions
* | Remove the new_repository_clone email notificationJohan Sørensen2009-09-252-44/+0
| | | | | | | | | | Getting notified about new clones is generally a bit uninteresting as nothing have been committed yet, and it's already in the project feed.
* | Grant merge request creators the ability to change the statusJohan Sørensen2009-09-231-1/+1
|/
* Make Repository#log_changes_with_user not eat validation errorsJohan Sørensen2009-09-151-4/+2
| | | | | | | | By reverting to the old value on a validation error, the message fails to bubble up to the UI. Also, use the accessors instead of write_attribute. Furthermore, also reload the @repository object for the form action target, otherwise it could redirect to the previously invalid slug.
* No Grit timeout on Repository#gc!Johan Sørensen2009-09-141-2/+4
|
* Implement a more conservative way of running git-gcJohan Sørensen2009-09-141-0/+16
| | | | | | Add a Repository#last_gc_at timestamp and only run on recently pushed to repositories. Also resurrect script/repo_housekeeping to be used again
* Setup an exclusive flock when writing to the SshKeyFileJohan Sørensen2009-09-081-1/+5
|
* Make sure a users ssh_keys are destroyed along with the userJohan Sørensen2009-09-041-1/+1
|
* Include summary in MergeRequest#to_xml and use the status_tag as wellJohan Sørensen2009-09-011-2/+2
|
* Include more reserved words when validation Repostiory#nameJohan Sørensen2009-09-011-1/+2
|
* Make sure the key gets written to the Tempfile before invoking ssh-keygenJohan Sørensen2009-08-311-1/+3
|
* Validate pubkeys using ssh-keygenJohan Sørensen2009-08-281-0/+13
|
* MergeRequest.from_filter shouldn't make special exceptions for 'open'/'closed'Johan Sørensen2009-08-271-7/+2
|
* Add a MergeRequest::public scope, and make sure to use it consequentlyJohan Sørensen2009-08-271-0/+1
| | | | We have no interest in showing merge requests in a pending state
* Validate presence of summary field for new merge requests and migrate ↵Johan Sørensen2009-08-271-1/+1
| | | | | | existing ones also made the tests pass with the new required summary field
* Update merge requests if a MergeRequestStatus changes name as wellJohan Sørensen2009-08-261-3/+5
|
* Merge commit 'qt/restructure-merge-request-view'Johan Sørensen2009-08-251-1/+1
|\ | | | | | | | | | | | | | | | | | | * commit 'qt/restructure-merge-request-view': Move merge-request help box to the bottom of the page Remove sidebar from merge-requests and move links to the bottom Use merge-request number for breadcrumb title instead of source branch Conflicts: app/views/merge_requests/show.html.erb
| * Use merge-request number for breadcrumb title instead of source branchTor Arne Vestbø2009-08-241-1/+1
| |
* | Be able to set a default MergeRequestStatusJohan Sørensen2009-08-253-4/+33
| | | | | | | | And use that as the default status for all new merge requests
* | dependent => :destroy for merge request versionsMarius Mathiesen2009-08-251-1/+1
| |
* | Update affected merge requests when the state of a MergeRequestStatus changesJohan Sørensen2009-08-251-0/+15
| |
* | Make sure MergeRequest#status_string is a string (for the "legacy" template)Johan Sørensen2009-08-241-1/+1
|/
* Added missing license headers to StatusTag and StatusTagTestJohan Sørensen2009-08-241-0/+18
|
* include the status_Tag description when rendering the select tagJohan Sørensen2009-08-243-12/+2
|
* Be able to easily add/remove merge-request statuses from projects#editJohan Sørensen2009-08-242-1/+11
| | | | | | - add some javascript helpers - Be able to easily add/remove statuses without page refresh - Colorize the status in merge_requests#index
* Create a default "Open" and "Closed" merge_request_status on Project creationJohan Sørensen2009-08-242-3/+10
|
* Losen the custom merge request states even further and allow for both ↵Johan Sørensen2009-08-246-62/+144
| | | | | | | | | | | open&closed custom states - Introduce a StatusTag class for abstracting the loosely bounded MergeRequest#status_tag - Move to the "legacy" merge_requests closer to the normal ones - Simplify the internal MergeRequest statemachine to only have STATUS_OPEN and STATUS_CLOSED - Introduce a MergeRequestStatus model that users add to a project with one of the states above - Remove the legacy merge_requests_controller actions
* Adding a timeout around the repository cloning operationMarius Mathiesen2009-08-181-3/+4
|
* Add Other/Multiple as a licence optionJohan Sørensen2009-07-311-0/+1
| | | | For when each repo in a project has a different license
* Be able to turn new merge-request notifications on or off, per repositoryJohan Sørensen2009-07-241-3/+9
|
* The "Open" status tag should be capitalized, not downcased when ↵Johan Sørensen2009-07-221-1/+1
| | | | confirmed_by_user
* Make sure pending merge requests are never included in the scopes or ↵Johan Sørensen2009-07-221-5/+5
| | | | #from_filter
* Refactor the merge-request tracking branches deletion to be in an ↵Johan Sørensen2009-07-221-9/+16
| | | | | | | | after_destroy hook Pass along all the data needed for the processor in the message body when the after_destroy hook is called. That way users don't get confused and delete it multiple times (since there's a small delay in the msg processing
* Use the correct "Apache License" instead of the older "Apache Software License"Johan Sørensen2009-07-211-1/+1
|
* Make sure the :login interpolation for Paperclip is downcasedJohan Sørensen2009-07-201-1/+1
|
* Adding a processor for handling deletion of merge requests.Marius Mathiesen2009-07-171-0/+6
| | | | | | | | Replacing MergeRequests#destroy with a call to #soft_delete, which posts a message to the MQ. This processor will both delete the ref in the target repository and delete the merge request itself. The ref in the tracking repository is not deleted yet, nor are updates in the backend handled for merge requests that are closed or reopened.
* Deletion of merge requests in Git should be allowed for local connections.Marius Mathiesen2009-07-161-0/+4
| | | | | Also added support for deleting the merge request ref in the target repository. This will be done before the merge request is deleted.
* Simplify the SshKey#fingerprint splitting a little bitJohan Sørensen2009-07-161-2/+1
| | | | we already have the #encoded_key for that kind of dull stuff
* Show the pubkey fingerprint instead of the base64 contents on the ssh key ↵Johan Sørensen2009-07-161-0/+8
| | | | listing
* Ensuring the cache keys for merge request versions are truly uniqueMarius Mathiesen2009-07-161-2/+1
|
* Make sure the tracking repo isn't included in any listingsJohan Sørensen2009-07-153-2/+4
|
* The default status_tag of new merge requests should be openMarius Mathiesen2009-07-151-0/+2
| | | | | - This is set when MergeRequest#confirmed_by_user is called, meaning merge requests needing acceptance of contribution agreements will be set to open as soon as the agreement is accepted
* Display Gitorious as the sender of messages with a notifiable.Marius Mathiesen2009-07-151-1/+9
| | | | - Also do not allow replying to these messages
* Calculate the merge base for a merge-request without timeoutsJohan Sørensen2009-07-151-1/+2
|
* Prettified the rendering of merge request status changes in comments and eventsJohan Sørensen2009-07-152-7/+9
|
* Add the comment in the event generated when updating a merge request with a ↵Marius Mathiesen2009-07-142-5/+12
| | | | new state.
* Make sure the MergeRequestVersion#cache_key is unique across versionsJohan Sørensen2009-07-141-2/+4
|
* Supplying a list of status tags per repository when listing merge requests:Marius Mathiesen2009-07-132-1/+11
| | | | | | | | - add a list of unique status_tags - MergeRequest.from_filter uses a named scope by filter when given a non-defined string MergeRequest.from_filter now uses either a predefined name scope, the by_status named scope or open (when given nil)
* Comment shouldn't require a body if they apply to a merge request and change ↵Marius Mathiesen2009-07-131-1/+10
| | | | its state
* index the MergeRequest#status_tag as statusJohan Sørensen2009-07-131-1/+2
|
* Reformatted line-length, added a comment about future optimization andJohan Sørensen2009-07-131-4/+5
| | | | removed debug logger statement
* Be able to turn on denying of delete-refs and non-fast-forwardsJohan Sørensen2009-07-101-5/+0
| | | | | This adds a deny_force_pushing? to Repository and makes the pre-receive hook acts accordingly to that setting
* Changed RepositoryController#real_path to #config and made it includeJohan Sørensen2009-07-101-0/+5
| | | | whether force pushing is alloed or not
* Do not send notification emails for tracking repositoriesJohan Sørensen2009-07-091-2/+2
|
* Change the filtering on merge requests to use the status_tag.Marius Mathiesen2009-07-022-6/+23
| | | | | | | - added a migration method for getting existing merge request up to the current version - use the status_tag instead of status_string in the views - commenting on a merge request and assigning a new status should notify the owner of the new status as well
* Let each project define its status tags for merge requestsMarius Mathiesen2009-07-023-38/+51
| | | | - when changing the state from a comment, create an event - display status field in merge request form
* Cache the commit status for 60 minutesMarius Mathiesen2009-07-011-1/+1
|
* Cache the commits in MergeRequestVersionMarius Mathiesen2009-06-301-1/+7
|
* Make sure the new mergerequest created Message has the correct sender in the ↵Johan Sørensen2009-06-301-1/+3
| | | | title
* Moving the calculation of commits in a merge request version where it belongsMarius Mathiesen2009-06-302-5/+4
|
* Commit status for commits in a merge request:Marius Mathiesen2009-06-301-4/+7
| | | | | | - Cache the merge status of each commit for merge requests - Load commit status with AJAX for each commit in merge request (- add some graphics)
* Restructure the front page boxes a bit, only show active projects from the ↵Johan Sørensen2009-06-301-1/+1
| | | | last few days
* Push to the MergeRequest tracking repository without a timeoutJohan Sørensen2009-06-291-4/+7
|
* Make sure Repository#change_owner_to sets the correct repository kindJohan Sørensen2009-06-261-1/+11
|
* For legacy merge requests (that is, no versions yet) we need to use the ↵Marius Mathiesen2009-06-241-1/+6
| | | | ending_commit as limit
* Support for merge requests without versions (legacy):Marius Mathiesen2009-06-241-1/+5
| | | | | | | | | - Another show page is displayed - When a merge request is created, the page will reload after 5 seconds until a version is created in the background. - The commits_to_be_merged either returns the delta (legacy objects) or data loaded from the tracking branch (new objects) - Hide the selector for new versions
* Enabling edit/update in MergeRequestsController:Marius Mathiesen2009-06-241-3/+10
| | | | | - Edit will let the user choose a proposal and ending comit - Update will update and send a notification
* Handle legacy merge requests (=no versions) with a different templateMarius Mathiesen2009-06-241-1/+1
| | | | - Use dropdown for selecting versions instead of list
* Merge request updates:Marius Mathiesen2009-06-241-3/+6
| | | | | - show if a commit is merged in target_repo - rendering of merge request update events
* Adding versions to merge request, track the last common base between source ↵Marius Mathiesen2009-06-242-46/+128
| | | | | | and target repo - Also do not require subdomains for Repositories#real_path
* When migrating merge requests: handle situations where the ending commitMarius Mathiesen2009-06-241-2/+6
| | | | doesn't exist in the source repository by issuing a warning.
* Let users view commits from earlier versions of a merge requestMarius Mathiesen2009-06-241-2/+6
| | | | | | - Adding MergeRequests#version - Adding MergeRequest#versions - Moving commits into a partial
* Render a waiting message when viewing a merge request without a backend branch.Marius Mathiesen2009-06-241-1/+6
| | | | | | - Giving MergeRequest a ready? method for determining whether the backend branch has been created or not - Setting refresh header&use render_if_ready
* Make some status tags "sticky", that is change the state machinestate.Marius Mathiesen2009-06-242-12/+25
| | | | | | | - Add a list of status tags - Also remove the update_status method in MergeRequest, as this wasn't being used - Add tests for changing the status through comments
* Adding a loose state (status_tag) to merge requests, adding state change to ↵Marius Mathiesen2009-06-242-0/+41
| | | | | | | | | | | comments. - Adding a comment to a merge request now potentially sets or changes the loose state of the merge request (target) This way, target repository owners can mark that a merge request should change state when adding comments. This will eventually replace the more final reason from merge requests, replacing it with comments with an added context
* Add a migration facility for existing merge requestsMarius Mathiesen2009-06-241-1/+22
|
* Moved the authentication logic from SSH Client to pre-receive:Marius Mathiesen2009-06-241-0/+1
| | | | | | | | | | - script/gitorious only checks whether the repo exists, and sets an environment var for the URL for auth checking - hooks/pre-receive performs the access control, as before Currently, users should be allowed to push normally, like before. In addition to that, owners of merge requests are allowed to push to the special ref for the merge request in the target repository
generated by cgit v1.1 at 2025-06-04 22:45:51 +0000