deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2265 commits 6 branches 43 tags 25 MiB
Commit graph

361 commits

Author SHA1 Message Date
Alex Denisov 2703fe3e72 Merge branch 'master' into issue_status_changed_notifications 2012-08-29 11:42:15 +03:00
Alex Denisov 05af5655a7 Merge branch 'master' into issue_status_changed_notifications 2012-08-29 11:21:14 +03:00
Alex Denisov 2cb0a62f7d Notification sends to issue author and assignee if issue being reopened or closed 2012-08-29 10:48:17 +03:00
Alex Denisov 4d65532158 Issue_status_changed email added 2012-08-29 09:49:39 +03:00
Robert Speicher 1dda08486b Only include StubbedRepository in Project model 2012-08-29 01:55:41 -04:00
Dmitriy Zaporozhets 14f5d1727a Merge branch 'milestone_api' of https://github.com/tsigo/gitlabhq into tsigo-milestone_api 
Conflicts:
	spec/requests/api/issues_spec.rb
 2012-08-29 15:35:12 +03:00
Dmitriy Zaporozhets adc71b6a6a Fix test i broke with ssk key validation. Added Key.user_id as attr_protected 2012-08-29 07:58:22 +03:00
Dmitriy Zaporozhets 5afb16e496 Add ssh key validation 2012-08-29 07:13:29 +03:00
Robert Speicher 39ff033d1a Remove pkey.example 2012-08-28 21:22:49 -04:00
Robert Speicher a3a63eeb92 Remove all instances to 'gitlabhq_x' seed repositories from specs and features 
We now need only one seed repo! Also cleans up the seeding script.
 2012-08-28 21:22:49 -04:00
Robert Speicher a39cfb5461 Simplify StubbedRepository after GitHost changes from master 2012-08-28 21:22:49 -04:00
Robert Speicher 77d06454ed Simple model spec changes made possible by new factories 2012-08-28 21:22:49 -04:00
Robert Speicher 0bc9094058 Add deploy_key and personal_key factories 2012-08-28 21:22:49 -04:00
Robert Speicher c9c1f76e00 All specs and features currently passing with FactoryGirl 2012-08-28 21:22:49 -04:00
Robert Speicher 4805c64f2a Remove spec/factory and spec/factories 2012-08-28 20:30:50 -04:00
Dmitriy Zaporozhets 2e8b5ebefd Merge pull request #1386 from tsigo/github_markup 
Use GitHub::Markup to parse markup files
 2012-09-09 03:34:50 -07:00
miks ba584c7d8d Merge branch 'master' into project_users_api 2012-09-08 20:55:08 +03:00
miks 499ff8b441 fix failing tests 2012-09-08 19:39:10 +03:00
miks 0d1009af85 "users" GET test added 2012-09-08 17:51:28 +03:00
miks 8a3408180a move "users" test after project tests 2012-09-08 17:40:36 +03:00
miks 4226458faf Merge branch 'master' into project_users_api 2012-09-08 10:50:24 +03:00
miks 909c8c345d Make project users API more RESTful 2012-09-06 23:49:29 +03:00
miks ab057bb5db proper Grape params hash simulation 2012-09-06 10:20:59 +03:00
miks cd846ba2b5 Fix tests 2012-09-06 09:52:27 +03:00
miks 94c5054566 count against last project 2012-09-06 01:06:02 +03:00
Robert Speicher 52c521ffe8 Use GitHub::Markup to parse markup files 
Closes #1382
 2012-09-05 16:52:49 -04:00
miks 8f7360f390 API on adding users to project implemented 2012-09-05 23:01:03 +03:00
randx 7cdc5b9e04 Use similar interface to access gitolite 
Simplified gitolite handle logic
Stubn over monkeypatch
Stub only specific methods in Gitlab:Gitolite
Moved grach auth to lib
added specs for keys observer
removes SshKey role
 2012-08-29 00:04:06 +03:00
Alex Denisov 3c96d1f0e1 Send notification on update UserProject relation (access changed) 2012-08-27 00:32:03 +03:00
Alex Denisov aaeb37419a Send notifiation on create UserProject relation (access granted) 2012-08-27 00:13:03 +03:00
Robert Speicher 580ce4f2d8 Minor cleanup to Milestone model and spec 
Back-ported from my still-in-progress major cleanup.
 2012-08-25 14:19:16 -04:00
Robert Speicher 232389f4e8 Clean up request specs 2012-08-25 14:19:15 -04:00
Robert Speicher b2a5344a2d Add a simple api method to ApiHelpers, replacing api_prefix 
See docs for usage
 2012-08-25 14:19:15 -04:00
