summaryrefslogtreecommitdiffstats
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Send a message to MQ when a MergeRequestVersion is deleted in order for a ↵Marius Mathiesen2010-02-011-0/+1
| | | | processor to delete the tracking branch.
* Adding a field for opting in to default email notificationsMarius Mathiesen2010-01-261-0/+3
|
* Show a notice when viewing ones own profile pageJohan Sørensen2010-01-121-2/+2
|
* Renamed /activity route to /activitiesJohan Sørensen2010-01-121-30/+30
|
* Introducing Site#public_timeline as /activityMarius Mathiesen2010-01-121-0/+2
| | | | The global activity stream is now available for logged in users too
* Adding an Atom feed for user's watchlistMarius Mathiesen2009-12-071-3/+2
| | | | - An additional link... tag in Users#show
* Cleanup, prettify and unify the repositories overview boxesJohan Sørensen2009-12-071-1/+1
| | | | | | | | - Get rid of the duplication in _statistics partial (use the _overview instead) - Don't use a table when it's not needed - Spice up the styling a but - Use a button for watch/unwatch link - Clean up wording on the clone urls
* Include user favorites in Users#showMarius Mathiesen2009-12-031-1/+3
| | | | - Let the user toggle between his own activities and what he's watching on his own page
* Add an event when someone starts watching a repository.Marius Mathiesen2009-12-031-0/+1
| | | | - Added rendering of favorite related events
* Adding Favorites#destroy, set flash, add link to (un)favorite repositoryMarius Mathiesen2009-12-031-0/+2
|
* Introduce and use a white_button_link_to() helper and buttonify the user ↵Johan Sørensen2009-12-031-1/+1
| | | | profile links
* change wording of "Aliases" to "Email Aliases"Johan Sørensen2009-11-301-4/+4
|
* Merge commit 'refs/merge-requests/2202' of ↵Johan Sørensen2009-11-261-1/+4
|\ | | | | | | | | | | | | git://gitorious.org/gitorious/mainline * git://gitorious.org/gitorious/mainline: default_license option in config.
| * default_license option in config.Tom Adams2009-11-231-1/+4
| |
* | Merge commit 'refs/merge-requests/2179' of ↵Johan Sørensen2009-11-261-1/+3
|\ \ | | | | | | | | | | | | | | | | | | 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-231-1/+3
| |/
* | Make sure the add/remove colalborator events doesn't mention the deprecated ↵Johan Sørensen2009-11-251-2/+2
| | | | | | | | term committer
* | Wording tweaks on the add collaborator pageJohan Sørensen2009-11-231-1/+1
|/
* Use "Collaborator" instead of "Committer" when adding new committershipsJohan Sørensen2009-11-191-6/+6
| | | | | The Committership class really needs a different name now that they have more fine-grained permissions, but now just change the UI.
* Add controller+view code for setting permissions on a CommittershipJohan Sørensen2009-11-191-12/+13
|
* Specify whether a repository accepts merge requestsMarius Mathiesen2009-11-171-0/+2
| | | | | | - 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
* Tweak the repo searching a bitJohan Sørensen2009-11-121-1/+6
| | | | | - 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 Mathiesen2009-11-121-0/+1
| | | | | | clones on the repository page
* Adding a waiting indication when performing a search, extract live search as ↵Marius Mathiesen2009-11-121-1/+1
| | | | a reusable module
* Adding a liveSearch plugin, enable it on the repository listingMarius Mathiesen2009-11-121-0/+3
| | | | | | - 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
* Make "standard" commenting work again on merge requestsJohan Sørensen2009-11-041-2/+5
| | | | The comments collection needs to have a preview action defined in the routes
* Support for editing comments for the author 10 minutes after creating themMarius Mathiesen2009-11-041-0/+1
| | | | | - A new link is displayed when hovering over an editable comment - Clicking on this loads the edit form, and makes it submit over ajax
* Changed the NotificationCenter a bitMarius Mathiesen2009-11-041-1/+14
| | | | | - Arguments are passed when observers are notified - Observers know only of their receivers, not senders
* Include all of public/javascripts/*.js when running javascript testsJohan Sørensen2009-11-041-2/+1
|
* Merge request owners are notified of new comments on their code.Marius Mathiesen2009-11-041-0/+1
|
* The javascript tests now work, and even passMarius Mathiesen2009-11-041-0/+7
|
* Adding support for commenting on a merge request version (UI still needs ↵Marius Mathiesen2009-11-041-1/+1
| | | | some love)
* Remove graphing and gruff, RMagick no longer requiredMarius Mathiesen2009-11-031-1/+0
| | | | | | | | | | | The graphs are no longer in use. Therefore removing: - the graph generator script - the gruff plugin - the inclusion of graphs in the helpers - the tests of the above Paperclip talks directly to Imagemagick, so RMagick is not required, which should make it ... easier to get started with Gitorious hacking
* Merge commit 'refs/merge-requests/1610' of ↵Marius Mathiesen2009-10-151-1/+6
|\ | | | | | | git://gitorious.org/gitorious/mainline
| * Unsetting CA_FILE if it's set, avoiding constant redefine warnings when ↵August Lilleaas2009-09-251-1/+6
| | | | | | | | loading the environment.
* | refer to the repository, not the project, in the "no clones yet" textJohan Sørensen2009-10-051-1/+1
| |
* | Fixed and tweaked wording on the pending_activation pageJohan Sørensen2009-10-051-2/+2
| |
* | Merge commit 'refs/merge-requests/1609' of gitorious.org:gitorious/mainlineJohan Sørensen2009-10-053-3/+7
|\ \ | | | | | | | | | | | | * gitorious.org:gitorious/mainline: Redirecting to a separate pre activation message screen instead of just flashing a message when registering a user.
| * | Redirecting to a separate pre activation message screen instead of just ↵August Lilleaas2009-09-253-3/+7
| |/ | | | | | | flashing a message when registering a user.
* | Merge commit 'refs/merge-requests/1548' of gitorious.org:gitorious/mainlineJohan Sørensen2009-10-051-0/+1
|\ \ | | | | | | | | | | | | * gitorious.org:gitorious/mainline: Update merge request button missed its translation.
| * | Update merge request button missed its translation.Thomas Schamm2009-09-191-0/+1
| |/
* | Display the diffs on the merge request page.Marius Mathiesen2009-09-281-1/+6
| | | | | | | | Select a single or range of shas, load these from MergeRequestVersions
* | Remove the new_repository_clone email notificationJohan Sørensen2009-09-251-2/+1
|/ | | | | Getting notified about new clones is generally a bit uninteresting as nothing have been committed yet, and it's already in the project feed.
* Fix toggling of merge request help and markdown helpJohan Sørensen2009-09-091-2/+3
|
* Switch to using jQuery for all javascript related thingsJohan Sørensen2009-09-031-4/+4
| | | | | | | | | | Using jQuery gives us some shorter and more to the point javascript, along with being a first step towards making gitorious use more unobtrusive JS. This also removed the auto_complete plugin, since it's easier to do by hand with jQuery. Furthermore, most of the rjs templates have been replaced with functions in application.js
* Supply howto for integrating and updating merge requests.Marius Mathiesen2009-08-271-8/+0
| | | | | All users will see the howto for integrating a request, the owner will see the howto for updating his request.
* Add a summary-field to merge-requestsTor Arne Vestbø2009-08-241-3/+5
| | | | | | | | | | | | | This is ment as a one-line subject/summary of the changes, similar to the first line in a git commit message, or the subject of an e-mail (think the subject of a cover-letter for a patch-series). This leaves the proposal-field for a more complete description of the changes. For now i've only renamed the proposal field to "Descripion" in the locale, but this should perhaps be done all over, in the data model, etc.
* Losen the custom merge request states even further and allow for both ↵Johan Sørensen2009-08-241-2/+0
| | | | | | | | | | | 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 processor for handling deletion of merge requests.Marius Mathiesen2009-07-171-2/+2
| | | | | | | | 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.
* Add information about how to update merge requests to the ownerMarius Mathiesen2009-07-161-0/+4
|
* Prettified the rendering of merge request status changes in comments and eventsJohan Sørensen2009-07-151-0/+1
|
* No longer scrolling the most recent activities on the home page.August Lilleaas2009-07-141-1/+1
|
* Changed RepositoryController#real_path to #config and made it includeJohan Sørensen2009-07-101-1/+1
| | | | whether force pushing is alloed or not
* Let each project define its status tags for merge requestsMarius Mathiesen2009-07-021-1/+3
| | | | - when changing the state from a comment, create an event - display status field in merge request form
* Merge request updates:Marius Mathiesen2009-06-241-1/+2
| | | | | - show if a commit is merged in target_repo - rendering of merge request update events
* Let users view commits from earlier versions of a merge requestMarius Mathiesen2009-06-241-1/+2
| | | | | | - Adding MergeRequests#version - Adding MergeRequest#versions - Moving commits into a partial
* Moved the authentication logic from SSH Client to pre-receive:Marius Mathiesen2009-06-241-1/+2
| | | | | | | | | | - 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
* When creating a merge request, a separate Git repositoryMarius Mathiesen2009-06-241-0/+1
| | | | | | | | | | | | | | is used for tracking the merge requests in the target repository. - If the tracking repository doesn't exist, it will be created through a separate message to the repository creation queue - The repository creation processor will resend another message in this case - Given an existing tracking repository, the source branch will be pushed to the tracking repository as merge_requests/<id> - These events are fired by MergeRequest#confirmed_by_user
* Make sure we send a notification to the parent repo, not the project, whenJohan Sørensen2009-06-181-1/+1
| | | | someone clones it
* Add a warning if gitorious.yml is wrong.Marius Mathiesen2009-06-171-0/+3
| | | - do this in environment.rb since config/<RAILS_ENV> uses the Yaml file directly
* Adding the recent events ticker/scroller on the new glossy flashy sparkly ↵August Lilleaas2009-06-121-1/+1
| | | | homepage.
* Added a hew missing locale keys for the new gitorious homepage.August Lilleaas2009-06-121-1/+3
|
* Here's the new and glossy home page header!August Lilleaas2009-06-121-3/+12
|
* Adding a new configuration declaration to config/gitorious.yml that ↵August Lilleaas2009-06-121-0/+3
| | | | determines wether or not the deployment is the actual gitorious.org deployment. It is false by default. We do this so that people that downloads gitorious gets a less branded and über glossy gitorious, allowing us to go wild on the gitorious.org site, branding wise.
* Better binary blob detectionJohan Sørensen2009-06-111-4/+5
| | | | | | Just check the first 1024 bytes if there's any null bytes, instead of using the error prone mime-type detection, which gives us a smaller chance of false-positives with the null byte detection
* Unify rendering of git clone and push urls in a partial and restyle it a bitJohan Sørensen2009-06-101-2/+3
|
* Tweaked the way the message actions are displayed on the inboxJohan Sørensen2009-06-101-1/+1
|
* Adding an archived state to messages:Marius Mathiesen2009-06-092-1/+2
| | | | | | | | | | - New state&migration - Additions in User and Message - Messages#index now uses inbox - Another action for message archive - Selected messages can now be read or archived - Styling system generated messages with its own icon
* Change the way we store public keys to not include the user supplied commentJohan Sørensen2009-06-091-0/+3
| | | | | | | This makes validating much more flexible since we only care about the algorithm and the encoded key, not how the user supplied comment looks. We replace the comment with our own when passing the key on to the sshd which makes things alot more consistent and provides a better user experience
* Add copyright headers and a note about the repository_owner_namespacing filterJohan Sørensen2009-06-081-0/+30
| | | | to routes.rb
* Be able to delete a team avatarJohan Sørensen2009-06-081-1/+1
|
* Revise the merge request git workflow helper text a bitJohan Sørensen2009-06-042-4/+8
|
* Adding support for marking several messages as readMarius Mathiesen2009-06-031-1/+1
|
* add year to "human" dates.Jason Woofenden2009-06-033-3/+3
|
* Include Factory girl only in the test environment.Marius Mathiesen2009-05-262-1/+2
|
* Adding factory_girl for fewer dependencies in the Marius Mathiesen2009-05-251-1/+1
| | | | | | | | | | | | | | | | test cases. Ported most of the group_test cases to use Factory Girl, except where complex relationships are under test (this is probably the one case where fixtures still make a lot of sense). Added factories for: - groups - memberships - projects - users More to come soon!
* Move the rescue partials into app/views/sharedJohan Sørensen2009-05-201-3/+0
|
* - Update the Gitorious URL to new URL schemeMarius Mathiesen2009-05-201-5/+2
| | | | - Update gitorious.sample.yml to reflect requirements
* Updating default configurations for fresh installsMarius Mathiesen2009-05-203-3/+7
|
* Adding support for re-opening merge requests.Marius Mathiesen2009-05-192-2/+7
| | | | | | | This is an explicit action, wrapped inside a separate method in MergeRequest which passes along the user who wants to re-open. - Also added a new Action and rendering of the events
* Adding a custom action for changing the slug for Marius Mathiesen2009-05-182-2/+5
| | | | projects w/link from edit project page
* Refactor routes a bit so we can pass along options to the repository proc, suchJohan Sørensen2009-05-181-56/+45
| | | | as user_id format requirements
* Moved the OAuth settings controller into the admin Marius Mathiesen2009-05-181-1/+2
| | | | namespace and changed the routing.
* Make sure the ~/user.name/project/repo urls work for users with dots in the ↵Johan Sørensen2009-05-181-1/+1
| | | | login
* Users that haven't been activated can no longer perform a password reset. ↵Marius Mathiesen2009-05-131-0/+1
| | | | Instead, we instruct them to check their inbox for the activation email.
* Adding preview functionality for Projects#edit.Marius Mathiesen2009-05-121-1/+1
|
* Show the reason and related commits on a merge request even when it's non-openJohan Sørensen2009-05-121-1/+2
|
* Added link to the blog in the footerJohan Sørensen2009-05-111-1/+2
|
* Adding support for deleting your own merge requests:Marius Mathiesen2009-05-111-0/+1
| | | | | | - Add link in the view - Don't create an event when destroying mr (would cause an invalid target) - Delete comments along with merge requests
* new sess id, againJohan Sørensen2009-05-111-1/+1
|
* Use activerecord for session cookiesJohan Sørensen2009-05-111-1/+1
|
* new sess idJohan Sørensen2009-05-111-1/+1
|
* Make sure sub-resources are working for usernames with dots in themJohan Sørensen2009-05-111-6/+8
|
* Consistency in the usage of the "open source" phraseJohan Sørensen2009-05-111-1/+1
|
* Changed the session idJohan Sørensen2009-05-101-1/+1
|
* include the RAILS_ENV when finding out who should receive exception ↵Johan Sørensen2009-05-081-2/+2
| | | | notification emails
* Adding a link to OAuth settings for a project - for site adminsMarius Mathiesen2009-05-071-0/+1
| | | Fixing some broken markup causing the test output to become really verbose.
* Adding a controller with actions for editing/updating the oauth settings for ↵Marius Mathiesen2009-05-061-0/+5
| | | | | | | a project: - Added getter and setter for an oauth options hash in Project - Added resource route for oauth settings under project - Added controller, views and tests
* Removed the need for the version-controlled EULA (it's hosted externally) inJohan Sørensen2009-04-301-3/+3
| | | | favor of a simpler validates_acceptance_of :terms_of_use approach
* Adding support for deleting a user's avatar.Marius Mathiesen2009-04-301-1/+2
|
generated by cgit v1.1 at 2025-05-12 07:53:47 +0000