Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Render the new comment and diffs when inline commenting on a commit | Marius Mathiesen | 2009-11-16 | 6 | -14/+41 | |
| | | | | - Made partials/javascripts reusable between different inline commenting objects | |||||
* | Add an inline form to Commits#show | Marius Mathiesen | 2009-11-16 | 4 | -29/+68 | |
| | | | | - moved same markup in merge request version to same partial | |||||
* | Make Comments#create render something meaningful when receiving a comment on ↵ | Marius Mathiesen | 2009-11-16 | 3 | -18/+75 | |
| | | | | | | a commit - A minor refactoring of this whole rendering was indeed required | |||||
* | Bit more spacing around the event date, to prevent the silly wrapping | Johan Sørensen | 2009-11-16 | 1 | -2/+2 | |
| | ||||||
* | Render a default image in search results when no avatar | Marius Mathiesen | 2009-11-16 | 1 | -1/+3 | |
| | ||||||
* | Mark the whole message thread as read by the recipient when he reads it | Johan Sørensen | 2009-11-16 | 3 | -1/+27 | |
| | ||||||
* | Some UX tweaks to the live search function | Marius Mathiesen | 2009-11-16 | 3 | -7/+49 | |
| | | | | | - Performing an empty search resets the search form (no search, just display standard contents) - When no matches are found, render a div with class no-results-found (if any) | |||||
* | No margin on the date box for the single-push event containers | Johan Sørensen | 2009-11-16 | 1 | -0/+1 | |
| | ||||||
* | Extract some stuff from the MessagesController into the model | Johan Sørensen | 2009-11-16 | 3 | -3/+31 | |
| | ||||||
* | Add the proper lang class to the blob to be highlighted | Johan Sørensen | 2009-11-13 | 1 | -1/+2 | |
| | ||||||
* | Order the repository clone shortlist by last_pushed_to | Johan Sørensen | 2009-11-13 | 2 | -3/+12 | |
| | ||||||
* | Show most active users in the past 3 days to give bette rotation | Johan Sørensen | 2009-11-12 | 3 | -8/+11 | |
| | ||||||
* | Escape HMTL tags in the liveSearch renderer | Johan Sørensen | 2009-11-12 | 1 | -8/+14 | |
| | ||||||
* | Only show the repo-show box if there's more than 5 user/group clones | Johan Sørensen | 2009-11-12 | 4 | -10/+19 | |
| | ||||||
* | Add a note to the "deny force pushes" checkbox that it applies to tags as well | Johan Sørensen | 2009-11-12 | 1 | -1/+2 | |
| | ||||||
* | Tweak the repo searching a bit | Johan Sørensen | 2009-11-12 | 10 | -69/+129 | |
| | | | | | - Only list 5 groups and users, not all of them, by default - Tweak the CSS a bit | |||||
* | A live search function for repository clones, along with a shortened list of ↵ | Marius Mathiesen | 2009-11-12 | 4 | -15/+68 | |
| | | | | | | clones on the repository page | |||||
* | Added Repository#search clones for clones matching a term | Marius Mathiesen | 2009-11-12 | 4 | -7/+27 | |
| | | | | | - Limit the number of clones displayed on Repositories#show - Moved the logic behind this and Project#search_clones into Repository#matches_regexp? | |||||
* | Make the repo search form work w/different screen width, better test coverage | Marius Mathiesen | 2009-11-12 | 2 | -3/+20 | |
| | ||||||
* | Style the search field differently, adding a reset element to the DOM which ↵ | Marius Mathiesen | 2009-11-12 | 5 | -21/+106 | |
| | | | | resets the form. | |||||
* | Further cleaning of the tests | Marius Mathiesen | 2009-11-12 | 1 | -1/+2 | |
| | ||||||
* | The tests had better keep fresh | Marius Mathiesen | 2009-11-12 | 1 | -18/+10 | |
| | ||||||
* | Keeping the line width reasonable | Marius Mathiesen | 2009-11-12 | 1 | -1/+2 | |
| | ||||||
* | Adding a waiting indication when performing a search, extract live search as ↵ | Marius Mathiesen | 2009-11-12 | 6 | -124/+139 | |
| | | | | a reusable module | |||||
* | Test the live search renderer too | Marius Mathiesen | 2009-11-12 | 2 | -2/+19 | |
| | ||||||
* | Adding a liveSearch plugin, enable it on the repository listing | Marius Mathiesen | 2009-11-12 | 9 | -5/+347 | |
| | | | | | | - The json rendering in Repositories#index is now done by the controller - Include a new js-file for live searching - Searching repositories in a project now matches repo description | |||||
* | Use relative image URLs in the stylesheet, for deployments under a different ↵ | Marius Mathiesen | 2009-11-11 | 1 | -138/+138 | |
| | | | | root | |||||
* | Disable inline commenting if the diff is a rather large one | Johan Sørensen | 2009-11-10 | 2 | -1/+12 | |
| | | | | | | Otherwise we'll trigger script warnings, or just be generally slow. 3500 wasn't chosen as a value, may need further tuning on machines with less "h-uumph". | |||||
* | Don't shadow block-local variable when rendering orphaned merge-request statuses | Johan Sørensen | 2009-11-10 | 1 | -3/+4 | |
| | ||||||
* | Make Project::most_active_recently use a cache key that's actually cachable | Johan Sørensen | 2009-11-10 | 2 | -4/+5 | |
| | ||||||
* | If creating a merge-request comment, render two partials into a JSON structure | Johan Sørensen | 2009-11-10 | 3 | -5/+20 | |
| | | | | | So we can update both the file-diff and the .comments div with the "normal" comment list | |||||
* | Making some methods protected in the CommentsController, and fixed bad ↵ | Johan Sørensen | 2009-11-10 | 2 | -54/+55 | |
| | | | | indentation | |||||
* | Changed default name of repository clone to <user>s-<repository> | Thomas Schamm | 2009-11-09 | 4 | -5/+5 | |
| | ||||||
* | Less spacing in single-commit push events | Johan Sørensen | 2009-11-06 | 1 | -1/+2 | |
| | ||||||
* | Calculate User::most_active by commits, not pushes | Johan Sørensen | 2009-11-06 | 2 | -4/+4 | |
| | ||||||
* | The <code> tag will handle escaping of the Comment#context | Johan Sørensen | 2009-11-06 | 2 | -3/+2 | |
| | ||||||
* | Merge remote branch 'gitorious/master' | Johan Sørensen | 2009-11-06 | 1 | -1/+1 | |
|\ | | | | | | | | | | | * gitorious/master: When highlighting comment rows in the diff table, only inlude changed lines Fix stepping of activity lists with larger font sizes. | |||||
| * | When highlighting comment rows in the diff table, only inlude changed lines | Johan Sørensen | 2009-11-05 | 2 | -4/+4 | |
| | | ||||||
| * | Merge commit 'refs/merge-requests/1993' of gitorious.org:gitorious/mainline | Johan Sørensen | 2009-11-05 | 1 | -0/+1 | |
| |\ | | | | | | | | | | | | | * gitorious.org:gitorious/mainline: Fix stepping of activity lists with larger font sizes. | |||||
| | * | Fix stepping of activity lists with larger font sizes. | Tom Adams | 2009-11-03 | 1 | -0/+1 | |
| | | | ||||||
* | | | Stop the line number selectable when it encounters a hunk seperator | Johan Sørensen | 2009-11-06 | 1 | -6/+6 | |
| | | | | | | | | | | | | We don't want to inline comments to span across multiple hunks | |||||
* | | | When highlighting comment rows in the diff table, only inlude changed lines | Johan Sørensen | 2009-11-06 | 2 | -4/+4 | |
| | | | ||||||
* | | | Fix stepping of activity lists with larger font sizes. | Tom Adams | 2009-11-06 | 1 | -0/+1 | |
| | | | ||||||
* | | | Making the event rendering kick ass in Konqueror | Marius Mathiesen | 2009-11-06 | 1 | -1/+1 | |
|/ / | ||||||
* | | Make the inline comment list appear when a new comment is posted | Johan Sørensen | 2009-11-05 | 2 | -5/+24 | |
| | | ||||||
* | | Fix lack of iteration introduced in 0aaca61c5e82b1e3e787c8e780b8e0b621edf3c1 | Johan Sørensen | 2009-11-05 | 1 | -1/+1 | |
| | | ||||||
* | | Don't use the Repositories#fresh scope just yet | Johan Sørensen | 2009-11-05 | 1 | -2/+2 | |
| | | ||||||
* | | Support the comment events of Old Ages without any sha1 | Johan Sørensen | 2009-11-05 | 1 | -3/+12 | |
| | | ||||||
* | | Use a proper SQL query for MergeRequest.cascaded_comments so we can order ↵ | Johan Sørensen | 2009-11-05 | 2 | -18/+12 | |
| | | | | | | | | | | | | | | | | | | them properly Some MergeRequestController test cases had to be reworked as an effect of this, since they stub out too much internal logic of ActiveRecord, by stubbing out the association proxies, which is not a good thing to do anyway. | |||||
* | | Only notify the merge request owner once on new comments | Johan Sørensen | 2009-11-05 | 2 | -15/+18 | |
| | | | | | | | | | | | | | | There's already an after_save hook in Comment for notifying people, the controller should not do this as well. Further more the tests for this was invalid since it used the same user as the creator of the merge request (he shouldn't get notified about his own comments). | |||||
* | | Make Gitorious.DiffBrowser.CommentHighlighter methods less verbose | Johan Sørensen | 2009-11-04 | 1 | -9/+6 | |
| | | ||||||
* | | Moved rendering of the DiffSpinner into MergeRequestController.update() | Johan Sørensen | 2009-11-04 | 1 | -1/+1 | |
| | | | | | | | | | | Otherwise users would be left with a spinner and nothing happens if they select the same range as they're currently viewing | |||||
* | | Keep the *-diff-hunks-state cookies around for longer than the session | Johan Sørensen | 2009-11-04 | 1 | -2/+2 | |
| | | ||||||
* | | Make sure CommentForm.setInitialCommentBody works with windows line-endings | Johan Sørensen | 2009-11-04 | 2 | -1/+13 | |
| | | ||||||
* | | Fix event callback scoping issues in CommentForm, and unbind all registered ↵ | Johan Sørensen | 2009-11-04 | 1 | -11/+17 | |
| | | | | | | | | events on destroyAll() | |||||
* | | xMake the inline diff comment form work in webkit | Johan Sørensen | 2009-11-04 | 4 | -48/+43 | |
| | | | | | | | | | | | | | | | | | | By not extracting+inserting the #inline_comment_form html into different places in the DOM, we avoid weird side-effects in webkit (and get a lot cleaner code too). The diff container (".file-diff") must now be passed explicitly to the CommentForm.display() method so that it knows which one to insert the resulting diff with new comment into. | |||||
* | | Don't mention MergeRequestVersion in the notificationcomment subject | Johan Sørensen | 2009-11-04 | 1 | -2/+10 | |
| | | | | | | | | | | We should always refer to it as "merge request" towards the user, since that's the only thing he interacts with | |||||
* | | Render the timestamp for push events nicely | Johan Sørensen | 2009-11-04 | 3 | -3/+21 | |
| | | ||||||
* | | cancel the selectable() in td.code as well | Johan Sørensen | 2009-11-04 | 1 | -1/+1 | |
| | | ||||||
* | | When click 'reply' in an inline diff comment, insert the original quoted msg | Johan Sørensen | 2009-11-04 | 2 | -1/+22 | |
| | | ||||||
* | | Don't prefix Comment#context with a '<' and render them in a blockquote | Johan Sørensen | 2009-11-04 | 3 | -4/+10 | |
| | | ||||||
* | | Re-enable the selectable shas when a new version has been loaded | Marius Mathiesen | 2009-11-04 | 1 | -2/+1 | |
| | | ||||||
* | | Remove superflous 'about' prefix to the inline_diff comment partial | Johan Sørensen | 2009-11-04 | 1 | -1/+1 | |
| | | ||||||
* | | Add and use a Function.bind() for binding scope to the NotificationCenter ↵ | Johan Sørensen | 2009-11-04 | 5 | -42/+99 | |
| | | | | | | | | | | | | | | callbacks Instead of passing the receiver around, we're now responsible for binding the callback correctly when we add the observer | |||||
* | | Don't update Repository#last_pushed_at for merge-request pushes | Johan Sørensen | 2009-11-04 | 2 | -16/+37 | |
| | | | | | | | | | | Also rename the PushEventProcessor#commit_summary= method to the more descriptive process_push_from_commit_summary | |||||
* | | Make sure the select-commits-from-list table is almost full-width | Johan Sørensen | 2009-11-04 | 1 | -0/+1 | |
| | | ||||||
* | | Use long format for Ajax-loaded commits too | Marius Mathiesen | 2009-11-04 | 1 | -1/+1 | |
| | | ||||||
* | | Use the commit time as created_at for Commit events | Marius Mathiesen | 2009-11-04 | 2 | -2/+5 | |
| | | | | | | | | Also embolden the test "pushed" | |||||
* | | Don't show Comment#lines in the inline_diff comment partial | Johan Sørensen | 2009-11-04 | 1 | -1/+1 | |
| | | ||||||
* | | Move the comment editing JS into application.js and show a spinner when ↵ | Johan Sørensen | 2009-11-04 | 4 | -32/+46 | |
| | | | | | | | | loading form | |||||
* | | Store affected lines of an inline diff comment correctly | Johan Sørensen | 2009-11-04 | 19 | -125/+182 | |
| | | | | | | | | | | | | | | | | | | In order to be able to place the comment correctly in the diff we now store a tuple of [old_linenumber, new_line_number] along with the number of lines the comment spans. We store both the first and the last line number tuple so that we can calculate the placement of things generated outside the DOM tree (such as the InlineTableCallback diff rendering callback). | |||||
* | | Display commit details inline for single commit push events | Marius Mathiesen | 2009-11-04 | 3 | -3/+52 | |
| | | ||||||
* | | Introducing Event#single_commit? for single commit push events | Marius Mathiesen | 2009-11-04 | 2 | -1/+25 | |
| | | ||||||
* | | Patching ActionController::Session to work with latest Ruby 1.9.1 | Marius Mathiesen | 2009-11-04 | 1 | -0/+1 | |
| | | ||||||
* | | Selecting line numbers without text now works, line numbers are sorted correctly | Marius Mathiesen | 2009-11-04 | 3 | -3/+23 | |
| | | | | | | | | | | - Fetch line number from parent instead of text - Extended Array.prototype with min() and max() methods, use these to extract first and last line numbers | |||||
* | | Make sure we re-render the diff correctly when commenting on single commit | Johan Sørensen | 2009-11-04 | 3 | -8/+20 | |
| | | ||||||
* | | Extract the inline-diff comment diff context when the comment is created | Johan Sørensen | 2009-11-04 | 5 | -38/+40 | |
| | | | | | | | | | | | | | | instead of extracting it on the client side each time the page is loaded, we load it into Comment#context when saving the comment. This both saves us from some heavy DOM traversing and makes the diff context stick when viewing comments from another merge request version | |||||
* | | Make "standard" commenting work again on merge requests | Johan Sørensen | 2009-11-04 | 3 | -5/+7 | |
| | | | | | | | | The comments collection needs to have a preview action defined in the routes | |||||
* | | No need to hide the link to editing a comment | Marius Mathiesen | 2009-11-04 | 1 | -7/+0 | |
| | | ||||||
* | | Support for editing comments for the author 10 minutes after creating them | Marius Mathiesen | 2009-11-04 | 10 | -2/+156 | |
| | | | | | | | | | | - A new link is displayed when hovering over an editable comment - Clicking on this loads the edit form, and makes it submit over ajax | |||||
* | | Don't use a global variable for the iterator | Johan Sørensen | 2009-11-04 | 1 | -1/+1 | |
| | | | | | | | | Otherwise we get fatal sideeffects | |||||
* | | Notify MergeRequest owners about new comments on MergeRequestVersions aswell | Johan Sørensen | 2009-11-04 | 2 | -10/+33 | |
| | | ||||||
* | | Fix inline commenting on a single commit | Johan Sørensen | 2009-11-04 | 2 | -14/+46 | |
| | | | | | | | | | | | | | | | | | | When a single commit is loaded we need to both update the magic data-merge-request-current-shas attribute as well as parse a single SHA properly with Gitorious.ShaSpec.parseShas() and add a testcase for it Also wrap some ungodly long line lengths. | |||||
* | | Removed duplicate test cases | Johan Sørensen | 2009-11-04 | 3 | -37/+3 | |
| | | ||||||
* | | Introducing Comment#editable_by? | Marius Mathiesen | 2009-11-04 | 2 | -0/+28 | |
| | | | | | | | | | | A user should be able to edit his comments within x minutes (x=10) after creating it Model level only, for now, controllers coming up | |||||
* | | When selecting a different version: replace both the sha listing and diff ↵ | Marius Mathiesen | 2009-11-04 | 2 | -6/+28 | |
| | | | | | | | | | | | | | | contents with fresh data from the server - shaListingReceived now accepts a caller/callback combo that will be called - Selecting a version only is different from selecting a version+sha | |||||
* | | Always load the diffs when clicking another comment | Marius Mathiesen | 2009-11-04 | 1 | -7/+3 | |
| | | ||||||
* | | Move test helper methods out of the context() block to prevent scoping ↵ | Johan Sørensen | 2009-11-04 | 1 | -18/+19 | |
| | | | | | | | | issues in ruby 1.8.7 | |||||
* | | Insert the correct shas for selection when a new version is selected | Marius Mathiesen | 2009-11-04 | 1 | -0/+1 | |
| | | ||||||
* | | Fetch the correct diffs when selecting a comment from another version | Marius Mathiesen | 2009-11-04 | 2 | -3/+3 | |
| | | | | | | | | Use the information about whether a new version was selected: if so, fetch new diffs | |||||
* | | Show the render_if_ready box if a merge request isn't ready | Johan Sørensen | 2009-11-04 | 6 | -16/+28 | |
| | | | | | | | | | | | | With this we don't need to Refresh header, which causes confusion among users. Be able to supply an options hash to render_if_ready() that swaps out the spinner image with a refresh page | |||||
* | | Add a `legacy` column to merge requests so we can identify them | Johan Sørensen | 2009-11-04 | 2 | -12/+24 | |
| | | | | | | | | | | | | Our previous way of guesstimating the "legacy" status had some flaws when we want to use it for UI related things, explitlity marking older MRs without versions as legacy gets us around that limitation | |||||
* | | Attempt to make the MergeRequestsController just a little more readable | Johan Sørensen | 2009-11-04 | 1 | -33/+46 | |
| | | ||||||
* | | Only load diff within comments once | Marius Mathiesen | 2009-11-04 | 1 | -0/+4 | |
| | | ||||||
* | | Mark the current shas as selected when displaying a comment for another sha ↵ | Marius Mathiesen | 2009-11-04 | 3 | -6/+26 | |
| | | | | | | | | range. | |||||
* | | Do not log to the JS console | Marius Mathiesen | 2009-11-04 | 3 | -3/+1 | |
| | | ||||||
* | | Displaying a loading indicator when fetching versions and diffs from comments | Marius Mathiesen | 2009-11-04 | 2 | -0/+9 | |
| | | ||||||
* | | Don't set memcached TTL on MergeRequestVersion#affected_commits and use the ↵ | Johan Sørensen | 2009-11-04 | 2 | -9/+5 | |
| | | | | | | | | | | | | #cache_key from AR::Base ActiveRecord::Base already implements a decent #cache_key for us, that we can piggyback upon | |||||
* | | $.scrollTo did the trick for jumping to non-existing hrefs | Marius Mathiesen | 2009-11-04 | 1 | -0/+1 | |
| | | ||||||
* | | Don't reload diff display in replaceShaListing (=two XHRs) | Marius Mathiesen | 2009-11-04 | 1 | -1/+0 | |
| | |