Robert Speicher fba174e9bc Cleanup spec/support folder and spec/spec_helper 
Changes:
* Move spec/monkeypatch to spec/support
* Remove unused support/shared_examples
* Move support/api to support/api_helpers to match module name
* Move support/login to support/login_helpers to match module name
* Move API specs to requests/api (convention over configuration)
* Remove unused support/js_patch
* Simplify login_as helper
* Move DatabaseCleaner stuff to its own support file
* Remove unnecessary configuration and requires from spec_helper
 2012-08-25 14:19:15 -04:00
Robert Speicher 852b9c28dd Move observer specs out of spec/models into spec/observers 2012-08-25 13:22:45 -04:00
randx 14bd9c9228 Fix dashboard issues atom feed rspec 2012-08-24 12:17:05 +03:00
Robert Speicher b838440f15 Deprecate the DELETE method for Issues API 
Now returns HTTP Status 405 - http://httpstatus.es/405

Closes #1245
Closes #1264
 2012-08-22 13:26:09 -04:00
Robert Speicher 0f1ca8b3e7 Remove DELETE API for Milestones 2012-08-22 13:19:55 -04:00
Robert Speicher db4c3e58bc Don't run SimpleCov on Travis 2012-08-23 07:24:25 -04:00
Dmitriy Zaporozhets 1ef1a4ae6e Merge pull request #1239 from tsigo/disable_gravatar 
Allow disabling Gravatars in gitlab.yml settings
 2012-08-22 04:33:50 -07:00
randx 3784f134f1 Merge branch 'refactor_notify' of https://github.com/tsigo/gitlabhq into tsigo-refactor_notify 2012-08-21 21:34:33 +03:00
randx 64f3682feb project should not respond to write_hooks any more 2012-08-21 20:24:04 +03:00
Robert Speicher 652d955c92 Remove some duplication in the Notify mailer 2012-08-20 23:04:53 -04:00
randx d656cb74f7 Headless gem added 2012-08-19 11:36:37 +03:00
Dmitriy Zaporozhets 4ce034ca65 Merge pull request #1247 from tsigo/feature/no_milestone_filter 
Allow filtering issues that have no milestone or assignee
 2012-08-16 22:33:56 -07:00
Robert Speicher b0a901fe01 Add API for Milestones 2012-08-16 14:52:42 -04:00
Robert Speicher 65bcc41f3e Allow disabling Gravatars in gitlab.yml settings 
Closes #1237
 2012-08-15 21:06:08 -04:00
Robert Speicher 5a90d044f7 Allow filtering by issues with no assigned... assignee 
Continues #1222
 2012-08-13 20:49:18 -04:00
Robert Speicher b1ea0b3c01 Allow filtering by issues with no assigned milestone 
Closes #1222
 2012-08-13 01:38:00 -04:00
Dmitriy Zaporozhets 463644c882 rspec to capybara-webkit. simplercov now use cucumber 2012-08-13 08:32:10 +03:00
Robert Speicher 42d3295d3d Revert 1.9 Hash syntax in ValidCommit::BLOB_FILE 
Features are still expecting the 1.8 syntax, which is fine in this case.
 2012-08-10 18:38:13 -04:00
Robert Speicher 7754189187 Fully embrace Ruby 1.9 hash syntax 
Didn't bother with files in db/, config/, or features/
 2012-08-10 18:25:15 -04:00
Dmitriy Zaporozhets 1413c23c50 Merge pull request #1208 from tsigo/issue_commonality 
Consolidate functionality shared between Issue and MergeRequest
 2012-08-10 06:48:16 -07:00
Robert Speicher b7f9b8223e Fix search class method for IssueCommonality 
Also adds specs to the two affected classes that would have caught my
dumb mistake.
 2012-08-09 13:45:12 -04:00
Dmitriy Zaporozhets a8ce107c64 Cucumber feature -> Merge Request 2012-08-09 08:13:29 +03:00
randx 04bad8257f Fixed markdown tests 2012-08-08 11:52:09 +03:00
Riyad Preukschas 5443021a0e Update notifications mails and notify specs for GFM 2012-08-06 05:08:22 +02:00
Riyad Preukschas 6f9428b1cd Fix GFM helper to raise an exception when @project is not set 2012-08-06 02:32:17 +02:00
Riyad Preukschas 90c2cd1ee6 Fix GFM specs for ids in markdown headings 2012-08-06 02:31:16 +02:00
Riyad Preukschas 8e6a7a172e Merge branch 'master' into gitlab-flavored-markdown 2012-08-06 01:48:20 +02:00
randx 4a437cdf86 Remove useless Protected branch test 2012-08-02 09:05:00 +03:00
Dmitriy Zaporozhets 9844ddd43f Comments cucumber. More refactoring. Cucumber -> branches, tags 2012-08-03 19:59:55 +03:00
Dmitriy Zaporozhets 1281c122c7 Issues cucumber. refactored step_definitoons 2012-08-03 19:49:54 +03:00
Dmitriy Zaporozhets b846ac1059 Milestones cucumber. Renamed app security test 2012-08-03 19:39:54 +03:00
Dmitriy Zaporozhets 6de4882597 Remove duplicate coverage in spec requests. All features should be covered in cucumber 2012-08-03 19:29:54 +03:00
Riyad Preukschas 204964918b Add specs for using GFM on a variety pages 2012-08-02 02:54:54 +02:00
Riyad Preukschas 0a60b19b23 Remove the commit_msg_with_link_to_issues helper and specs 2012-08-02 02:54:10 +02:00
Riyad Preukschas 24ec186a83 Update Gitlab Markdown renderer to use GFM 2012-08-02 02:54:05 +02:00
Riyad Preukschas 6873d07f62 Add link_to_gfm helper and specs 2012-08-02 02:54:01 +02:00
Riyad Preukschas de2770bba9 Add GFM helper specs 
tests references to
* commits
* team members
* issues
* merge requests
* snipptes
 2012-08-02 02:26:21 +02:00
