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

267 commits

Author SHA1 Message Date
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
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
7175b6a769 Fixed dashboard show specs 2013-01-27 13:20:23 +02:00
Marin Jankovski
296cdd591f Add optional signup. 2013-01-18 11:57:31 +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
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
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
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
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
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
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
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
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
Dmitriy Zaporozhets
2f7effe804 Refactor issues, Remove ajax 2012-12-19 06:14:05 +03:00
Dmitriy Zaporozhets
552c6d4598 Make tests green for postgres 2012-12-18 20:43:44 +02:00
Dmitriy Zaporozhets
bca7bddd3d Add ace editor to snippets 2012-12-12 19:42:08 +02:00
Cyril
045b4c8fcd replace user.name by user.username in GFM 2012-12-07 04:46:29 +01:00
Sergey Linnik
07e4a12a09 fix failing spec 2012-12-06 23:38:38 +04:00
Dmitriy Zaporozhets
05820516f1 Remove annoying failing spec 2012-12-03 17:38:35 +02:00
Dmitriy Zaporozhets
e117414e44 Merge pull request #2124 from NARKOZ/api 
remove unnecessary API::VERSION constant
 2012-12-02 03:30:30 -08:00
Dmitriy Zaporozhets
46bf3a0949 Refactored profile to resource. Added missing flash notice on successfull updated. Update username via ajax 2012-12-02 13:29:24 +02:00
Nihad Abbasov
270a43370a API: get a single wall note 2012-12-01 02:20:45 -08:00
Nihad Abbasov
ee6187bd55 API: ability to create a wall note 2012-11-29 15:52:56 -08:00
Nihad Abbasov
c946bf886c API: create new notes 2012-11-29 12:11:00 -08:00
Nihad Abbasov
1c5aa848ce API: get a single note 2012-11-29 12:11:00 -08:00
Nihad Abbasov
01eab583d0 API: list wall, snippet and issue notes 2012-11-29 12:11:00 -08:00
Dmitriy Zaporozhets
a0aa0212a9 Removed feature: comments on wiki 2012-11-29 06:14:05 +03:00
Dmitriy Zaporozhets
1d7fdf45ff Removed unused spec 2012-11-25 16:53:49 +02:00
Dmitriy Zaporozhets
0e1635a68a Fixing requests after namespaces. Fixed admin bug with access to project 2012-11-23 22:25:28 +02:00
Dmitriy Zaporozhets
9304d049de Fixed some tests and snippet colorize 2012-11-23 22:31:09 +03:00
Riyad Preukschas
578cf89812 Fix specs 2012-11-14 01:20:37 +01:00
Vincent Bonmalais
80fb38de7a Remove backward compatibility of factories. 2012-11-13 22:27:45 +11:00
Valeriy Sizov
d6a5e3dad7 Merge pull request #1735 from NARKOZ/api 
API fixes
 2012-11-07 03:50:42 -08:00
randx
3c5a3fe0ae Merge branch 'front-end' of https://github.com/NARKOZ/gitlabhq into NARKOZ-front-end 
Conflicts:
	app/views/issues/_form.html.haml
 2012-10-27 11:24:11 +03:00
randx
cec97c2708 we dont show commit message on tags page any more 2012-10-26 22:10:17 +03:00
Valeriy Sizov
56bf829c75 API: fix after review 2012-10-25 13:19:18 +03:00