Commit graph

1232 commits

Author SHA1 Message Date
Cedric Gatay
e562129490 Added note when issue status changed (closed / reopened)
Implementation is correctly done through observer.
2011-12-29 22:42:31 +01:00
miks
f7b911d239 Path correction 2011-12-29 23:31:27 +02:00
miks
753d4cb25e Pass correct parameters 2011-12-29 23:09:46 +02:00
miks
3a597db773 Merge deploy keys identifier with read only keys 2011-12-29 23:08:26 +02:00
miks
78edd7469c Removed unneeded merge 2011-12-29 23:08:08 +02:00
miks
afa7f3a17a DB schema updated 2011-12-29 22:00:50 +02:00
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
Saito
78d882623e fix travis dependency, add libicu support 2011-12-29 13:33:25 +08:00
Saito
a25a85b939 merge charlock_holmes to master 2011-12-29 11:52:28 +08: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
91275f6d86 commented dashboard spec 2011-12-28 09:08:50 +02:00
Dmitriy Zaporozhets
a6c937a779 temp fix for project hooks 2011-12-28 09:08:40 +02:00
Dmitriy Zaporozhets
5b0d6ac873 dashboard test fix 2011-12-28 09:07: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
86d18ca715 Merge pull request #234 from dbr/patch-1
Minor tweak to readme
2011-12-27 14:35:41 -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
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
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
dbr/Ben
c144f9edbc Listify "Application details" in readme, as it was rendered as a single, confusing sentence 2011-12-26 06:07:15 -08: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