Nihad Abbasov d63706d72c Merge pull request #1157 from CodeAdept/api_blob_contents 
API blob contents
 2012-07-31 23:37:48 -07:00
Jeremy Anderson 69c4cea65a updating project api to include raw blob contents and single branch 2012-07-31 07:32:44 -07:00
Dmitriy Zaporozhets 5926bbac12 Backend Refactoring 2012-07-31 08:32:49 +03:00
randx 69e41250d1 Styled New/Edit Project for admin area 2012-07-28 00:42:44 +03:00
Dmitriy Zaporozhets e1344a08f0 Merge pull request #1163 from tomykaira/bug_1009 
Fix #1009 Replace all special characters in user's identity
 2012-07-28 07:46:40 -07:00
tomykaira 03a2995e15 Fix #1009 Replace all special characters in user's identity 2012-07-28 22:05:25 +09:00
randx 3caf0aa89a fix commits spec 2012-07-28 00:40:14 +03:00
randx 61c85332d2 Merge branch 'add_wiki_comments' of git://github.com/seeingidog/gitlabhq into seeingidog-add_wiki_comments 
Conflicts:
	app/controllers/admin/mailer_controller.rb
	app/controllers/notes_controller.rb
 2012-07-25 21:36:30 +03:00
Dmitriy Zaporozhets 5133541f25 Merge pull request #1127 from riyad/use-decorators 
Use CommitDecorator more
 2012-07-25 11:25:55 -07:00
Nihad Abbasov cb32e0320a return 404 if project not found 2012-07-25 05:24:28 -07:00
Nihad Abbasov 1b95c8bff3 API: ability to get project by id 2012-07-25 02:18:30 -07:00
Nihad Abbasov eca823c1c7 Merge branch 'master' into api 2012-07-24 05:46:36 -07:00
Nihad Abbasov 7b33d8cbca add issues API 2012-07-24 05:19:51 -07:00
Riyad Preukschas f9877c529e Update specs 2012-07-22 13:08:32 +02:00
Dmitriy Zaporozhets 60ee383eb9 Enable observe for system hooks 2012-07-20 12:08:59 +03:00
Ian Morgan 36efa2042c Add comments to Wiki pages 2012-07-19 20:23:55 -04:00
Valeriy Sizov 86bd11cbd8 System Hooks: rspec 2012-07-19 00:25:10 +03:00
Valeriy Sizov 655418bed2 System hooks: fix broken tests 2012-07-19 00:25:10 +03:00
Dmitriy Zaporozhets a3bb9ca1fa Feature: Unassigned Merge Requests 2012-07-17 08:19:16 +03:00
m16a1 a46a172ad9 Update master 2012-07-13 17:10:30 +04:00
Dmitriy Zaporozhets d40b9ce26d Admin gitolite logs. Refactored project creation. Few style fixes. 2012-07-05 21:59:37 +03:00
Dmitriy Zaporozhets 3ce629fded Merge pull request #1034 from NARKOZ/api 
API version
 2012-07-04 08:36:06 -07:00
Nihad Abbasov 61910eb8fa ability to update and get a raw snippet via API 2012-07-04 02:03:32 -07:00
Nihad Abbasov fbd559d44f add API version 2012-07-04 00:48:00 -07:00
Dmitriy Zaporozhets a2eda66b30 Disable issues sort. Recent issues on top. Fixed tests 2012-07-02 21:51:48 +03:00
Dmitriy Zaporozhets 9b337b8328 Epic: Gitlab configuration with default values 2012-07-02 21:51:48 +03:00
Nihad Abbasov 378dc55d29 add project snippets API 2012-06-29 06:34:08 -07:00
Nihad Abbasov 84a3f8fca4 show only current user projects 2012-06-28 07:02:20 -07:00
Nihad Abbasov 7b5c3cc8be add projects API 2012-06-28 03:44:20 -07:00
Nihad Abbasov 4ad91d3c11 add users API 2012-06-28 03:43:41 -07:00