Valery Sizov
676fa16ceb
commented some tests
2011-12-27 23:49:16 +02:00
Valery Sizov
66fb3909a5
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
2011-12-27 23:21:26 +02:00
Ariejan de Vroom
5ca836048d
Use URI::regexp for validating WebHook urls
2011-12-26 10:12:09 +01:00
Ariejan de Vroom
be6e52c2f6
Fixed typo in spec mster => master
2011-12-26 10:10:21 +01:00
Dmitriy Zaporozhets
fbf412eaa0
fix dashboard spec
2011-12-25 20:06:18 +02:00
Dmitriy Zaporozhets
53ce00f74a
Merge pull request #231 from CedricGatay/feature/commit_author_mail_for_note
...
Alert only commit author on note
2011-12-25 03:41:47 -08:00
Dmitriy Zaporozhets
bac0fa2c28
Merge pull request #215 from mutewinter/missing_favicon_link
...
Added missing link to favicon
2011-12-25 03:27:51 -08:00
Cedric Gatay
c0b47d3245
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...
2011-12-24 17:28:20 +01:00
Dmitriy Zaporozhets
89a43543e9
fixed broken test bor truncated title
2011-12-22 21:52:57 +02:00
Dmitriy Zaporozhets
c08c776dae
Merge pull request #223 from argami/master
...
Solved issue #188
2011-12-22 11:23:43 -08:00
Gamaliel A. Toro Herrera
56243c0a63
Solved issue #188
2011-12-22 14:09:41 +01:00
Dmitriy Zaporozhets
f9758c726f
fixed activities date output for projects page
2011-12-21 09:48:23 +02:00
Dmitriy Zaporozhets
9a2a861276
Design tab for profile. Colorscheme as db value
2011-12-20 22:47:09 +02:00
Dmitriy Zaporozhets
2f7b671619
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2011-12-20 19:36:23 +02:00
Dmitriy Zaporozhets
6793422e11
Merge pull request #221 from mutewinter/fix_key_add_remove_slowness
...
Fixes Timeout When Adding an SSH key with Many Projects
2011-12-20 09:36:02 -08:00
Jeremy Mack
8a1deea586
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
2011-12-20 10:07:55 -05:00
Dmitriy Zaporozhets
3d4f524dcb
play with tree view
2011-12-20 08:59:14 +02:00
Dmitriy Zaporozhets
6bdcaccb46
Revert "Handle back & forward events"
...
This reverts commit f80745b7db
.
2011-12-20 08:49:14 +02:00
Dmitriy Zaporozhets
f80745b7db
Handle back & forward events
2011-12-20 08:39:14 +02:00
Dmitriy Zaporozhets
321dbb7bac
removed project filter
2011-12-20 08:29:14 +02:00
Dmitriy Zaporozhets
cff9519127
Dashboard perfomance improved. Filter for projects page
2011-12-20 08:24:14 +02:00
Valery Sizov
6d5c969872
Merge branch 'limit_repo'
2011-12-20 00:07:49 +02:00
Valery Sizov
a6c88d4d84
fix project limit
2011-12-20 00:07:05 +02:00
Dmitriy Zaporozhets
a2d3b21189
User profile restyle. Feed(Atom) links for commits & issues
2011-12-19 23:32:59 +02:00
Dmitriy Zaporozhets
54fb0f8589
Merge branch 'notification_refactoring'
2011-12-19 15:17:11 +02:00
Valery Sizov
839aa7357a
fix notification tests
2011-12-18 18:55:32 +02:00
Valery Sizov
f09e15992f
fix show token in profile
2011-12-18 18:09:59 +02:00
Valery Sizov
c940767f2a
Notification:: small refactoring
2011-12-18 16:36:30 +02:00
Valery Sizov
6a0defc3ca
notification for note for merge request
2011-12-18 16:29:58 +02:00
Valery Sizov
a66d9b4c76
annotate model
2011-12-18 16:09:16 +02:00
Valery Sizov
32aa2e3f24
notification when assignee issue changed
2011-12-18 16:07:47 +02:00
Valery Sizov
df5b192e4d
notification when merge request reassigned
2011-12-18 15:46:06 +02:00
Dmitriy Zaporozhets
10df55e11d
Added missing dependent for notes assoc
2011-12-18 12:10:20 +02:00
Valery Sizov
db582b6383
Notification when created merge request
2011-12-17 18:07:28 +02:00
Valery Sizov
7713f7fefb
Notification refactoring
2011-12-17 15:58:35 +02:00
Dmitriy Zaporozhets
132177c2b7
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2011-12-17 15:40:31 +02:00
Dmitriy Zaporozhets
94b8c09c22
Merge pull request #214 from mutewinter/project_destroy_speed_fix
...
Project destroy relationship speed fix
2011-12-17 05:40:21 -08:00
Dmitriy Zaporozhets
6db121cbdb
rename back button
2011-12-17 11:18:27 +02:00
Jeremy Mack
ad0e02c9de
Added missing link to favicon
2011-12-16 13:12:20 -05:00
Jeremy Mack
0bd7f91c66
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.
2011-12-16 09:59:43 -05:00
Dmitriy Zaporozhets
f7859ec1ed
rake dev_repo: fixed for ubuntu
2011-12-16 01:59:07 -08:00
Dmitriy Zaporozhets
ced572c328
Merge pull request #196 from mutewinter/bulk_repo_import
...
Bulk repo import Rake task
2011-12-16 00:59:07 -08:00
Dmitriy Zaporozhets
fa3cb28cbe
team member show page restyle
2011-12-16 00:41:46 +02:00
Dmitriy Zaporozhets
aafb97634a
fix failing test with long name
2011-12-16 00:00:28 +02:00
Dmitriy Zaporozhets
ccc9bed893
Abilities refactoring
2011-12-15 23:57:46 +02:00
Jeremy Mack
3fd3e1fcdf
Added detection and handling of exsiting repos
2011-12-15 16:55:53 -05:00
Dmitriy Zaporozhets
7a9fc48080
just test fix commit
2011-12-15 23:21:29 +02:00
Dmitriy Zaporozhets
d9cfb7985e
dev seeds & dev scripts
2011-12-15 23:04:59 +02:00
Dmitriy Zaporozhets
f94d51d765
moved project remove button to edit section
2011-12-15 21:42:33 +02:00
Ariejan de Vroom
7ffb8fc616
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.
2011-12-15 10:33:20 +01:00