miks
f8ad4d2b42
Merge branch 'master' into deploy_keys
...
Conflicts:
app/models/project.rb
2011-12-29 21:46:21 +02:00
miks
723104c45f
Initial deploy_key feature commit
2011-12-29 21:44:16 +02:00
Dmitriy Zaporozhets
c1c903fb95
Project tab added. activities, team, snippets moved to project tab
2011-12-28 09:38:50 +02:00
Dmitriy Zaporozhets
6e5caa1985
favicon updated
2011-12-28 09:18:50 +02:00
Dmitriy Zaporozhets
a6c937a779
temp fix for project hooks
2011-12-28 09:08:40 +02:00
Valery Sizov
de83c91c2f
small redesign of controls of notes
2011-12-28 01:29:53 +02:00
Valery Sizov
49b5805709
commit helper refactoring
2011-12-28 01:06:55 +02:00
Valeriy Sizov
5d6e79f4b9
Merge pull request #237 from CedricGatay/feature/expand_issues_ref_in_commit
...
Autolinks to issues in commit message (see #155 )
2011-12-27 14:49:38 -08:00
Valeriy Sizov
47d5d5f5db
Merge pull request #203 from mlitwiniuk/top_nav_fix
...
Hide admin menu for non-admins
2011-12-27 14:33:38 -08: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
Cedric Gatay
0aef2fe437
I have to domesticate RubyMine, keymapping is not the same as IntelliJ and I have deleted a character by mistake...
2011-12-27 00:40:16 +01:00
Cedric Gatay
89a03a3453
1/ rspec'ed
...
2/ @commit.safe_message as an argument
3/ preserve in helper
4/ spaces around operators
2011-12-27 00:37:27 +01:00
Cedric Gatay
5d9f2e7d15
Follow up of my pull request, damn last time refactor !
2011-12-26 21:44:04 +01:00
Cedric Gatay
443e21ed92
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.
2011-12-26 21:36:20 +01:00
Ariejan de Vroom
5ca836048d
Use URI::regexp for validating WebHook urls
2011-12-26 10:12:09 +01: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
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
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
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
fa3cb28cbe
team member show page restyle
2011-12-16 00:41:46 +02:00
Dmitriy Zaporozhets
ccc9bed893
Abilities refactoring
2011-12-15 23:57:46 +02:00
Dmitriy Zaporozhets
f94d51d765
moved project remove button to edit section
2011-12-15 21:42:33 +02:00
Maciej Litwiniuk
36b7b5f299
hide admin menu for non-admins
2011-12-15 12:18:33 +01: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
Dmitriy Zaporozhets
42c46f3720
Dashboard tabs restyle, messages if no issue or merge request
2011-12-15 09:22:24 +02:00
Dmitriy Zaporozhets
ed3f3a0d4d
Download link for binary
2011-12-15 08:42:24 +02:00
Dmitriy Zaporozhets
0712e78597
Snippet restyle
2011-12-15 08:12:24 +02:00
Dmitriy Zaporozhets
ca4e2ad135
Merge pull request #197 from artiom/187-dashboard-merge-request-indication
...
Merge requests in dashboard state indication
2011-12-14 10:53:50 -08:00
Dmitriy Zaporozhets
e213f94985
Merge pull request #199 from jalada/master
...
Image is broken on dashboard if deployed to a subdomain
2011-12-14 10:53:31 -08:00
Ariejan de Vroom
edab46e9fa
Added web hooks functionality
...
This commit includes:
* Projects can have zero or more WebHooks.
* The PostReceive job will ask a project to execute any web hooks defined for that project.
* WebHook has a URL, we post Github-compatible JSON to that URL.
* Failure to execute a WebHook will be silently ignored.
2011-12-14 17:38:52 +01:00
David Somers
edece21e22
Use #image_tag for dashboard tabs throbber.
2011-12-14 15:24:39 +00:00
Dmitriy Zaporozhets
ff1cbbc532
Issue restyle
2011-12-14 08:58:35 +02:00
Dmitriy Zaporozhets
87d9e0d88c
Issue show page restyled
2011-12-13 23:59:35 +02:00
Dmitriy Zaporozhets
6f32ccf432
merge_requests restyle with forms
2011-12-13 23:56:04 +02:00
Dmitriy Zaporozhets
3a50b6cac9
merge request show page refactored
2011-12-13 23:56:04 +02:00
Dmitriy Zaporozhets
e4bd6442a9
merge request js/css rewrite
2011-12-13 23:56:04 +02:00
Artiom Lunev
8187119eb0
add to merge requests in dashboard indication if closed or not fixes #187
2011-12-13 23:40:29 +02:00
Ariejan de Vroom
56fc53e8d8
Automatically write hooks when updating a repository.
2011-12-13 20:39:02 +01:00
Saito
713802fdf3
add plain text support,keep markdown and plain text in readme
2011-12-13 19:25:58 +08:00
Ariejan de Vroom
bc0155fbaa
First attempt at a post-receive hook that posts directly to Resque
2011-12-13 01:03:26 +01:00
Dmitriy Zaporozhets
3dc94ba8eb
ajax-loader for dashboard
2011-12-13 00:08:15 +02:00
Dmitriy Zaporozhets
8426846d6d
fix default branch
2011-12-12 23:17:28 +02:00
Dmitriy Zaporozhets
04a908f6a5
Merge pull request #190 from mutewinter/dot_project_names
...
Allow dots in project names
2011-12-12 13:03:38 -08:00
Dmitriy Zaporozhets
37a0a25f60
Merge pull request #185 from artiom/181-mergerequest-note-link
...
fix merge request note link
2011-12-12 13:02:36 -08:00
Dmitriy Zaporozhets
02e827283d
increased breadcrumbs with & commit messages
2011-12-12 22:12:37 +02:00
Jeremy Mack
a3b6a3ed35
Updated error messages to include dot as valid character
2011-12-12 13:32:35 -05:00
Jeremy Mack
926f3013c2
Updated validations and routes to support dots in project names
2011-12-12 13:13:11 -05:00
Dmitriy Zaporozhets
faf7c79eb2
lil js refactoring
2011-12-12 20:08:04 +02:00
Dmitriy Zaporozhets
4df4b38185
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2011-12-12 19:23:01 +02:00
Dmitriy Zaporozhets
5bc97fbd3f
middle panel
2011-12-12 19:22:01 +02:00
Saito
7b7549bea6
tree view readme support
2011-12-13 00:42:07 +08:00
Saito
f615c877bc
fix can not guess problem
2011-12-13 00:41:31 +08:00
Dmitriy Zaporozhets
f34b1be281
dashboard tabs
2011-12-12 09:38:37 +02:00
Artiom Lunev
1b6fb006ca
fix merge request note link
2011-12-12 00:18:51 +02:00
Dmitriy Zaporozhets
cd779e56e1
dashboard v1
2011-12-08 22:17:53 +02:00
Dmitriy Zaporozhets
4107f2cc2e
mixed dashboard - first try
2011-12-08 21:17:53 +02:00
Dmitriy Zaporozhets
8e0126e9ec
Merge branch 'issue_dashboard' into improved_dashboard
2011-12-08 15:05:01 +02:00
Ariejan de Vroom
2b896ea6cc
Remove unused #search action
2011-12-08 08:59:15 +01:00
Ariejan de Vroom
0ffed126e2
fixed tab highlighting for issues
2011-12-08 01:13:11 +01:00
Ariejan de Vroom
e4b1f38c27
Added merge request dashboard, showing all merge requests assigned to
...
you across projects.
2011-12-08 01:07:02 +01:00
Dmitriy Zaporozhets
2677bc3acb
network graph header, fixed test
2011-12-08 01:45:36 +02:00
Ariejan de Vroom
1a3af33fce
remove generated rails files
2011-12-08 00:39:32 +01:00
Dmitriy Zaporozhets
23a1ba7362
Fix different styles/button positions
2011-12-08 01:35:57 +02:00
Ariejan de Vroom
f512418b27
Added "Issues" dashboard
...
This shows issues assigned to you, across all your projects, in one
place.
References #173
2011-12-08 00:31:06 +01:00
Dmitriy Zaporozhets
72a13fcc2e
changed color for commit tag
2011-12-08 00:31:04 +02:00
Dmitriy Zaporozhets
c2789dae34
fix project creation
2011-12-08 00:22:46 +02:00
Dmitriy Zaporozhets
d68ec5e0fb
default_branch for project & fixed project destroy
2011-12-07 23:56:57 +02:00
Dmitriy Zaporozhets
c7afad3187
increase wide of content area +20px
2011-12-07 22:39:14 +02:00
Dmitriy Zaporozhets
1b8f082061
new access rights implemented
2011-12-07 10:04:57 +02:00
Dmitriy Zaporozhets
68154e8fe9
spec fix
2011-12-07 09:48:44 +02:00
Dmitriy Zaporozhets
cb021e5831
repo & project access separated. critical gitolite bugfix
2011-12-07 01:27:07 +02:00
Dmitriy Zaporozhets
5c69f929d3
fix issue with first key add to new repo
2011-12-06 10:50:07 +02:00
Dmitriy Zaporozhets
1bf775d55d
fixed commits links from tree view
2011-12-05 22:20:46 +02:00