home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 19:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,607 Commits 48 Branches 340 Tags
fe314d460efd18ea064df987a5a215904b95fd4e
Commit Graph
1575 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets fe314d460e Refactor coverage tools usage 
rspec spec # no coverage generated
SIMPLECOV=true rspec spec # generate coverage locally into ./coverage
COVERALLS=true rspec spec # generate and send coverage data to coveralls.io

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-19 16:39:56 +03:00
Dmitriy Zaporozhets aca574d0f4 Ask coveralls to merge results 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-19 13:07:58 +03:00
Dmitriy Zaporozhets 8bff9a4098 Merge branch 'refator-members-logic' of https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre 2014-09-17 21:31:41 +03:00
Dmitriy Zaporozhets 4f1bb91a75 Fix finder and tests for new membership models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 16:45:28 +03:00
Marin Jankovski f37b4cc5ad Different created_at and updated_at time in api merge_requests spec. 2014-09-15 11:54:49 +02:00
Marin Jankovski b99b2e60d5 Ordering and sorting for MR in api. 2014-09-15 11:54:49 +02:00
Dmitriy Zaporozhets ce49f035cf Fix access_level api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 11:55:36 +03:00
Dmitriy Zaporozhets 77c64a9b36 Replace project_access attribute with access_level in specs and API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 11:36:50 +03:00
Dmitriy Zaporozhets bdbadebe3e Fix adminarea and emails for new membership logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 10:57:02 +03:00
Dmitriy Zaporozhets 8210d81381 Replace old references of users_project & users_group 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 19:51:54 +03:00
Dmitriy Zaporozhets c69b8e0459 Huge replace of old users_project and users_group references 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 19:32:51 +03:00
Dmitriy Zaporozhets 757426dbb1 Add Member AR model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 17:54:10 +03:00
Marin Jankovski 9b59570c8e Fix diff_helper spec. 2014-09-12 21:02:50 +02:00
Jan-Willem van der Meer bf0de1a500 Merge remote-tracking branch 'origin/master' into feature-oauth-refactoring 2014-09-11 11:46:08 +02:00
Dmitriy Zaporozhets 6135eb0adf Merge pull request #7705 from dblessing/serialize_service_properties 
Serialize service properties
 2014-09-10 20:47:47 +03:00
Drew Blessing a0dbcd2365 Serialize services properties 2014-09-10 09:56:39 -05:00
Dmitriy Zaporozhets 638331d05a Merge branch 'parallel_diff_refactor' into 'master' 
Parallel diff refactor

Refactor side-by-side diff to remove code duplication.

Base the side-by-side diff on inline diff code.

In first iteration:

1. commenting on the side-by-side diff is not possible
1. no expanding of the surrounding code

See merge request !1066
 2014-09-09 13:57:50 +00:00
Marin Jankovski 8ebb26fcc1 Add diff_helper spec. 2014-09-09 13:17:42 +02:00
Dmitriy Zaporozhets a83975ab8d API: Create project - make sure project path is respected 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-09 10:48:58 +03:00
Dmitriy Zaporozhets 218219abbd Refactoring inside refactoring. We need to go deeper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 21:54:52 +03:00
Dmitriy Zaporozhets bde3f25d26 Specs for diff parser! Yay! 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 20:42:12 +03:00
Jan-Willem van der Meer 11bb67c3c6 Test authenticate method for Gitlab::LDAP::User 2014-09-08 14:53:59 +02:00
Jan-Willem van der Meer f27830fa4c Ensure Gitlab::LDAP::authentication is tested 2014-09-08 13:26:25 +02:00
Jan-Willem van der Meer f88b6d0330 Refactor gitlab auth tests 2014-09-08 13:11:39 +02:00
Dmitriy Zaporozhets 9f505954a6 Fix tests for CI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-06 13:20:37 +03:00
Dmitriy Zaporozhets 3a971ca9ef Fix tests by using non-exist tag names 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-05 13:12:41 +03:00
Dmitriy Zaporozhets 3162140dfa Fix tag tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-05 09:36:11 +03:00
Sean Edge 468b2e8e0b Added annotated tags. Updated tag haml file and call to gitlab-shell. Updated API for annotated tags. Added tests for API. Strip leading/trailing whitespace from message, if present. Update CHANGELOG. 2014-09-04 09:47:20 -04:00
Dmitriy Zaporozhets 260fd2127c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-04 15:55:14 +03:00
Dmitriy Zaporozhets 9bb1d8fc8d Merge pull request #7382 from Razer6/git_ref_validation 
Validate branch/tag-names and references WebUI, API
 2014-09-04 15:52:42 +03:00
