OSDN Git Service
exupero [Fri, 6 Jan 2012 20:04:44 +0000 (15:04 -0500)]
Updated error page title to "gitolite" from "gitosis".
Dmitriy Zaporozhets [Fri, 6 Jan 2012 08:35:23 +0000 (00:35 -0800)]
Merge pull request #264 from flixflax/remove_issue_fix
Redirect to issues list after deleting an issue in edit view
Dmitriy Zaporozhets [Thu, 5 Jan 2012 18:16:41 +0000 (20:16 +0200)]
Merge branch 'project_activities'
VSizov [Thu, 5 Jan 2012 16:07:47 +0000 (19:07 +0300)]
Merge remote-tracking branch 'origin/bug_322'
Dmitriy Zaporozhets [Wed, 4 Jan 2012 20:19:41 +0000 (22:19 +0200)]
Project activities restyled
Felix Richter [Wed, 4 Jan 2012 12:47:57 +0000 (13:47 +0100)]
Redirect to issues list after deleting an issue in edit view
Dmitriy Zaporozhets [Wed, 4 Jan 2012 06:19:41 +0000 (08:19 +0200)]
removed tags from repo activities
Dmitriy Zaporozhets [Wed, 4 Jan 2012 06:17:41 +0000 (08:17 +0200)]
Project activities perfomance increased. Cache for project activitites disabled. Repository conception changed
Valery Sizov [Tue, 3 Jan 2012 23:21:30 +0000 (01:21 +0200)]
fixed bug #316
Valery Sizov [Tue, 3 Jan 2012 21:39:03 +0000 (23:39 +0200)]
fix bug #322
Dmitriy Zaporozhets [Tue, 3 Jan 2012 19:46:53 +0000 (21:46 +0200)]
Note on merge request open/close
Dmitriy Zaporozhets [Tue, 3 Jan 2012 19:38:49 +0000 (11:38 -0800)]
Merge pull request #256 from shtirlic/delete_dot_directory_files
Delete .directory files
Dmitriy Zaporozhets [Tue, 3 Jan 2012 19:34:16 +0000 (11:34 -0800)]
Merge pull request #252 from CedricGatay/feature/note_on_issue_status_changed
Added note when issue status changed (closed / reopened)
Dmitriy Zaporozhets [Mon, 2 Jan 2012 20:34:49 +0000 (22:34 +0200)]
updated readme
Dmitriy Zaporozhets [Mon, 2 Jan 2012 19:32:58 +0000 (21:32 +0200)]
version file up to 2.1.pre. updated changelog
shtirlic [Sun, 1 Jan 2012 17:43:08 +0000 (21:43 +0400)]
Add .directory to .gitignore
shtirlic [Sun, 1 Jan 2012 17:37:32 +0000 (21:37 +0400)]
Delete .directory files
Dmitriy Zaporozhets [Sat, 31 Dec 2011 11:13:23 +0000 (13:13 +0200)]
Merge branch 'feature/repository_tab'
Dmitriy Zaporozhets [Sat, 31 Dec 2011 11:12:10 +0000 (13:12 +0200)]
repo branches and tags
Dmitriy Zaporozhets [Sat, 31 Dec 2011 10:52:01 +0000 (12:52 +0200)]
repositories tab specs
Dmitriy Zaporozhets [Fri, 30 Dec 2011 21:20:16 +0000 (23:20 +0200)]
Merge branch 'grit_ext'
Dmitriy Zaporozhets [Fri, 30 Dec 2011 20:56:13 +0000 (22:56 +0200)]
repo tab added. activities page for repo
Dmitriy Zaporozhets [Fri, 30 Dec 2011 19:58:02 +0000 (21:58 +0200)]
Merge branch 'feature/project_tab'
Dmitriy Zaporozhets [Fri, 30 Dec 2011 19:56:34 +0000 (21:56 +0200)]
code cleanin
Saito [Fri, 30 Dec 2011 14:49:58 +0000 (22:49 +0800)]
fix travis dependency, add libicu support
Saito [Fri, 30 Dec 2011 14:26:13 +0000 (22:26 +0800)]
use monkey patch to trancoding content
Saito [Fri, 30 Dec 2011 14:25:45 +0000 (22:25 +0800)]
add charlock_holmes gem
Saito [Fri, 30 Dec 2011 13:41:39 +0000 (21:41 +0800)]
remove charencode.
Saito [Fri, 30 Dec 2011 10:30:57 +0000 (18:30 +0800)]
Revert "merge charlock_holmes to master"
This reverts commit
a25a85b9396cbc07bf2bfcd12d3c0a6685df66d6.
Saito [Fri, 30 Dec 2011 10:30:57 +0000 (18:30 +0800)]
Revert "fix travis dependency, add libicu support"
This reverts commit
78d882623e13f061349ff6237e250970fc48d8a4.
Dmitriy Zaporozhets [Fri, 30 Dec 2011 06:54:42 +0000 (08:54 +0200)]
Project tab r1 is finished
Cedric Gatay [Thu, 29 Dec 2011 20:50:26 +0000 (21:50 +0100)]
Added note when issue status changed (closed / reopened)
Implementation is correctly done through observer.
Saito [Thu, 29 Dec 2011 05:33:25 +0000 (13:33 +0800)]
fix travis dependency, add libicu support
Saito [Thu, 29 Dec 2011 03:51:33 +0000 (11:51 +0800)]
merge charlock_holmes to master
Dmitriy Zaporozhets [Wed, 28 Dec 2011 07:38:50 +0000 (09:38 +0200)]
Project tab added. activities, team, snippets moved to project tab
Dmitriy Zaporozhets [Wed, 28 Dec 2011 07:18:50 +0000 (09:18 +0200)]
favicon updated
Dmitriy Zaporozhets [Wed, 28 Dec 2011 07:08:50 +0000 (09:08 +0200)]
commented dashboard spec
Dmitriy Zaporozhets [Wed, 28 Dec 2011 07:08:40 +0000 (09:08 +0200)]
temp fix for project hooks
Dmitriy Zaporozhets [Wed, 28 Dec 2011 07:07:40 +0000 (09:07 +0200)]
dashboard test fix
Valery Sizov [Tue, 27 Dec 2011 23:29:53 +0000 (01:29 +0200)]
small redesign of controls of notes
Valery Sizov [Tue, 27 Dec 2011 23:06:55 +0000 (01:06 +0200)]
commit helper refactoring
Valeriy Sizov [Tue, 27 Dec 2011 22:49:38 +0000 (14:49 -0800)]
Merge pull request #237 from CedricGatay/feature/expand_issues_ref_in_commit
Autolinks to issues in commit message (see #155)
Valeriy Sizov [Tue, 27 Dec 2011 22:35:41 +0000 (14:35 -0800)]
Merge pull request #234 from dbr/patch-1
Minor tweak to readme
Valeriy Sizov [Tue, 27 Dec 2011 22:33:38 +0000 (14:33 -0800)]
Merge pull request #203 from mlitwiniuk/top_nav_fix
Hide admin menu for non-admins
Valery Sizov [Tue, 27 Dec 2011 21:49:16 +0000 (23:49 +0200)]
commented some tests
Valery Sizov [Tue, 27 Dec 2011 21:21:26 +0000 (23:21 +0200)]
Merge branch 'web_hooks' of https://github.com/ariejan/gitlabhq into ariejan-web_hooks
Conflicts:
app/models/project.rb
config/routes.rb
db/schema.rb
Cedric Gatay [Mon, 26 Dec 2011 23:39:42 +0000 (00:39 +0100)]
I have to domesticate RubyMine, keymapping is not the same as IntelliJ and I have deleted a character by mistake...
Cedric Gatay [Mon, 26 Dec 2011 22:22:15 +0000 (23:22 +0100)]
1/ rspec'ed
2/ @commit.safe_message as an argument
3/ preserve in helper
4/ spaces around operators
Cedric Gatay [Mon, 26 Dec 2011 20:43:38 +0000 (21:43 +0100)]
Follow up of my pull request, damn last time refactor !
Cedric Gatay [Mon, 26 Dec 2011 20:35:25 +0000 (21:35 +0100)]
Autolinks to issues in commit message (see #155)
It matches #[0-9]+ in commit messages.
For example
* Fix for #12
* Code review for #56
* Test for #15, Review on #54, Fix for #42
It only links to valid issues (existing and belonging to the current project)
It does not add any link to the commit in the issue page, it only consists in parsing the commit message when displayed.
This can be considere as a primary work for the issue #155 on gitlabhq/gitlabhq.
dbr/Ben [Mon, 26 Dec 2011 14:07:15 +0000 (06:07 -0800)]
Listify "Application details" in readme, as it was rendered as a single, confusing sentence
Ariejan de Vroom [Mon, 26 Dec 2011 09:12:09 +0000 (10:12 +0100)]
Use URI::regexp for validating WebHook urls
Ariejan de Vroom [Mon, 26 Dec 2011 09:10:21 +0000 (10:10 +0100)]
Fixed typo in spec mster => master
Dmitriy Zaporozhets [Sun, 25 Dec 2011 18:06:18 +0000 (20:06 +0200)]
fix dashboard spec
Dmitriy Zaporozhets [Sun, 25 Dec 2011 11:41:47 +0000 (03:41 -0800)]
Merge pull request #231 from CedricGatay/feature/commit_author_mail_for_note
Alert only commit author on note
Dmitriy Zaporozhets [Sun, 25 Dec 2011 11:27:51 +0000 (03:27 -0800)]
Merge pull request #215 from mutewinter/missing_favicon_link
Added missing link to favicon
Cedric Gatay [Sat, 24 Dec 2011 16:28:20 +0000 (17:28 +0100)]
Alert commit author on note
Allows to alert only the commit author when a new note is added on a commit, useful when gitlabhq is used for code
reviews, allows less noise with mails...
Dmitriy Zaporozhets [Thu, 22 Dec 2011 19:52:57 +0000 (21:52 +0200)]
fixed broken test bor truncated title
Dmitriy Zaporozhets [Thu, 22 Dec 2011 19:23:43 +0000 (11:23 -0800)]
Merge pull request #223 from argami/master
Solved issue #188
Gamaliel A. Toro Herrera [Thu, 22 Dec 2011 13:09:41 +0000 (14:09 +0100)]
Solved issue #188
Dmitriy Zaporozhets [Wed, 21 Dec 2011 07:48:23 +0000 (09:48 +0200)]
fixed activities date output for projects page
Dmitriy Zaporozhets [Tue, 20 Dec 2011 20:47:09 +0000 (22:47 +0200)]
Design tab for profile. Colorscheme as db value
Dmitriy Zaporozhets [Tue, 20 Dec 2011 17:36:23 +0000 (19:36 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Tue, 20 Dec 2011 17:36:02 +0000 (09:36 -0800)]
Merge pull request #221 from mutewinter/fix_key_add_remove_slowness
Fixes Timeout When Adding an SSH key with Many Projects
Jeremy Mack [Tue, 20 Dec 2011 14:52:04 +0000 (09:52 -0500)]
Fixes timeout when adding an SSH key
Users with many projects (>100) will hit the 20 second timeout when
updating the gitolite config. This fix batches those changes into a
signle update to the file, causing an order of magnitude speed increase
which finishes well below the 20 second timeout.
Fixes gitlabhq/gitlabhq#220
Dmitriy Zaporozhets [Tue, 20 Dec 2011 06:59:14 +0000 (08:59 +0200)]
play with tree view
Dmitriy Zaporozhets [Tue, 20 Dec 2011 06:49:14 +0000 (08:49 +0200)]
Revert "Handle back & forward events"
This reverts commit
f80745b7dbcfa6aa41a37b34ec5a9e461231f7d6.
Dmitriy Zaporozhets [Tue, 20 Dec 2011 06:39:14 +0000 (08:39 +0200)]
Handle back & forward events
Dmitriy Zaporozhets [Tue, 20 Dec 2011 06:29:14 +0000 (08:29 +0200)]
removed project filter
Dmitriy Zaporozhets [Tue, 20 Dec 2011 06:24:14 +0000 (08:24 +0200)]
Dashboard perfomance improved. Filter for projects page
Valery Sizov [Mon, 19 Dec 2011 22:07:49 +0000 (00:07 +0200)]
Merge branch 'limit_repo'
Valery Sizov [Mon, 19 Dec 2011 22:07:05 +0000 (00:07 +0200)]
fix project limit
Dmitriy Zaporozhets [Mon, 19 Dec 2011 21:32:59 +0000 (23:32 +0200)]
User profile restyle. Feed(Atom) links for commits & issues
Dmitriy Zaporozhets [Mon, 19 Dec 2011 13:17:11 +0000 (15:17 +0200)]
Merge branch 'notification_refactoring'
Valery Sizov [Sun, 18 Dec 2011 16:55:32 +0000 (18:55 +0200)]
fix notification tests
Valery Sizov [Sun, 18 Dec 2011 16:09:59 +0000 (18:09 +0200)]
fix show token in profile
Valery Sizov [Sun, 18 Dec 2011 14:36:30 +0000 (16:36 +0200)]
Notification:: small refactoring
Valery Sizov [Sun, 18 Dec 2011 14:29:58 +0000 (16:29 +0200)]
notification for note for merge request
Valery Sizov [Sun, 18 Dec 2011 14:09:16 +0000 (16:09 +0200)]
annotate model
Valery Sizov [Sun, 18 Dec 2011 14:07:47 +0000 (16:07 +0200)]
notification when assignee issue changed
Valery Sizov [Sun, 18 Dec 2011 13:46:06 +0000 (15:46 +0200)]
notification when merge request reassigned
Dmitriy Zaporozhets [Sun, 18 Dec 2011 10:10:20 +0000 (12:10 +0200)]
Added missing dependent for notes assoc
Valery Sizov [Sat, 17 Dec 2011 16:07:28 +0000 (18:07 +0200)]
Notification when created merge request
Valery Sizov [Sat, 17 Dec 2011 13:58:35 +0000 (15:58 +0200)]
Notification refactoring
Dmitriy Zaporozhets [Sat, 17 Dec 2011 13:40:31 +0000 (15:40 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Sat, 17 Dec 2011 13:40:21 +0000 (05:40 -0800)]
Merge pull request #214 from mutewinter/project_destroy_speed_fix
Project destroy relationship speed fix
Dmitriy Zaporozhets [Sat, 17 Dec 2011 09:18:27 +0000 (11:18 +0200)]
rename back button
Jeremy Mack [Fri, 16 Dec 2011 18:12:20 +0000 (13:12 -0500)]
Added missing link to favicon
Jeremy Mack [Fri, 16 Dec 2011 14:51:38 +0000 (09:51 -0500)]
Project destroy relationship speed fix
Removes destroy callback for users_projects when a project is destroyed.
This works okay becaues the gitolite config will be updated at at the
end to remove the entry entirely, thereby removing the users anyway.
Dmitriy Zaporozhets [Fri, 16 Dec 2011 09:59:07 +0000 (01:59 -0800)]
rake dev_repo: fixed for ubuntu
Dmitriy Zaporozhets [Fri, 16 Dec 2011 08:59:07 +0000 (00:59 -0800)]
Merge pull request #196 from mutewinter/bulk_repo_import
Bulk repo import Rake task
Dmitriy Zaporozhets [Thu, 15 Dec 2011 22:41:46 +0000 (00:41 +0200)]
team member show page restyle
Dmitriy Zaporozhets [Thu, 15 Dec 2011 22:00:28 +0000 (00:00 +0200)]
fix failing test with long name
Dmitriy Zaporozhets [Thu, 15 Dec 2011 21:57:46 +0000 (23:57 +0200)]
Abilities refactoring
Jeremy Mack [Thu, 15 Dec 2011 21:55:53 +0000 (16:55 -0500)]
Added detection and handling of exsiting repos
Dmitriy Zaporozhets [Thu, 15 Dec 2011 21:21:29 +0000 (23:21 +0200)]
just test fix commit
Dmitriy Zaporozhets [Thu, 15 Dec 2011 21:04:59 +0000 (23:04 +0200)]
dev seeds & dev scripts
Dmitriy Zaporozhets [Thu, 15 Dec 2011 19:42:33 +0000 (21:42 +0200)]
moved project remove button to edit section
Maciej Litwiniuk [Thu, 15 Dec 2011 11:18:33 +0000 (12:18 +0100)]
hide admin menu for non-admins
Ariejan de Vroom [Thu, 15 Dec 2011 09:33:20 +0000 (10:33 +0100)]
Added specs for special cases
We don't execute web hooks when:
* You create a new branch. Make sure you first create the branch, and then push any commits. This is the way Github works, so its expected behavior.
* When tags are pushed.