Robert Speicher
6b90f36f5b
Updates to routing specs
2012-09-26 16:32:24 -04:00
Robert Speicher
60ac6a28a2
Allow current_controller? helper to take an Array of options
2012-09-26 16:32:24 -04:00
Robert Speicher
3ad931ca92
Add current_controller? helper method
...
Simplifies some of the "active tab" checks we're doing
2012-09-26 16:32:23 -04:00
Robert Speicher
f1c6bd8df3
Factories - Format project path and code
2012-09-26 16:32:23 -04:00
Robert Speicher
169f16fb32
Remove Commits#compare, add CompareController
2012-09-26 16:32:22 -04:00
Robert Speicher
a1e68a9120
Rename RefExtractor to ExtractsPath
...
Update docs a bit
2012-09-26 16:32:22 -04:00
Robert Speicher
a8ea8d98a4
Update RefExtractor to handle atom feeds
2012-09-26 16:32:22 -04:00
Robert Speicher
576cec6c67
Add BlobController, remove Refs#blob
2012-09-26 16:32:22 -04:00
Robert Speicher
39c6579306
Add BlameController, remove Refs#blame action
2012-09-26 16:32:22 -04:00
Robert Speicher
37f0b600bc
Another RefExtractor refactor
2012-09-26 16:32:22 -04:00
Robert Speicher
79a02df92e
Update usages of tree_file_project_ref_path to project_tree_path
2012-09-26 16:32:21 -04:00
Robert Speicher
e33cbb9b42
Add TreeController and spec
2012-09-26 16:32:21 -04:00
Robert Speicher
884eb73297
Enable tree resource, remove old tree routes
2012-09-26 16:32:21 -04:00
Robert Speicher
567767bcf2
Add ref_extractor helper module for upcoming controllers
2012-09-26 16:32:21 -04:00
Robert Speicher
b389247c02
Use Commit#show instead of Commits#show to view a single commit
...
Commits#show (plural) is going to be for showing commit history on a
specific path.
2012-09-26 16:32:21 -04:00
Robert Speicher
bde5088525
Add routing specs for new routes
2012-09-26 16:32:20 -04:00
Nihad Abbasov
83efcabc82
set activerecord whitelist_attributes to true
2012-09-26 11:18:35 -07:00
Alex Denisov
965b6701ab
Comment removed
2012-09-26 17:01:13 +03:00
Alex Denisov
c09d233611
Merge branch 'master' into fix_project_access_notification
2012-09-26 16:14:47 +03:00
Marin Jankovski
5928388b1c
Protect users projects_limit from mass assignment.
2012-09-26 13:20:44 +02:00
Marin Jankovski
7284c58c5f
Don't test if invalid key is valid.
2012-09-25 16:13:24 +02:00
Marin Jankovski
012dc2278c
Valid key for deploy keys spec test.
2012-09-25 16:13:13 +02:00
Sytse Sijbrandij
f3ce02b5c9
Reject ssh keys that break gitolite.
...
Failing test.
Working check.
2012-09-24 16:48:10 +02:00
Nihad Abbasov
1bae64d7f6
whitespace
2012-09-21 04:53:13 -07:00
Nihad Abbasov
b62445813d
API: SSH keys belong to user entity
2012-09-21 04:49:28 -07:00
Nihad Abbasov
4a072be2d7
API: commits belong to project repository
2012-09-21 04:34:07 -07:00
Dmitriy Zaporozhets
131553627d
Merge pull request #1521 from NARKOZ/api
...
API for project team members
2012-09-21 04:19:16 -07:00
Nihad Abbasov
25b745271a
add API for project team members
2012-09-21 03:23:17 -07:00
Dmitriy Zaporozhets
10d3a30b25
APi for commits. Better api docs
2012-09-21 13:22:30 +03:00
randx
d12579aa43
Merge branch 'api' of https://github.com/NARKOZ/gitlabhq into api
2012-09-20 19:35:45 +03:00
Nihad Abbasov
a605943d76
fix broken spec
2012-09-20 22:11:15 +06:00
Nihad Abbasov
b08d33f6a9
API: return 401 for invalid session
2012-09-20 08:38:08 -07:00
Dmitriy Zaporozhets
9aafe77e70
I want be able to get token via api. Used for mobile applications
2012-09-20 17:45:07 +03:00
Alex Denisov
e6ce47291b
master merged
2012-09-20 10:25:29 +03:00
Robert Speicher
496f88afe1
Escape text passed to gfm by link_to_gfm
2012-09-19 19:42:26 -04:00
Robert Speicher
01974185a1
Simplify is_within matcher
...
[ci skip]
2012-09-19 12:14:42 -04:00
Alex Denisov
b6c6a5b159
Merge branch 'master' into ssh_keys_api
2012-09-16 22:37:50 +03:00
Robert Speicher
f4b14494ef
Move project-related routing specs to their own file
2012-09-16 12:42:52 -04:00
Alex Denisov
87d40fd276
Docs added
2012-09-16 18:21:59 +03:00
Alex Denisov
c23eb40829
SSH Keys API implemented
2012-09-16 17:52:06 +03:00
Robert Speicher
02b24cefc7
Missed a use of team_project_path
2012-09-16 10:38:01 -04:00
Robert Speicher
95bd93fe1a
Remove Projects#team action
...
Uses TeamMembers#index instead, to be more RESTful
2012-09-16 10:07:06 -04:00
Robert Speicher
83f24de352
Add routing specs
2012-09-16 10:06:21 -04:00
randx
a82977c648
A bit of test refactoring
2012-09-15 01:00:59 +03:00
Dmitriy Zaporozhets
dc37c8aaae
Refactored profile area
2012-09-14 19:13:25 +03:00
Robert Speicher
d993f66642
Fix HTML entities being parsed in GFM
...
Also fixes the spec so that it actually tests the thing it says it's
testing. Hooray!
Closes #1308
2012-09-13 15:20:00 -04:00
Robert Speicher
0d77209ea0
Be more resilient in the case of missing omniauth settings
...
Should no longer freak out when omniauth settings aren't present in
gitlab.yml. People who aren't using it shouldn't even have to put a
'false' entry in their config for it (and probably wouldn't, after an
upgrade).
2012-09-12 18:11:59 -04:00
Dmitriy Zaporozhets
3643df1f7c
Merge pull request #1411 from miks/project_hooks_api
...
Project hooks API
2012-09-12 12:16:35 -07:00
Dmitriy Zaporozhets
6233fb6b5d
Merge pull request #1446 from NARKOZ/refactoring
...
specs DRY up
2012-09-12 09:08:42 -07:00
Nihad Abbasov
b6f249dc1f
make API specs more organized and readable
2012-09-12 05:11:56 -07:00
Nihad Abbasov
a87c268f7d
remove duplicate code from atom request specs
2012-09-12 05:01:50 -07:00
Dmitriy Zaporozhets
048d47e626
Refactorn oauth & ldap
2012-09-12 09:23:16 +03:00
Dmitriy Zaporozhets
40eec08c99
Merge pull request #1409 from riyad/update-votes
...
Update votes for issues and merge requests
2012-09-11 23:08:19 -07:00
randx
d8f6d38d39
Fix observer test
2012-09-12 09:05:12 +03:00
Riyad Preukschas
f7c70eaaed
Add *votes_in_percent
2012-09-11 16:47:59 +02:00
miks
2e34a6d3c4
Merge branch 'master' into project_hooks_api
2012-09-10 16:47:31 +03:00
Alex Denisov
a065557208
Common errors method added
2012-09-10 13:49:00 +03:00
Alex Denisov
77bfc591bf
Merge 'master' branch
2012-09-10 09:19:15 +03:00
Alex Denisov
1f240b09ed
User left project event added
2012-09-10 00:27:47 +03:00
Alex Denisov
a86bd87afc
User joined project event added
2012-09-09 23:18:28 +03:00
miks
fdb5c82c33
Merge branch 'master' into project_hooks_api
2012-09-08 20:54:58 +03:00
miks
3b5a90bdf6
Projects hooks API implemented
2012-09-08 20:51:12 +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
Riyad Preukschas
7b0c7ae52c
Add votes_count
2012-09-08 16:05:48 +02:00
Riyad Preukschas
2e0d5c2250
Add downvotes
2012-09-08 16:05:48 +02:00
Riyad Preukschas
a2a0060034
Rename Upvote role to Votes
2012-09-08 16:05:48 +02:00
Riyad Preukschas
06c1a8a9ae
Make notes recognize downvotes
2012-09-08 16:05:48 +02:00
Valeriy Sizov
cc7c6d5396
New project form: spec for autocomplete
2012-09-08 13:35:00 +03:00
miks
4226458faf
Merge branch 'master' into project_users_api
2012-09-08 10:50:24 +03:00
Riyad Preukschas
ce3fb94939
Fix bug where parsing of emoji was unnecessarily dependent on @project being set
2012-09-08 01:11:44 +02:00
Alex Denisov
ed4fbcf6b0
Merge branch 'master' into fix_project_access_notification
2012-09-07 09:39:34 +03:00
Dmitriy Zaporozhets
4f8a4aa44c
Merge pull request #1384 from tsigo/emoji
...
Emoji!
2012-09-06 23:05:18 -07:00
Dmitriy Zaporozhets
7c0a1068bf
Merge pull request #1363 from AlexDenisov/api_create_project_fixes
...
API create project fixes
2012-09-06 23:00:04 -07:00
Dmitriy Zaporozhets
79021e674b
Split gitolite backend. Use gitolite_config methods moved to separate class
2012-09-07 08:16:29 +03:00
Robert Speicher
8f3b1d6ea4
Fix spec broken by bde19c0
2012-09-06 17:05:23 -04:00
miks
909c8c345d
Make project users API more RESTful
2012-09-06 23:49:29 +03:00
Robert Speicher
2faa4bba40
Update Note#upvote? to support emoji voting
2012-09-06 15:31:25 -04:00
Robert Speicher
8808c5fa8d
Merge branch 'master' into emoji
2012-09-06 15:23:42 -04:00
Dmitriy Zaporozhets
a595f8944a
Merge pull request #1392 from NARKOZ/refactoring
...
refactor factory specs
2012-09-06 08:11:41 -07:00
Nihad Abbasov
d861023cb9
refactor factory specs
2012-09-06 07:52:01 -07:00
Alex Denisov
562af7a6a2
Merge branch 'master' into normalize_capitalization
2012-09-06 11:40:56 +03:00
Alex Denisov
a65ce74843
Spec fixed
2012-09-06 11:40:16 +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
b3bbf53e9b
Set the size of emoji to be 20x20
...
Forgot they were so big!
2012-09-05 16:14:54 -04:00
Robert Speicher
880a233e6d
Add specs for parsing Emoji
2012-09-05 16:05:20 -04:00
miks
8f7360f390
API on adding users to project implemented
2012-09-05 23:01:03 +03:00
Nihad Abbasov
0b559cdece
add validations for boolean attributes
2012-09-05 04:01:11 -07:00
Robert Speicher
861a51488a
Add specs for a couple more Repository methods used by discover_default_branch
2012-09-05 01:02:30 -04:00
Robert Speicher
36738897bf
Add specs for Project#discover_default_branch
2012-09-05 00:54:00 -04:00
Robert Speicher
a463353773
Add "empty_repo?" method to Repository role
...
Replaces two calls that this method simplifies
2012-09-04 12:05:21 -04:00
Alex Denisov
4bd3024580
json_spec removed
2012-09-04 10:29:26 +03:00
Alex Denisov
b73d4419ea
json_spec added. Create project via REST API fixed
2012-09-04 09:38:48 +03:00
Robert Speicher
d29827433d
Update User#identifier to conform to Gitolite 2.x's user pattern
...
Also modifies the specs a bit because I can't help myself.
Closes #480
2012-09-04 00:20:17 -04:00
Alex Denisov
af63607a5c
test_after_commit gem added
2012-09-03 21:46:17 +03:00
Alex Denisov
1f1c8094fe
After commit instead of after_update
2012-09-03 20:48:38 +03:00
Alex Denisov
e078a173d6
Create project via API: fixes added
2012-09-03 18:00:24 +03:00
Dmitriy Zaporozhets
cc03600b22
Merge pull request #1347 from AlexDenisov/api_project_creation
...
API for new project creation
2012-09-03 01:48:51 -07:00
Robert Speicher
ef24576fc2
Redesign gfm helper specs
...
Should now be much clearer about what each spec is actually testing.
For example, instead of testing stuff like link classes and titles in
every single call, we only test those things once, in their own specs.
2012-09-02 13:40:14 -04:00
Robert Speicher
877aa54586
Rename gitlab_flavored_markdown_spec to gitlab_markdown_helper_spec
2012-09-02 02:45:18 -04:00
Alex Denisov
2bd1682ab4
Merge branch 'master' into api_project_creation
2012-08-31 11:26:12 +03:00
Dmitriy Zaporozhets
ed954ebae2
Merge pull request #1326 from AlexDenisov/issue_status_changed_notifications
...
Issue status changed notifications
2012-08-31 00:51:31 -07:00
Alex Denisov
c1173e2707
API on Projects creation implemented
2012-08-31 10:15:37 +03:00
randx
d246a68a24
fix project.last_activity spec
2012-08-30 19:45:05 +03:00
Dmitriy Zaporozhets
35fbc4d3bb
Merge pull request #1334 from tsigo/milestone_api_specs
...
Fix milestone API specs
2012-08-29 09:02:07 -07:00
Dmitriy Zaporozhets
5b0a998920
Merge pull request #1333 from tsigo/model_specs
...
Increased model spec coverage
2012-08-29 09:00:02 -07:00
Robert Speicher
dde8ed4455
Fix milestone API specs and moved to requests/api
...
Closes #1331
2012-08-29 11:58:33 -04:00
Robert Speicher
97423a0bed
Add more coverage for model validations and associations
2012-08-29 11:36:02 -04:00
Dmitriy Zaporozhets
8c44789e6f
Mark api milestone specs as pending
2012-08-29 18:09:41 +03:00
Robert Speicher
2bdea8651f
Add is_within method for shoulda's EnsureLengthOf matcher
2012-08-29 10:44:34 -04:00
Robert Speicher
9e7d77cece
Remove annotations from specs
2012-08-29 10:44:34 -04:00
Robert Speicher
9d4d40deed
Move IssueCommonality and Upvote specs out of models and into their own specs
2012-08-29 10:44:34 -04:00
Robert Speicher
14daf2e2ba
Add include_module
matcher
2012-08-29 10:44:34 -04:00
Robert Speicher
2c95074a5f
Remove model specs that are covered by factories_spec
2012-08-29 10:44:34 -04:00
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
Robert Speicher
52c521ffe8
Use GitHub::Markup to parse markup files
...
Closes #1382
2012-09-05 16:52:49 -04: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
Dmitriy Zaporozhets
4c1f435ab7
Merge pull request #971 from gingko/master
...
Automatic password creation..
2012-06-26 23:41:49 -07:00
Jakub Troszok
4426bc1844
Added option to automaticaly generate passwords for new users.
2012-06-26 23:59:08 +02:00
randx
88c625e3f7
Issues can be unassigned now
2012-06-26 21:47:25 +03:00
randx
6abc649590
Reannotated
2012-06-26 21:23:09 +03:00
Jakub Troszok
bea0583951
Added tests for automatic password generation.
2012-06-24 22:51:58 +02:00
randx
55f8338502
Merge branch 'separate_user_and_issue_observer_from_mail_observer' of https://github.com/robbkidd/gitlabhq into robbkidd-separate_user_and_issue_observer_from_mail_observer
2012-06-24 09:33:22 +03:00
randx
77cf662034
Pushed widget improved
2012-06-21 18:41:22 +03:00
Robb Kidd
65989141dc
Protect IssueObserver#send_reassigned_email method.
2012-06-20 21:23:05 -04:00
Robb Kidd
88964132ed
Extract observation of User to a UserObserver
2012-06-20 14:09:46 -04:00
Robb Kidd
97ca4f5dda
Deliver issue mails.
...
It helps to actually deliver messages.
2012-06-20 14:09:46 -04:00
Robb Kidd
dfb5da9da3
Disable observers in specs. Enable only when observer is under test.
...
Used the built-in observer enable/disable feature in ActiveModel[1].
ActiveRecord::Base includes ActiveModel::Observing which provides this
behavior.
Simple wraps to enable the observer under test were added to the specs
for: ActivityObserver, IssueObserver, Admin::Users and Issues.
The spec for Project.last_activity was refactored to separate the tests
for #last_activity and #last_activity_date. Each had doubles added to
isolate the spec from the hidden dependency on the ActivityObserver
action to create an Event for the project when an Issue is created. This
ActivityObserver behavior is already tested by its spec.
[1] http://api.rubyonrails.org/classes/ActiveModel/ObserverArray.html
2012-06-20 14:09:46 -04:00
Robb Kidd
5303cc285a
Add resque_spec to test queuing mail.
2012-06-20 14:09:46 -04:00
Robb Kidd
6617eaaf9b
Make IssueObserver handle issus, not MailerObserver
2012-06-20 14:09:46 -04:00
Robb Kidd
356430c3c0
Add method for an issue to know whether it is being closed
...
Update IssueObserver to create a Note on the issue its being closed.
2012-06-20 14:09:46 -04:00
Robb Kidd
02924de3e1
Add method to Note to create notes about status changes.
2012-06-20 14:09:46 -04:00
Robb Kidd
00ec81eacb
Update IssueObserver to send reassigned emails when an issue is reassigned.
2012-06-20 14:09:46 -04:00
Robb Kidd
2416e3cb19
Add new utility method for an issue to know whether it is being reassigned
2012-06-20 14:09:46 -04:00
Robb Kidd
f6035552e5
New IssueObserver class and spec.
...
Handles emails for new issues and reassigned issues.
Need to add creating a Note on Issue close.
2012-06-20 14:09:46 -04:00
Dmitriy Zaporozhets
5bbf3ccf05
Cucumber:
...
* Profile
* Browse code
* Sceleton for main features
* Wiki
* Commits
2012-06-15 07:15:28 +03:00
Nihad Abbasov
51c30d90d4
fix broken spec
2012-06-13 05:36:51 -07:00
randx
edd81a79c5
Dashboard refactoring:
...
* dashboard should be in dashboard controller not project index
* projects index removed
2012-06-12 23:13:42 +03:00
randx
b96af79bb8
Specs for last push widget
2012-06-12 21:15:34 +03:00
Nihad Abbasov
cc3c6ad0ef
allow login via private token only for atom feeds
2012-06-01 06:56:28 -07:00
Nihad Abbasov
f8f6ff065e
add projects atom feed
2012-05-31 23:42:02 -07:00
Nihad Abbasov
475d9f487f
use ffaker gem
2012-05-29 17:35:34 +05:00
Nihad Abbasov
faa0ec7c63
cleanup User model
2012-05-29 17:13:41 +05:00
Nihad Abbasov
fc74627f3c
fix typo in spec file name
2012-05-29 17:11:55 +05:00
randx
b729004a50
[Tests] Update team member permission
2012-05-27 20:52:40 +03:00
randx
2a67879b75
[Tests] Fixed graph test
2012-05-27 13:40:43 +03:00
randx
9cd1069a8c
[Tests] Better project coverage
2012-05-27 13:39:57 +03:00
randx
baa54629a9
[Tests] added spec for search page
2012-05-27 13:22:23 +03:00
randx
3272620f72
lib/ refactoring. Module Gitlabhq renamed to Gitlab
2012-05-26 13:37:49 +03:00
Dmitriy Zaporozhets
1e4d15b406
Password & token split up, icon to button for top panel
2012-05-19 12:25:56 +03:00
Dmitriy Zaporozhets
9cd8f7b082
New Feature: Git Blame for file
2012-05-17 19:11:45 +03:00
Robb Kidd
0dd87789a1
Update Notify spec to use host set in config/gitlab.yml
...
Fixes failing tests introduced in pull request #824
2012-05-16 11:25:18 -04:00
Robb Kidd
e660043d22
Make Notify#new_merge_request_email resque friendly.
2012-05-15 22:37:34 -04:00
Robb Kidd
39061af9f8
Make Notify#new_issue_email resque friendly.
2012-05-15 22:37:34 -04:00
Robb Kidd
41c00a20a9
Make Notify#note_wall_email resque friendly
...
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
2012-05-15 22:37:34 -04:00
Robb Kidd
0a9a2c2a0b
Make Notify#note_commit_email resque friendly
...
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off. Also, the faux SHA1 cannot have underscores or
it will not match the commit pattern defined in the routes.
2012-05-15 22:37:34 -04:00
Robb Kidd
435fd8f087
Make Notify#note_issue_email resque friendly
...
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
2012-05-15 22:37:34 -04:00
Robb Kidd
bb22360d1a
Make Notify#note_merge_request_email resque friendly
...
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
2012-05-15 22:37:33 -04:00
Robb Kidd
5fe75649b3
Rename changed_mr_email to reassigned_mr_email & make resque friendly
...
#changed_merge_request_email was really sending emails about merge
request reassignments. Updated method name to reflect that.
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
2012-05-15 22:37:33 -04:00
Robb Kidd
dd921053c8
Rename changed_issue_email to reassigned_issue_email & make resque friendly
...
#changed_issue_email was really sending emails about issue reassignments.
Updated method name to reflect that.
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
2012-05-15 22:35:53 -04:00
Robb Kidd
345f176a74
Update new_user_email to take id for User and perform find itself.
2012-05-15 22:35:53 -04:00
Robb Kidd
06b45acb8f
Add specs for all of the emails.
2012-05-15 22:35:53 -04:00
Robb Kidd
c7489578e6
Add specs for Notify ActionMailer emails.
...
Covers new user, new issue and wall note emails.
Depends on email_spec (https://github.com/bmabey/email-spec/ ) for
friendly matchers.
2012-05-15 22:35:53 -04:00
Robb Kidd
d50446088c
Add spec for ProtectedBranch.
2012-05-10 22:43:12 +00:00
Dmitriy Zaporozhets
28cb43135c
Hooks UI improved, Request tests added
2012-04-26 20:43:12 +03:00
gitlabhq
c9af8e7579
New project page improved. User profile improved. Show issues, participant on Milestone show page.
2012-04-24 21:49:34 +03:00
gitlabhq
d97a9aa4a4
fixed email markdown
2012-04-23 15:32:56 +03:00
Dmitriy Zaporozhets
86d7b4f152
removed old spec
2012-04-14 11:36:53 +03:00
Dmitriy Zaporozhets
2bad798e11
fixed tests
2012-04-09 01:29:15 +03:00
Dmitriy Zaporozhets
d98b183361
first pack of tests for milestones
2012-04-09 01:01:42 +03:00
Dmitriy Zaporozhets
23d950855d
Milestone basic scaffold
2012-04-09 00:28:58 +03:00
randx
897da534fa
Fix issues with push 600+ commits. refactored, improved push events
2012-04-04 07:39:04 +03:00
Dmitriy Zaporozhets
f1799a239f
fixed project spec
2012-04-02 08:50:37 +03:00
Dmitriy Zaporozhets
8ee0993fdf
Event & Wiki models specs
2012-03-28 22:53:45 +03:00
Dmitriy Zaporozhets
39ea486e1f
Fixed specs. Some css fixes
2012-03-25 19:44:29 +03:00
Dmitriy Zaporozhets
cadf12c60c
Merged activities & projects pages
2012-03-20 00:05:35 +02:00
Dmitriy Zaporozhets
724ea16c34
Activities page added. Dashboard few specs. Preparing for 2.3
2012-03-19 22:52:16 +02:00
Dmitriy Zaporozhets
e2b3951700
Some test covering merge request update hook
2012-03-16 01:32:46 +02:00
Dmitriy Zaporozhets
a4993f16c0
Fixed migration, test for MR
2012-03-15 19:39:03 +02:00
Ariejan de Vroom
2d00f2dfe4
Added 'x notes' and +1 counters to issues and merge requests. Refs #549
2012-03-15 00:51:03 +02:00
Ariejan de Vroom
8d8b82127f
Count +1 votes in issue notes.
2012-03-14 15:31:31 +02:00
Dmitriy Zaporozhets
3676838dc9
Rspec test repo replaced.\nMerge Requests improved
2012-03-13 23:54:49 +02:00
Dmitriy Zaporozhets
71d6582c9f
fixed spec coma
2012-03-12 21:51:57 +02:00
Dmitriy Zaporozhets
a9ef0bc343
test fix, css refactoring
2012-03-07 23:55:46 +02:00
Dmitriy Zaporozhets
cb59aade4e
Cleaning and refactoring
2012-03-06 00:26:40 +02:00
Dmitriy Zaporozhets
0727edd8a0
Removed issues,mr delete buttons. Refactored models
2012-03-04 15:35:15 +02:00
Dmitriy Zaporozhets
b603e0dc45
Fixed spec
2012-03-01 22:56:24 +02:00
Ariejan de Vroom
219ac18980
Updated specs for post_receive worker
2012-03-01 16:43:04 +01:00
Ariejan de Vroom
b0ce61c4f2
Merge branch 'deploy_keys_nonunique' of https://github.com/miks/gitlabhq into miks-deploy_keys_nonunique
...
Added/fixed specs
Update spec/factory to allow Factory#new without opts
Conflicts:
app/models/key.rb
2012-03-01 16:00:14 +01:00
Dmitriy Zaporozhets
25bde28d13
Fixed tests. removed delegate to id
2012-02-29 23:04:09 +02:00
Dmitriy Zaporozhets
fa07c9d662
register push event
2012-02-28 16:48:15 +02:00
Dmitriy Zaporozhets
dcdb2fdfdb
Observe issue, merge request, note creation - create event
2012-02-28 16:01:14 +02:00
Dmitriy Zaporozhets
a847501fd2
Event entity created
2012-02-28 15:09:23 +02:00
Dmitriy Zaporozhets
292a41cbe2
Fixed comments for snippets. Tests fixed
2012-02-24 22:36:44 +02:00
Dmitriy Zaporozhets
ce8eba8913
Merge branch 'wiki'
...
Conflicts:
app/views/layouts/_project_menu.html.haml
2012-02-21 20:32:43 +02:00
vsizov
621bfdb4aa
wiki: rspec
2012-02-21 20:18:06 +03:00
Dmitriy Zaporozhets
5f4a7c3e04
Home tab added, Repository tab removed\n Ability to download branch
2012-02-20 08:38:03 +02:00
Valery Sizov
eacea15a21
wiki base sceleton
2012-02-19 19:50:13 +02:00
Dmitriy Zaporozhets
94db8a1c33
Usability & design improvements
2012-02-18 14:12:48 +02:00
Dmitriy Zaporozhets
1c62ec09b0
4 roles permission system
2012-02-16 09:03:55 +02:00
Dmitriy Zaporozhets
37224dc9c1
ProtectedBranches model, Master permission for repo\n Allow push to protected branch for masters only
2012-02-15 22:02:33 +02:00
Dmitriy Zaporozhets
bc3735004c
Moving to rails 3.2
2012-02-11 20:34:25 +02:00
Dmitriy Zaporozhets
cc043f32d8
Admin area improved
2012-02-11 19:56:18 +02:00
Dmitriy Zaporozhets
bbb0d24d5c
fix test crash after rename link
2012-02-08 20:26:31 +02:00
Dmitriy Zaporozhets
4d89322d67
Snippets - fixed after bootstrap
...
Project - restyled show page, removed info page
Repository - restyled show page, added download option
Tags - added download options
2012-02-08 01:00:49 +02:00
Dmitriy Zaporozhets
422e43989b
Compare view for commits
2012-02-06 22:32:04 +02:00
Dmitriy Zaporozhets
b51252e6ca
Bootstrap: test fixes
2012-01-30 00:43:14 +02:00
Dmitriy Zaporozhets
fca1ffb888
Bootstrap: Issues, Merge Requests, SSH Key completed
2012-01-29 23:59:12 +02:00
Dmitriy Zaporozhets
7f6e41fa02
Bootstrap: application layout
2012-01-28 00:51:02 +02:00
Dmitriy Zaporozhets
b4cc04d7e1
Commit diff fixes, per-line comments fixed
2012-01-25 21:10:09 +02:00
Dmitriy Zaporozhets
f4e3ec29c4
fixed commit commenting
2012-01-21 14:54:32 +02:00
Dmitriy Zaporozhets
744814c509
fixed team member spec
2012-01-19 22:23:23 +02:00
Dmitriy Zaporozhets
00d7bfda95
projects link added. security specs added
2012-01-19 09:27:23 +02:00
Dmitriy Zaporozhets
c9ea5f1316
deploy key creation restyled
2012-01-18 00:46:13 +02:00
Dmitriy Zaporozhets
809413d9e7
minimalistic UI: issues index, css refactoring
2012-01-18 00:04:27 +02:00
Dmitriy Zaporozhets
cbd78922ee
Merge branch 'deploy_keys'
...
Conflicts:
app/views/layouts/project.html.haml
db/schema.rb
2012-01-14 21:26:35 +02:00
Dmitriy Zaporozhets
09b877ef29
remove modal window from team member managment
2012-01-14 19:54:41 +02:00
Dmitriy Zaporozhets
621491c677
fixed test
2012-01-13 23:28:58 +02:00
Dmitriy Zaporozhets
c8b955a44b
lil restyle
2012-01-11 16:37:34 +02:00
Dmitriy Zaporozhets
70efc014e9
Merge branch 'project_activities'
2012-01-05 20:16:41 +02:00
Dmitriy Zaporozhets
97ba731574
Project activities restyled
2012-01-04 22:19:41 +02:00
Valery Sizov
212f400d67
fix bug #322
2012-01-03 23:39:03 +02:00
miks
df583bf12d
Specs for deploy_keys updated
2011-12-31 19:37:51 +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
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
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
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
91275f6d86
commented dashboard spec
2011-12-28 09:08:50 +02:00
Dmitriy Zaporozhets
5b0d6ac873
dashboard test fix
2011-12-28 09:07:40 +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
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
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
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
89a43543e9
fixed broken test bor truncated title
2011-12-22 21:52:57 +02:00
Dmitriy Zaporozhets
a2d3b21189
User profile restyle. Feed(Atom) links for commits & issues
2011-12-19 23:32:59 +02:00
Valery Sizov
839aa7357a
fix notification tests
2011-12-18 18:55:32 +02:00
Valery Sizov
a66d9b4c76
annotate model
2011-12-18 16:09:16 +02:00
Dmitriy Zaporozhets
aafb97634a
fix failing test with long name
2011-12-16 00:00:28 +02:00
Dmitriy Zaporozhets
7a9fc48080
just test fix commit
2011-12-15 23:21:29 +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
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
Dmitriy Zaporozhets
ff1cbbc532
Issue restyle
2011-12-14 08:58:35 +02:00
Dmitriy Zaporozhets
6f32ccf432
merge_requests restyle with forms
2011-12-13 23:56:04 +02:00
Dmitriy Zaporozhets
cd779e56e1
dashboard v1
2011-12-08 22: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
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
0783e4cf98
Check that issues from different projects get into the atom feed
2011-12-08 00:37:56 +01: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
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
bdc658095c
refcatoring. cleaning after gitosis
2011-12-05 09:43:53 +02:00
Dmitriy Zaporozhets
1ce55d161a
new team memeber selectbox replaced
2011-11-30 23:41:00 +02:00