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

700 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
7c408960ce Merge pull request #3146 from amacarthur/AdminAPIs 
Additional Admin APIs
 2013-03-06 22:57:24 -08:00
Dmitriy Zaporozhets
afee5303ff Merge pull request #3149 from m4tthumphrey/api-deploy-keys 
Added methods to manage project deploy keys via API
 2013-03-06 07:43:45 -08:00
Dmitriy Zaporozhets
65d78253cb Merge pull request #3156 from m4tthumphrey/api-system-hooks 
Added methods to manage system hooks from API
 2013-03-06 07:42:43 -08:00
Matt Humphrey
1dd712ddc2 System hooks API. 2013-03-06 15:15:26 +00:00
Sato Hiroyuki
6224ac0647 Add and fix some tests for routing. 
It is linked to #2598.
 2013-03-06 16:36:01 +09:00
Matt Humphrey
f411772e33 Project deploy keys API 2013-03-05 21:23:29 +00:00
Angus MacArthur
61ffcab60f Additional Admin APIs 2013-03-05 10:38:43 -05:00
Dmitriy Zaporozhets
2d2a235c06 fixed omniauth email spec 2013-03-05 16:50:37 +02:00
Dmitriy Zaporozhets
da6b53a80e Merge branch 'omniauth_no_email_1' of https://github.com/gliptak/gitlabhq into gliptak-omniauth_no_email_1 
Conflicts:
	app/observers/user_observer.rb
	spec/observers/user_observer_spec.rb
 2013-03-05 16:48:18 +02:00
Andrew8xx8
0d9a6fe7b1 User's blocked field refactored to use state machine 2013-03-04 18:52:30 +04:00
Dmitriy Zaporozhets
5c3cb47c16 Merge branch 'team-and-group-descriptions' of https://github.com/Undev/gitlabhq into Undev-team-and-group-descriptions 
Conflicts:
	db/schema.rb
 2013-03-01 16:05:51 +02:00
Dmitriy Zaporozhets
1c517153a8 fix admin users tests 2013-02-28 19:56:36 +02:00
Andrew8xx8
ba5373805a Description added to user temas factory 2013-02-28 17:15:22 +04:00
Andrew8xx8
8caccae454 Issue helper tests improved 2013-02-28 16:11:14 +04:00
Andrew8xx8
c643b50dbd Default value for issues_tracker setting added 2013-02-28 16:11:13 +04:00
Andrew8xx8
16c720fd96 Issues helper improved 2013-02-28 16:11:13 +04:00
Andrew8xx8
0afdf39dbc New field added 2013-02-28 16:11:13 +04:00
Andrew8xx8
68a7ecdaaf Project issue tracker functions refactored 2013-02-28 16:10:00 +04:00
Andrew8xx8
e6d2e56961 Issue tracker field added to projects 2013-02-28 16:10:00 +04:00
Dmitriy Zaporozhets
135418dcbf fixed popen test 2013-02-27 08:24:12 +02:00
Dmitriy Zaporozhets
4e5164338a specs for api/internal 2013-02-26 22:53:59 +02:00
Dmitriy Zaporozhets
2c5e4955c0 specs for Gitlab::Popen 2013-02-26 22:53:46 +02:00
Dmitriy Zaporozhets
9c252a60c1 remove tests for unexisting methods 2013-02-26 11:17:02 +02:00
Dmitriy Zaporozhets
d7b667fee2 Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq into Undev-state-machine-stage-2 
Conflicts:
	app/models/merge_request.rb
 2013-02-26 10:38:40 +02:00
Dmitriy Zaporozhets
c9b1df1201 Fixing tests 2013-02-25 23:16:34 +02:00
Dmitriy Zaporozhets
7bab81b199 Move git post push logic to service 2013-02-25 21:21:38 +02:00
Dmitriy Zaporozhets
9611640e38 Merge pull request #3052 from Undev/system-hook-observer-improves 
System hooks code & logic refactoring
 2013-02-25 10:15:23 -08:00
Dmitriy Zaporozhets
99b6750e15 Restore old order for MR lists. Fix failing tests 2013-02-21 16:26:09 +02:00
Dmitriy Zaporozhets
4a137651ec Fix merge request closed filter. Fixed one more test 2013-02-21 14:11:24 +02:00
Dmitriy Zaporozhets
cce14e0b01 Removing ambiguity and non-working selectors 2013-02-21 13:28:05 +02:00
Dmitriy Zaporozhets
5aeaf248f1 Fixing rspec after upgrade to capybara pt1 2013-02-21 13:09:47 +02:00
Dmitriy Zaporozhets
37187336b1 Team features are green now 2013-02-21 12:27:52 +02:00
Dmitriy Zaporozhets
28da2a8bdc Monkeypatch satellite call for merge request in tests 2013-02-21 11:44:33 +02:00
Dmitriy Zaporozhets
42ce2c1080 improve selectors to pass capybara 2.0 2013-02-21 11:27:22 +02:00
Dmitriy Zaporozhets
03f6a28ec0 move capybara scenarios to spec/features 2013-02-21 10:41:37 +02:00
Dmitriy Zaporozhets
9f722427e5 Add LoginHelpers to feature type 2013-02-21 10:41:13 +02:00
Andrew8xx8
e2d94e0719 State machine added for merge_status field 2013-02-20 17:49:48 +04: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
Matt Humphrey
33c513274d Fix RESTfulness of project hook deletions by API 2013-02-20 11:35:36 +00: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