jubianchiandjubianchi 0ac4a933ff Filters issues by labels via API 2014-09-04 14:41:31 +02:00
Jan-Willem van der Meer 5b86dab03b Move auth hash to a seperate class 2014-09-04 12:55:10 +02:00
Dmitriy Zaporozhets e8f1331fa4 Merge branch 'internal-api-post' into 'master' 
Internal api post

See merge request !1059
 2014-09-03 11:24:08 +00:00
Robert Schilling 392113919a Validate tag-names and references in WebUI, API 2014-09-03 13:08:36 +02:00
Robert Schilling 551145bc98 Validate branch-names and references in WebUI, API 
Add specs for GitRefValidator
 2014-09-03 13:08:35 +02:00
Dmitriy Zaporozhets 7a0e1c7238 Merge pull request #7533 from duk3luk3/system-hook-key-feature 
Add system hook for ssh key changes
 2014-09-03 14:02:58 +03:00
Dmitriy Zaporozhets 596bf4c2a5 Merge branch 'feaure-ldap-oauth-tests' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/lib/gitlab/oauth/user_spec.rb
 2014-09-03 13:52:40 +03:00
Dmitriy Zaporozhets 0a7dea29aa /api/allowed use POST now 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-03 09:06:16 +03:00
Lukas Erlacher 40fc4261f2 Add system hook for ssh key changes 
Add system hook for ssh key create and destroy
Update and fix documentation
Update tests
 2014-09-03 01:27:02 +02:00
Dmitriy Zaporozhets 3a3c4ea436 Merge branch 'gitlab-shell-2-0' into 'master' 
Modify GitLab to work with gitlab-shell 2.0

Related to #1516

See merge request !1057
 2014-09-02 09:20:15 +00:00
Dmitriy Zaporozhets 7e7f52862b Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-02 11:48:57 +03:00
Dmitriy Zaporozhets 7f99aa57a2 Fix specs for internal api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-02 11:35:34 +03:00
Dmitriy Zaporozhets fc65f71747 Fix post-receive specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-02 11:05:51 +03:00
Jan-Willem van der Meer c0323b40ee Refactor: beter naming for active directory disabled users 2014-09-01 16:35:18 +02:00
Jan-Willem van der Meer 26b14dd2d5 Get uid from auth instead of info hash 
As found in the omniauth specs: https://github.com/intridea/omniauth/wiki/Auth-Hash-Schema
 2014-09-01 16:31:27 +02:00
Jan-Willem van der Meer 92a9964940 Add basic find / create specs for LDAP user 2014-09-01 15:30:46 +02:00
Jan-Willem van der Meer 262276c5f5 Ensure oath callbacks without a nickname work (google) 2014-09-01 14:26:10 +02:00
Jan-Willem van der Meer 5801d520a7 Handle user creation if email is not provided 
This fixes #1541
 2014-09-01 14:05:01 +02:00
jubianchiandjubianchi 4fdd21685c Filters issues by state via API 2014-09-01 13:51:40 +02:00
Jan-Willem van der Meer 6143cef4c4 Handle user creation if email is not provided 
This fixes #1541
 2014-09-01 13:49:16 +02:00