Andrew8xx8
e2d94e0719
State machine added for merge_status field
2013-02-20 17:49:48 +04:00
Sebastian Ziebell
f0e417091c
Merge branch 'master' into fixes/api
...
Conflicts:
spec/requests/api/projects_spec.rb
2013-02-20 14:30:11 +01:00
Sebastian Ziebell
512d826cc3
API: fixes test if project limit is reached
...
Fixes a test that checks if the project limit is reached.
2013-02-20 14:15:04 +01:00
Matt Humphrey
dddf6eab2d
Removed unnecessary paramter hash. Also tidied up hash format in hook creation spec
2013-02-20 11:45:54 +00:00
Sebastian Ziebell
eefb27f5ae
Merge branch 'master' into fixes/api
...
Conflicts:
spec/requests/api/projects_spec.rb
2013-02-20 12:43:32 +01:00
Matt Humphrey
33c513274d
Fix RESTfulness of project hook deletions by API
2013-02-20 11:35:36 +00:00
Sebastian Ziebell
1b97a2eee8
API: fixes return codes, documentation updated with status codes, tests added
...
The users API updated with return codes, e.g. if required parameters are missing
a `400 Bad Request` error is returned instead of `404`. Fixes return codes of functions,
e.g. deletion of a ssh key is an idempotent function now.
The API documentation is updated to reflect the current status of the API. Descriptions
are more detailed and complete, infos to return values are added to all functions.
2013-02-20 12:23:56 +01:00
Andrew8xx8
aa1780d03c
System hooks execution moved to System hook service
2013-02-20 14:53:15 +04:00
Dmitriy Zaporozhets
b7ac654b88
Merge pull request #2988 from Asquera/error_project_limit
...
API: creating last project before limit returns 404
2013-02-20 02:47:30 -08:00
Dmitriy Zaporozhets
25e4c512d4
Merge pull request #3011 from Asquera/fix_access_to_nonvisible_hook
...
API: fixes visibility of project hook
2013-02-20 02:45:07 -08:00
Dmitriy Zaporozhets
155703c613
Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine
...
Conflicts:
app/models/issue.rb
app/models/merge_request.rb
2013-02-19 11:01:19 +02:00
Andrew8xx8
41e97a766b
Creating test values moved to before
2013-02-18 17:52:39 +04:00
Andrew8xx8
69698aacbc
Additional tests added to Issue
2013-02-18 14:43:50 +04:00
Andrew8xx8
b607c70e8f
Additional tests added to Milestone
2013-02-18 14:43:50 +04:00
Andrew8xx8
1644117a1a
Issue uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
0b512af803
Milestone uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
29f70acc98
Merge Request uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
b45e9aefd3
Merge Request uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
f97296597c
Issuable consern uses StateMachine now
2013-02-18 14:43:49 +04:00
Andrew8xx8
8db3920c01
State renamed to merge_status
2013-02-18 14:43:49 +04:00
Jaakko Kantojärvi
27f4cf7542
Tests to validate that invalid keys are rejected
2013-02-17 21:31:20 +02:00
Sebastian Ziebell
e9d3b96595
API: fixes visibility of project hook
...
When a user is not authorized to see the list of hooks for a project, he is
still able to access the hooks separately. For example if access to
`GET /projects/:id/hooks` fails and returns a `403 Unauthorized` error it is
still possible to access a hook directly via `GET /projects/:id/hooks/:hook_id`.
Fixes access, also added tests to check access and status codes of hooks.
2013-02-16 14:42:49 +01:00
Sebastian Ziebell
5417fbfecd
Test to check 404 error when project id not found
2013-02-14 21:00:05 +01:00
Sebastian Ziebell
c8b92a4be2
Merge branch 'master' into fixes/api
2013-02-14 17:02:16 +01:00
Sebastian Ziebell
c305eb31aa
API: tests that check status codes for project branches and hooks
...
Status code 422 (Unprocessable Entity) returned if invalid url is given when creating
or updating a project hook.
2013-02-14 16:55:33 +01:00
Sebastian Ziebell
6df02adc7a
API: status code 403 returned if new project would exceed limit
...
When the project limit is reached the user is not allowed to create new ones.
Instead of error code 404 the status code 403 (Forbidden) is returned with error
message via API.
2013-02-14 15:51:56 +01:00
Sebastian Ziebell
1a01fc0c96
API: tests to show incorrect behavior when reaching project limit
...
When reaching the project limit the API returns an error code 404 on the last possible
project. The project itself is created and is available in the database (seems valid).
A similar behavior can be observed when reaching the project limit via web client, but
in this case the user is notified that the maximum number of projects is reached. The project
itself is still created and can be accessed.
Tests are added to check the behavior when reaching the project limit or one tries
to exceed it via the API.
2013-02-14 11:13:25 +01:00
Sebastian Ziebell
6fc3263e15
API: extracted helper method to provide 400 bad request error with description
...
Extracted a method for 400 error (Bad request) and adjusted code accordingly. The name of
the missing attribute is used to show which one was missing from the request. It is used to
give an appropriate message in the json response.
2013-02-13 15:48:52 +01:00
Sebastian Ziebell
54ab9bb6df
API: return status code 400 if filepath of raw file blob not given
2013-02-13 14:47:59 +01:00
Andrew8xx8
839957cf56
Constants in Events looks good now
2013-02-13 15:48:16 +04:00
Sebastian Ziebell
fd01f3aacd
API: fixes a few return codes for project snippets
...
When using project snippets via API the functions now provide status codes for
different situations other then only returning 404 error. If required parameters are missing,
e.g. `title` when creating a project snippet a 400 (Bad request) error is returned. The snippet
delete function now is idempotent and returns a 200 (Ok) regardless if the snippet with the
given id is available or not. Changing return codes of these functions has the advantage that
the 404 error is used only for resources, which are not available.
Tests added to check these status codes when handling project snippets.
2013-02-13 12:09:16 +01:00
Sebastian Ziebell
375caeefcf
Merge branch 'master' into fixes/api
2013-02-13 10:31:06 +01:00
Sebastian Ziebell
ae40e855ef
API: test checks a 400 code is returned if snippet title not given
2013-02-13 10:29:42 +01:00
Sebastian Ziebell
82bd0904ff
API: test checks a 404 error is returned if snippet id not found
2013-02-13 10:25:13 +01:00
Dmitriy Zaporozhets
8f9c01feed
Merge pull request #2946 from Asquera/fix/access_to_non_existent_branch
...
API: Fixes return code when accessing non existent branch (#2922 )
2013-02-12 09:24:54 -08:00
Sebastian Ziebell
7cc4339f71
API: changed status codes for project hooks functions
...
Different status codes in the API lib are returned on hook creation, update or deletion.
If a required parameter is not given (e.g. `url` in `/projects/:id/hooks/:hook_id`) status
code 400 (Bad request) is returned. On hook deletion a 200 status code is returned, regardless if
the hook is present or not. This makes the DELETE function an idempotent operation. Appropriate tests
are added to check these status codes.
2013-02-12 17:44:42 +01:00
Dmitriy Zaporozhets
06dd530ede
Merge branch 'user_delete_account' of /home/git/repositories/gitlab/gitlabhq
2013-02-12 10:53:51 +00:00
Dmitriy Zaporozhets
9f2041ad0e
Merge pull request #2965 from yurifury/fix-blob-route
...
Gitlab incorrectly routes blobs to the compare controller depending on filename.
2013-02-12 01:50:03 -08:00
Sebastian Ziebell
449380265a
Merge branch 'master' into fixes/api
2013-02-12 10:17:57 +01:00
Yuri Feldman
918e2213e7
Test to show incorrect routing to Compare controller
2013-02-12 19:28:37 +11:00
Andrew8xx8
9a22ac63ec
Dynamic values must be in blocks if FG
2013-02-12 10:54:56 +04:00
Dmitriy Zaporozhets
ab0cfc0036
fixing tests after refactoring
2013-02-11 20:28:27 +02:00
Dmitriy Zaporozhets
d64090b8a9
No gitolite in project any more
2013-02-11 19:16:59 +02:00
Marin Jankovski
f339af858b
Test the delete acount option.
2013-02-11 13:06:37 +01:00
Sebastian Ziebell
56b3223945
Fixes test that checks status code of hook creation
2013-02-08 18:19:59 +01:00
Sebastian Ziebell
40e7846f3e
Status code 404 returned when retrieving non existent branch (issue #2922 )
...
Accessing a repository branch that does not exist returns a 404 error instead
of 200 now. Added a test.
2013-02-08 17:04:08 +01:00
Sebastian Ziebell
9544f90389
Adding a project hook returns status code 400 if url is not given
...
When adding a project hook a url must be specified or a 400 error code is returned
* Specs added to check status code on handling project hooks
* refactored code, extracted a method
2013-02-08 16:48:05 +01:00
Sebastian Ziebell
818caf0b5d
API: refined status code handling when adding or updating a project member
...
When a user is added to a project that is already a member of, a status code 201 is now returned to
signal an idempotent operation. If something fails then instead of returning error code 404 different
more specific error codes are returned. Status code 400 (Bad request) is returned when a required
attribute, e.g. `access_level` is not given or 422 if there is a semantic error, e.g. should
the `access_level` have an unsupported value.
Specs are added to check these status codes.
2013-02-08 14:33:29 +01:00
Sebastian Ziebell
8045a81bcf
Merge branch 'master' into fixes/api
2013-02-08 10:32:42 +01:00
Dmitriy Zaporozhets
4e1757bfda
Merge branch 'gitlab-shell' of dev.gitlabhq.com:gitlab/gitlabhq
2013-02-07 08:26:39 +00:00
Dmitriy Zaporozhets
d09d87e3b0
fix deploy key spec
2013-02-07 10:25:47 +02:00
Sebastian Ziebell
5d8a99f104
Test to check a user must be part of the team to see project.
...
A user must be part of the team to see a protected project. A test is given
to check that a 404 error is returned if the user can not see the project.
2013-02-06 17:11:01 +01:00
Sebastian Ziebell
bb24275f8d
Status code 400 is returned if body is missing on note creation.
...
If a note is created with a POST request via API (`/projects/:id/notes`) status
code 400 is returned instead of 404. The resource itself exists but the request
is incomplete. Specs added to check different status codes when accessing, creating
and updating notes.
2013-02-06 17:11:00 +01:00
Sebastian Ziebell
b9d40d2524
Tests added to check status codes when handling milestone via API
...
A few more tests added to check status code when creating or updating milestones.
2013-02-06 17:11:00 +01:00
Sebastian Ziebell
41e93bbfe2
Test added to check creation of note to a non-existent MR via API
2013-02-06 17:05:55 +01:00
Sebastian Ziebell
f978a71f41
Creating MR comment without a note returns status code 400 (Bad request)
...
Creating a comment to an existing merge request via API without providing a note
returns a status code 400 now, suggesting a bad request. The reason for this
is the resource itself (MR) exists but the required property is not set.
2013-02-06 17:02:30 +01:00
Sebastian Ziebell
413952ff94
Creating or updating a MR returns more informative status codes.
...
Using the API library to create or update a merge request at the moment a 404 error is returned.
This is fine when the merge request in question does not exist, but does not provide good
information that for example a required attribute is missing.
A status code of 400 (Bad request) is returned when creating or updating a merge request
when either `source_branch` or `target_branch` is missing. A status code of 409 is returned
when `source_branch` and `target_branch` are the same. Tests are added for these cases.
2013-02-06 16:57:00 +01:00
Dmitriy Zaporozhets
4bfb98ddc9
Merge pull request #2877 from former03/feature_groups_api
...
Add groups api
2013-02-06 03:19:29 -08:00
Dmitriy Zaporozhets
70e3bffd95
Fixed: post-receive, project remove, tests
2013-02-05 12:47:50 +02:00
Dmitriy Zaporozhets
081c272b85
Remove outdated specs and fixed key remove
2013-02-05 10:15:49 +02:00
Dmitriy Zaporozhets
c75fc9c7a6
remove gitolite stub
2013-02-04 18:18:36 +02:00
Christian Simon
6dba727cb2
Add test for duplicate group paths
2013-02-01 18:58:53 +01:00
Christian Simon
fc0c692870
Add docs/tests for groups api
2013-02-01 14:59:22 +01:00
Felix Gilcher
ce6436b98a
Don't crash when removing a user that's not project member
...
The attempt to revoke project access for a user that was not member of the
project results in a 500 Internal Server error where it actually should
result in a 200 OK since after the operation, the user is not member of
the project. This turns the operation into an idempotent call that can
be repeated with no ill effects.
Updated the spec and changed the code accordingly. However, the result differs
slightly, as we can't return the users project access level if the user was not
member. I'm not aware if anybody relies on the result of this call.
Fixes #2832
2013-02-01 13:53:35 +00:00
Dmitriy Zaporozhets
d53befb0d1
Fix mailer tests
2013-02-01 15:37:21 +02:00
Dmitriy Zaporozhets
5857a7a9ce
Merge pull request #2839 from m4tthumphrey/protected-branches-api
...
Added methods to protect and unprotect branches in from the API
2013-01-31 10:44:20 -08:00
Dmitriy Zaporozhets
dfe2a742c2
fix notes specs
2013-01-31 13:13:17 +02:00
Dmitriy Zaporozhets
fd1b9fdc12
Merge branch 'extend_user_api' of https://github.com/bladealslayer/gitlabhq into bladealslayer-extend_user_api
...
Conflicts:
spec/requests/api/users_spec.rb
2013-01-31 13:00:50 +02:00
Matt Humphrey
2c7554e897
Added methods to protect and unprotect branches
2013-01-31 09:26:03 +00:00
Dmitriy Zaporozhets
315fd7d746
fix routing specs
2013-01-31 10:08:20 +02:00
Dmitriy Zaporozhets
193a5624b2
add path and path_with_namespace to api project entity
2013-01-31 09:11:35 +02:00
Dmitriy Zaporozhets
9da7b2e8d8
add specs for api -> merge request notes
2013-01-31 08:42:11 +02:00
Dmitriy Zaporozhets
1c931fb814
fix key observer tests
2013-01-28 23:03:38 +02:00
Dmitriy Zaporozhets
f7ade3b682
fix tests
2013-01-28 17:53:01 +02:00
Dmitriy Zaporozhets
9ad5fbb416
user factory username over sequence
2013-01-28 17:46:24 +02:00
Dmitriy Zaporozhets
8b54b7233e
Async perform for add/remove team members
2013-01-28 17:39:02 +02:00
Dmitriy Zaporozhets
bd94854929
fix tests
2013-01-28 08:59:34 +02:00
Dmitriy Zaporozhets
7175b6a769
Fixed dashboard show specs
2013-01-27 13:20:23 +02:00
Dmitriy Zaporozhets
aa1f1eb680
Merge pull request #2746 from gitlabhq/features/teams
...
New feature: Teams
2013-01-25 00:46:20 -08:00
Dmitriy Zaporozhets
3ce79e0658
fix spec
2013-01-25 10:10:12 +02:00
Andrey Kumanyaev
690db9693f
fix tests
2013-01-24 22:31:48 +02:00
Andrey Kumanyaev
eb99feb4a7
simple refactoring
2013-01-24 22:31:48 +02:00
Andrey Kumanyaev
a5ce8696a6
remove unused autogenerated files
2013-01-24 22:31:48 +02:00
Andrey Kumanyaev
1dd0feacc7
move Team_members controller into project (conflicts with team/members controller)
2013-01-24 22:31:25 +02:00
Andrey Kumanyaev
497f7ab5ba
save autogenerated files
2013-01-24 22:31:25 +02:00
Andrey Kumanyaev
b8dadd6427
repair rspec (remove and rename files)
2013-01-24 22:31:25 +02:00
Andrey Kumanyaev
cca9935970
save generated files
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
c5f427b0a4
save commit
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
17e9207dff
add user team factories
2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
8a86fe7bb0
Added UserTeam core models (team and m-t-m relationships) and updated other models
2013-01-24 22:31:23 +02:00
Jun Futagawa
79b9249ff4
Remove relative_url_root from path. Fixes #2602
...
Files and Commits render a 404 when running with relative_url_root.
2013-01-23 17:29:46 +09:00
Valeriy Sizov
e982a9512e
fix tests
2013-01-22 17:25:35 +02:00
Dmitriy Zaporozhets
3a1022e381
Increase Issue description size to 10k. Fixes #2545
2013-01-19 12:09:23 +02:00
Dmitriy Zaporozhets
6f05ea4f6e
Improve CreateContext call. Fixed test
2013-01-18 20:21:13 +02:00
Marin Jankovski
296cdd591f
Add optional signup.
2013-01-18 11:57:31 +01:00
Riyad Preukschas
886cf2f5be
Fix GFM specs
2013-01-17 02:00:09 +01:00
Riyad Preukschas
2bc78739a7
Fix parsing of ref-like Urls in links and images in GFM
...
Fixes #2166
2013-01-16 22:39:56 +01:00
Riyad Preukschas
16b5417842
Use image Urls for Emoji in GFM
...
Fixes #2617
2013-01-16 22:39:45 +01:00
Riyad Preukschas
7635afd0c4
Use Urls for references in GFM
2013-01-16 22:08:01 +01:00
Dmitriy Zaporozhets
fd522b3257
should be green build now :)
2013-01-15 19:18:52 +02:00
Dmitriy Zaporozhets
cc54c66fd0
Fix spec/requests/notes_on_merge_requests_spec.r
2013-01-15 18:20:58 +02:00
Dmitriy Zaporozhets
752eb2c11d
more tests fixed
2013-01-15 16:36:35 +02:00
Dmitriy Zaporozhets
b059de2ac7
Fix notes model specs
2013-01-15 15:19:14 +02:00
Dmitriy Zaporozhets
2191efd8ec
fix notes_on_wall specs
2013-01-15 15:04:22 +02:00
Dmitriy Zaporozhets
ac983319d3
fixing some test
2013-01-15 12:42:54 +02:00
Riyad Preukschas
d28176b132
Replace commit diff note request specs with spinach features
2013-01-15 00:52:57 +01:00
Riyad Preukschas
f8e1f4a7c9
Replace commit note request specs with spinach features
2013-01-15 00:52:55 +01:00
Riyad Preukschas
3022786948
Merge commit 'master' into discussions
...
Conflicts:
app/assets/stylesheets/sections/notes.scss
app/contexts/notes/load_context.rb
app/models/project.rb
app/observers/note_observer.rb
app/roles/votes.rb
app/views/commit/show.html.haml
app/views/merge_requests/_show.html.haml
app/views/merge_requests/diffs.js.haml
app/views/merge_requests/show.js.haml
app/views/notes/_note.html.haml
features/steps/project/project_merge_requests.rb
spec/models/note_spec.rb
2013-01-15 00:52:25 +01:00
Riyad Preukschas
8ee5fce9d6
Add preliminary specs for notes on merge requests
2013-01-15 00:27:59 +01:00
Riyad Preukschas
74e48f070f
Smaller fixes
2013-01-15 00:27:26 +01:00
Dmitriy Zaporozhets
9773ccc451
sidekiq with green tests
2013-01-09 09:14:05 +03:00
Dmitriy Zaporozhets
2f6603e581
A bit of spinach tests
2013-01-09 08:14:05 +03:00
Dmitriy Zaporozhets
31e3dc600a
Fix routing specs
2013-01-09 09:47:25 +02:00
Dmitriy Zaporozhets
92a619ad28
organize simplecov
2013-01-07 22:23:13 +02:00
Riyad Preukschas
8c604c9d31
Add specs for notes on wall
2013-01-05 22:58:36 +01:00
Riyad Preukschas
1883e0830c
Add specs for notes on commits
2013-01-05 22:58:27 +01:00
Dmitriy Zaporozhets
5a214ee6f1
Remove unused methods
2013-01-05 13:11:15 +02:00
Dmitriy Zaporozhets
e3d7ce2cc4
Tests are fixed now
2013-01-05 12:12:02 +02:00
Dmitriy Zaporozhets
de6fa5dd52
Fix security spec
2013-01-05 00:49:43 +02:00
Dmitriy Zaporozhets
9a88e4d184
Fix some tests. Use travis-ci 1.9.2
2013-01-05 00:43:32 +02:00
Dmitriy Zaporozhets
e16cebac3e
Fixed styles, ProjectHook specs etc
2013-01-05 00:35:38 +02:00
Dmitriy Zaporozhets
c6298678f5
use ui-box as for all
2013-01-04 23:35:31 +02:00
Dmitriy Zaporozhets
ef5b36eaaf
Fixed protected branches and file edit
2013-01-04 21:45:30 +02:00
Dmitriy Zaporozhets
afbdbb0c95
Rspec fixes
2013-01-04 18:50:31 +02:00
Dmitriy Zaporozhets
dccd8b6eaa
Continue refactoring. Use repostory and team
2013-01-04 08:43:25 +02:00
Dmitriy Zaporozhets
39ba934c0a
REpostiry, Team models
2013-01-03 21:09:18 +02:00
Dmitriy Zaporozhets
e6c0673ef1
Rspec models Milestone, Commit, UsersProject
2013-01-03 19:11:14 +02:00
Dmitriy Zaporozhets
2095780f24
fix tests
2013-01-03 12:37:12 +02:00
Dmitriy Zaporozhets
d6036f08aa
move activated? method to service
2013-01-03 09:52:14 +02:00
Dmitriy Zaporozhets
ce84e3f440
Fixed tests. added test for gitlab_ci_service model
2013-01-03 09:37:13 +02:00
Dmitriy Zaporozhets
e65731bb7e
Add concerns to autoload
2013-01-03 09:12:24 +02:00
Dmitriy Zaporozhets
40a956eb68
Few more fixes after removing roles
2013-01-03 00:01:08 +02:00
Dmitriy Zaporozhets
cac7723451
Get rid of roles
2013-01-02 23:35:11 +02:00
Riyad Preukschas
6c724ed96c
Fix factories
2013-01-02 21:31:48 +01:00
Dmitriy Zaporozhets
67896ea9a2
Fixed missing current user for issue observer
2013-01-02 20:25:25 +02:00
Dmitriy Zaporozhets
ccf0686b01
Fix api specs. Use id instead path
2013-01-02 19:46:06 +02:00
Dmitriy Zaporozhets
d431e43392
Fix few bugs and tests after refactoring ownership logic
2013-01-02 19:32:34 +02:00
Dmitriy Zaporozhets
00a1f5bc2c
Project has now correct owner and creator. Increased test coverage
2013-01-02 19:00:00 +02:00
Dmitriy Zaporozhets
ffe064a2c1
Bit of cleanup and improving mailer
2012-12-31 19:46:40 +02:00
Dmitriy Zaporozhets
c8ba5c2d58
Fix routing issues when navigating over tree, commits etc
2012-12-25 06:14:05 +03:00
Riyad Preukschas
db2c15369c
Merge branch 'master' into discussions
...
Conflicts:
app/assets/stylesheets/main.scss
app/models/project.rb
app/views/notes/_common_form.html.haml
app/views/notes/_per_line_form.html.haml
lib/gitlab/markdown.rb
spec/models/note_spec.rb
2012-12-23 01:03:57 +01:00
Dmitriy Zaporozhets
3ff131a747
Improve web hook data. Use clonable url in repo info
2012-12-23 01:10:57 +02:00
Dmitriy Zaporozhets
fa8f834374
Fix import rake task and tests
2012-12-23 00:15:48 +02:00
Dmitriy Zaporozhets
1ba28aaef8
Implement UsersProject project_access validation
2012-12-22 19:52:28 +02:00
Dmitriy Zaporozhets
2398af9ab0
Fixed wierd gitlab markdown issue
2012-12-22 14:18:40 +02:00
Dmitriy Zaporozhets
b510f8c496
Fixed tests
2012-12-21 13:37:44 +02:00
Dmitriy Zaporozhets
a567d596f8
Merge pull request #2305 from gitlabhq/fix_gfm_auto_complete
...
Fix and refactoring gfm_autocomplete
2012-12-21 02:47:55 -08:00
Valeriy Sizov
77d632890b
refactoring gfm_autocomplete
2012-12-20 20:52:12 +02:00
Riyad Preukschas
757c7a5291
Fix gravatar and ldap config
2012-12-20 16:54:28 +01:00
Riyad Preukschas
19eb637419
Update uses of Gitolite.config.foo settings
2012-12-20 16:54:28 +01:00