Commit graph

4657 commits

Author SHA1 Message Date
shtirlic 188e451c76 Add .directory to .gitignore 2012-01-01 21:43:08 +04:00
shtirlic 2eb56e3d18 Delete .directory files 2012-01-01 21:37:32 +04:00
miks dda6b0ab63 Unused validator deleted 2011-12-31 19:40:38 +02:00
miks df583bf12d Specs for deploy_keys updated 2011-12-31 19:37:51 +02:00
miks b8b6515f93 Renamed project "keys" back to "deploy_keys" 2011-12-31 19:37:14 +02:00
miks 99b8b577e9 DeployKey moved to Key model 2011-12-31 16:24:10 +02:00
Dmitriy Zaporozhets 2c1b06a10f Merge branch 'feature/repository_tab' 2011-12-31 13:13:23 +02:00
Dmitriy Zaporozhets a667c71312 repo branches and tags 2011-12-31 13:12:10 +02:00
Dmitriy Zaporozhets d8247012b5 repositories tab specs 2011-12-31 12:52:01 +02:00
Dmitriy Zaporozhets d34904b86c Merge branch 'grit_ext' 2011-12-30 23:20:16 +02:00
Dmitriy Zaporozhets 0ae9ac155c repo tab added. activities page for repo 2011-12-30 22:56:13 +02:00
miks 5b4382e12e Validate key uniqueness across Key and DeployKey tables 2011-12-30 21:59:59 +02:00
Dmitriy Zaporozhets e33aab0b21 Merge branch 'feature/project_tab' 2011-12-30 21:58:02 +02:00
Dmitriy Zaporozhets 61a2ce4110 code cleanin 2011-12-30 21:56:34 +02:00
Saito 31f3d6efb3 fix travis dependency, add libicu support 2011-12-30 22:49:58 +08:00
Saito 98b5c3647b use monkey patch to trancoding content 2011-12-30 22:26:13 +08:00
Saito 26deb7e0b5 add charlock_holmes gem 2011-12-30 22:25:45 +08:00
Saito 14023c4e5a remove charencode. 2011-12-30 21:41:39 +08:00
miks c973fce606 Use correct model for testing 2011-12-30 15:19:23 +02:00
miks 46d212832f Spec updates 2011-12-30 15:14:14 +02:00
Saito 7279e8c177 Revert "merge charlock_holmes to master"
This reverts commit a25a85b939.
2011-12-30 18:30:57 +08:00
Saito 5719f02f34 Revert "fix travis dependency, add libicu support"
This reverts commit 78d882623e.
2011-12-30 18:30:57 +08:00
Dmitriy Zaporozhets 0f627a65f4 Project tab r1 is finished 2011-12-30 08:54:42 +02:00
miks 65601ade2b Specs for deploy_keys 2011-12-30 00:33:26 +02:00
miks b85ae02856 Only project admin have access to deploy_keys section 2011-12-29 23:46:18 +02:00
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