summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix copyright header on FavoritesController to list correct copyright ↵Johan Sørensen2009-12-071-6/+1
| | | | holders of the content
* Sort watched by recency in the ~user listsJohan Sørensen2009-12-072-14/+20
|
* The default events are @user#events, owner can view watched events tooMarius Mathiesen2009-12-071-2/+2
|
* Passing parameters to pagination of events saves a few conditionals in ↵Marius Mathiesen2009-12-072-3/+3
| | | | | | UsersController - Will_paginate discards empty :params, letting us specify custom URL parameters where applicable (for pagination)
* Show a message when user haven't favorited anythingJohan Sørensen2009-12-072-5/+23
|
* Fixed 1.8 syntax error in UserTestJohan Sørensen2009-12-072-82/+93
|
* Link to the user from a message and cut some long linesJohan Sørensen2009-12-071-9/+17
|
* Handle pagination clicks from ajax rendered events by redirecting to Users#showMarius Mathiesen2009-12-031-13/+30
| | | | - Users#show now accepts ?events=watched for current user, which will render with these activitites
* Caching the current activity selectionMarius Mathiesen2009-12-031-5/+14
|
* Include user favorites in Users#showMarius Mathiesen2009-12-036-8/+143
| | | | - Let the user toggle between his own activities and what he's watching on his own page
* Moved the favorite linking to a separate moduleMarius Mathiesen2009-12-033-9/+41
|
* Add an event when someone starts watching a repository.Marius Mathiesen2009-12-036-0/+47
| | | | - Added rendering of favorite related events
* Favorites: GUI improvements, rename user accessor to eventsMarius Mathiesen2009-12-038-11/+47
| | | | | - Added waiting indicator when favoriting, added CSS classes - Renamed User#favorite_events -> User#events_in_watchlist
* Access to a user's favorite eventsMarius Mathiesen2009-12-035-14/+44
| | | | Removed old copyrights.
* Giving test coverage to link helperMarius Mathiesen2009-12-032-29/+77
|
* Moving the form replacer into a testable jQuery pluginMarius Mathiesen2009-12-033-33/+69
|
* Hook into the create/delete actions for watching with some Ajax goodnessMarius Mathiesen2009-12-034-8/+58
| | | | | | - Add a custom attr to the a tags - Replace the obtrusive Rails actions with some homebrew - Favorites#{create,destroy} now supplies a Location header intercepted by javascript
* Adding Favorites#destroy, set flash, add link to (un)favorite repositoryMarius Mathiesen2009-12-035-2/+61
|
* FavoritesController: provides watching of repositoriesMarius Mathiesen2009-12-036-0/+179
| | | | - Also added Copyright header where missing
* Improve the favorite/favoritable model:Marius Mathiesen2009-12-036-3/+63
| | | | | - Validations - Extract watchable logic into module
* Adding basic favorite modelMarius Mathiesen2009-12-035-1/+50
|
* Add back the team memberships list to the ~user pageJohan Sørensen2009-12-031-1/+15
|
* Tiny bit more contrast on the pull-box headersJohan Sørensen2009-12-031-1/+1
|
* Whitespace shenenigans in group.rbJohan Sørensen2009-12-031-29/+29
|
* Only include groups user is an admin for list of teams a user can transfer a ↵Johan Sørensen2009-12-032-113/+122
| | | | project to
* Slightly wider activity box (#left) on the ~user pageJohan Sørensen2009-12-031-1/+4
|
* Skip the shadow on white buttons all togetherJohan Sørensen2009-12-032-6/+1
|
* Introduce and use a white_button_link_to() helper and buttonify the user ↵Johan Sørensen2009-12-036-61/+78
| | | | profile links
* No background image on .pull-box.exposeJohan Sørensen2009-12-022-0/+1
|
* Use the silver fade on all pull boxesJohan Sørensen2009-12-021-12/+7
|
* Greet the user on Site#index instead of the same old messageJohan Sørensen2009-12-023-27/+23
|
* Add a footer to the notification_copy email that you shouldn't reply via emailJohan Sørensen2009-12-022-3/+7
|
* Skip the margin-left on the .details unordered listJohan Sørensen2009-12-011-4/+5
|
* Further restructuring of the ~user page and some color tweaksJohan Sørensen2009-12-016-7/+26
|
* Add a tally of merge requests the user may wish to look at on his ~user pageJohan Sørensen2009-12-017-180/+259
| | | | Also try out some restructuring of the ~user page
* don't overwrite the current license when editing a projectJohan Sørensen2009-12-011-2/+4
|
* attr_protect Committership#permisssions from mass attribute updatesJohan Sørensen2009-11-305-47/+46
| | | | | | Also ad a Committership::create_with_permission to easy expressing things, mostly for usable for test and utility code NOT for controller code.
* Simplify the show_clone_list_search?() helperJohan Sørensen2009-11-301-2/+1
|
* Don't just assume committership when deciding when to show the "request ↵Johan Sørensen2009-11-304-5/+23
| | | | | | | merge" link Requesting a merge from one mainline to another doens't make sense, since they don't have any parents
* change wording of "Aliases" to "Email Aliases"Johan Sørensen2009-11-301-4/+4
|
* Pedantic line-length and whitespace cleanupJohan Sørensen2009-11-301-13/+18
|
* Fixed 1.8 syntax error in the MergeRequestProcessorTestJohan Sørensen2009-11-302-12/+11
|
* Make the index on sequence number unique for each target_repository_idMarius Mathiesen2009-11-301-1/+1
|
* Removing obsolete, commented codeMarius Mathiesen2009-11-301-14/+0
|
* Of course, the MergeRequestProcessor needs and expects Merge requests by id, ↵Marius Mathiesen2009-11-302-5/+6
| | | | not sequence number
* Load the correct merge request in various scenariosMarius Mathiesen2009-11-306-19/+7
| | | | | | | - Repositories#config scopes merge requests on repository - MergeRequestProcessor looks up by sequence number, not id - PushEventProcessor finds merge request in repo, not directly by sequence_number - MergeRequests#show use to_param in title
* MergeRequest's to_param now uses the sequence number instead of idMarius Mathiesen2009-11-3011-49/+72
| | | | | | | | | | A summary of what's changed: - Routing - Links, where necessary - Git branch names use seq instead of id Also made some refactorings in PushEventProcessor to make it testable without a full stack test. And set some revealing sequence numbers in the fixtures.
* Adding an index for sequence numbers in merge requestMarius Mathiesen2009-11-303-2/+12
|
* Avoiding ridiculously high sequence numbersMarius Mathiesen2009-11-303-14/+47
| | | | | - Try to represent the # of merge requests in a repo in the sequence number - If this sequence is taken, build on the highest existing one until this is surpassed
* Merge request sequences should be unique for each target repositoryMarius Mathiesen2009-11-301-2/+15
|
* Adding sequence number to merge requests, will replace id in URLs etc.Marius Mathiesen2009-11-307-9/+90
|
* Make it more obvious that the new message notifications are just thatJohan Sørensen2009-11-303-22/+23
| | | | | The outgoing email notification when receiving a private message should be a lot clearer that it is a message
* Updated Rails to the v.2.3.5 tagJohan Sørensen2009-11-27328-3319/+5958
|
* Don't rely on hash sort orderingJohan Sørensen2009-11-271-1/+1
|
* Don't blow up if Committership#build_permissions receives nilJohan Sørensen2009-11-262-1/+6
|
* Make sure the Comment tests relating to notifications start on a clean slateJohan Sørensen2009-11-261-0/+1
|
* Be able to edit permissions on a committershipJohan Sørensen2009-11-264-1/+113
|
* Merge commit 'refs/merge-requests/2202' of ↵Johan Sørensen2009-11-262-2/+5
|\ | | | | | | | | | | | | git://gitorious.org/gitorious/mainline * git://gitorious.org/gitorious/mainline: default_license option in config.
| * default_license option in config.Tom Adams2009-11-232-2/+5
| |
* | Set the Memberships breadcrump as the parent of NewMembershipJohan Sørensen2009-11-261-1/+1
| |
* | Merge commit 'refs/merge-requests/2179' of ↵Johan Sørensen2009-11-266-1/+47
|\ \ | | | | | | | | | | | | | | | | | | git://gitorious.org/gitorious/mainline * git://gitorious.org/gitorious/mainline: Add missing breadcrumbs for new and edit memberships.
| * | Add missing breadcrumbs for new and edit memberships.Thomas Schamm2009-11-236-1/+47
| |/
* | Only show public emails on the memberships pageJohan Sørensen2009-11-251-3/+3
| |
* | Make sure the add/remove colalborator events doesn't mention the deprecated ↵Johan Sørensen2009-11-252-59/+59
| | | | | | | | term committer
* | Fix the line-height on the event commit messagesJohan Sørensen2009-11-251-0/+1
| |
* | Hint the database to use the proper index in Event::latestJohan Sørensen2009-11-251-17/+25
| |
* | Use a smaller time window for calculating most active clonesJohan Sørensen2009-11-251-3/+3
| |
* | Remove the "repo can't be deleted if it's the last mainline" checkJohan Sørensen2009-11-242-12/+1
| | | | | | | | In practice its function is a bit counter-intuitive and not really useful
* | Use Repository#admin? instead if repo.owner.admin? to query for adminshipJohan Sørensen2009-11-247-133/+182
| | | | | | | | | | That way we use the collaborator permissions instead of just the owner, which is inline with how the new permission scheme works
* | Added Repository#{admin,reviewer,committer}? helpers and fixup ↵Johan Sørensen2009-11-242-12/+83
| | | | | | | | | | | | can_be_deleted_by? The can_be_deleted_by? method now takes the proper adminship (through the committerships) into account
* | Speed the AddPermissionsToCommitterships migration upJohan Sørensen2009-11-242-12/+1
| |
* | No reason to skip bits in the Committership permissionsJohan Sørensen2009-11-241-2/+2
| |
* | Add sanity-check assertionJohan Sørensen2009-11-241-0/+1
| |
* | Add some textual explanations of the different permissionsJohan Sørensen2009-11-234-0/+62
| |
* | Wording tweaks on the add collaborator pageJohan Sørensen2009-11-232-2/+3
|/
* Updated the add_permissions_to_committerships migration to set proper base ↵Johan Sørensen2009-11-192-2/+12
| | | | permissions
* Use "Collaborator" instead of "Committer" when adding new committershipsJohan Sørensen2009-11-198-91/+143
| | | | | The Committership class really needs a different name now that they have more fine-grained permissions, but now just change the UI.
* Only notify reviewers about new merge requestsJohan Sørensen2009-11-192-148/+152
|
* Add controller+view code for setting permissions on a CommittershipJohan Sørensen2009-11-199-46/+101
|
* Fixed failing RepositoriesControllerTest (didn't set the review bit)Johan Sørensen2009-11-191-185/+188
|
* MergeRequest#resolvable_by? should use the committerships with a review bitJohan Sørensen2009-11-194-2/+19
|
* Repository#committers should only include users from committerships with ↵Johan Sørensen2009-11-193-9/+32
| | | | commit bit
* Be able to get a list of permissions out of a CommittershipJohan Sørensen2009-11-192-0/+9
|
* Create the proper initial Committership permissions when a repository is createdJohan Sørensen2009-11-194-2/+20
|
* Added auxiliary methods on Committership for checking and fetching based on ↵Johan Sørensen2009-11-192-11/+83
| | | | permission masks
* Add a permissions bitmask to CommittershipJohan Sørensen2009-11-194-33/+104
|
* Call timeago() after each ajax callJohan Sørensen2009-11-191-2/+3
| | | | So any loaded html will have the proper timestamps set
* Don't HTML escape time_ago callsJohan Sørensen2009-11-194-6/+6
|
* Added a jQuery plugin for relative dates and use it instead of time_ago_in_wordsJohan Sørensen2009-11-1912-223/+394
| | | | | | | | The plugin uses the clients timezone, and there's a helper named time_ago() that renders the proper markup. Use this helper whenever we'd normally be using time_ago_in_words. Also do a bit of whitespace sanitizing on the affected files
* Make sure MergeRequestVersion comment notifications says its for a merge requestJohan Sørensen2009-11-192-23/+44
|
* Merge remote branch 'gitorious/master'Johan Sørensen2009-11-170-0/+0
|\ | | | | | | | | * gitorious/master: Use the blob SHA1 and not the path for blob image cache keys
| * Use the blob SHA1 and not the path for blob image cache keysJohan Sørensen2009-11-171-2/+2
| |
* | Use the blob SHA1 and not the path for blob image cache keysJohan Sørensen2009-11-171-2/+2
| |
* | Cache commit diffs with an indicator of the number of comments attachedMarius Mathiesen2009-11-171-1/+1
|/
* re-activate tree commit cachingJohan Sørensen2009-11-172-259/+258
| | | | and trim excess whitespace
* Render the event timestamps on the right if we're using the ↵Johan Sørensen2009-11-172-4/+19
| | | | sometimes-verbose relative dates
* Specify whether a repository accepts merge requestsMarius Mathiesen2009-11-1712-3/+93
| | | | | | - On by default - Inherits the value from its parent when cloned - When set to off: do not include in targets for merges, do not display link to merge requests on Repository#show
* Link to the comment with the sha on inline commit commentsMarius Mathiesen2009-11-161-1/+1
|
* Don't display links to inline comments in sidebyside modeMarius Mathiesen2009-11-162-1/+6
|
* Enable clicking a comment to jump to the inline context.Marius Mathiesen2009-11-165-6/+24
| | | | - Also got back support for side by side rendering of diffs