home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-27 13:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,848 Commits 48 Branches 340 Tags
8c0ff87f8fa44298b7cfa40bd503370755df8bd7
Commit Graph
1615 Commits
Author SHA1 Message Date
Jan-Willem van der Meer 41f46bfac3 Add basic tests for LDAP::Access.update_permissions 2014-09-03 11:47:48 +02:00
Jan-Willem van der Meer a68b1963a3 Less private methods, more test ordering 2014-09-03 11:28:32 +02:00
Jan-Willem van der Meer 61d0bf0bad Match method order for implementation and class 
This will prevent a mess, and keeps everything clean.
In addition i made the non interface methods private
 2014-09-03 10:38:07 +02:00
Jan-Willem van der Meer 1a59ce4ee7 Add extra tests around OAUTH / LDAP find_or_create 2014-09-03 10:29:03 +02:00
Jan-Willem van der Meer f019821dbf In between patches fixup 2014-09-03 10:18:20 +02:00
Jan-Willem van der Meer 9d3eb09158 Move LDAP tests to proper location 
Same patch as gitlab-ce
https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1053
 2014-09-03 10:10:55 +02:00
Jacob Vosmaer 90ce0be420 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups 
Conflicts:
	app/models/group.rb
	app/views/groups/members.html.haml
	db/schema.rb
 2014-08-29 14:43:20 +02:00
Jan-Willem van der Meer 5238efd80c Only return found LDAP groups for processing 2014-08-29 11:09:06 +02:00
Marin Jankovski a8b655a46e Fix unsubscribe controller spec. 2014-08-22 12:03:33 +02:00
Marin Jankovski 0b9f6c589e Update the tests after base change. 2014-08-22 11:08:30 +02:00
Marin Jankovski 93e2e302c8 Add admin notification spec. 2014-08-22 10:21:45 +02:00
Marin Jankovski e8da7b8077 Merge remote-tracking branch 'CE/master' 
Conflicts:
	doc/workflow/README.md
 2014-08-21 10:57:39 +02:00
Robert Schilling 66f6ca0770 Fix tests after #7526 2014-08-20 20:34:55 +02:00
Jacob Vosmaer 5812cfa10e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
 2014-08-20 17:14:26 +02:00
Jacob Vosmaer d819b9d4ad Merge branch 'show_shared_groups' into 'master' 
Show shared groups

Fixes #134

See merge request !148
 2014-08-20 12:23:52 +00:00
jubianchi 9d5c690193 Add spec on labels validation 2014-08-20 12:31:19 +02:00
jubianchi 7ad93ab250 Improve labels validation and expose error messages 2014-08-20 12:09:19 +02:00
Marin Jankovski 81430a6189 Typo fix. 2014-08-20 08:35:18 +02:00
Robert SchillingandJacob Vosmaer 33c8c1cc0b Fix labels return code 2014-08-19 18:20:39 +02:00
Marin Jankovski dbeca1c667 Show projects that are not private and are shared with the group. 2014-08-19 14:21:38 +02:00
Jacob Vosmaer 48a943e94a Merge branch 'merge_ce_27cf081e1b0b1df166' into 'master' 
Merge CE 27cf081e1b

See merge request !145
 2014-08-18 10:04:30 +00:00
Robert Schilling 4ca3f64719 Fix labels return code 2014-08-18 00:25:49 +02:00
Jan-Willem van der Meer 2e21c362db Replace Group id with the answer to the answer to life the universe and everything 2014-08-15 19:50:47 +02:00
Jan-Willem van der Meer 6c424a2a6f Refactor LdapResetService to reflect multiple LDAP groups 2014-08-15 19:48:34 +02:00
Jan-Willem van der Meer c982a8f050 Add backwards compatibility for creating groups with a LDAP connection 2014-08-15 18:59:58 +02:00
Dmitriy Zaporozhets 86f6f5a96d Merge branch 'redmine-fix' 2014-08-15 17:48:01 +03:00
Jan-Willem van der Meer 1807368cb6 Update api/groups spec 2014-08-15 16:40:17 +02:00
Job van der Voort 0d9f8494a8 add tests to redmine integration improvement 2014-08-15 16:03:10 +02:00
Jan-Willem van der Meer 3ba7a3a5ca Remove traces from ldab_cn and ldap_access 
Also add notes about refactoring the old single-ldap API and LdapGroupResetService
 2014-08-15 12:33:05 +02:00
Jan-Willem van der Meer 5ff230a11d Add more use cases for update_ldap_group_links to unit tests 2014-08-15 12:07:30 +02:00
Jan-Willem van der Meer 2541571014 Add unit test for update_ldap_group_links 
This is the first stage, need to add some other to test revoking and
upgrading of the permissions
 2014-08-15 11:31:52 +02:00
Jan-Willem van der Meer f6252e8784 Use rspec's 'create anyway' syntax 2014-08-15 10:40:44 +02:00
Jacob Vosmaer ee8836a903 Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166 
Conflicts:
	VERSION
	app/models/user.rb
	app/services/merge_requests/build_service.rb
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/README.md
	features/project/merge_requests.feature
	features/steps/project/merge_requests.rb
 2014-08-15 10:25:23 +02:00
Dmitriy Zaporozhets 27cf081e1b Merge pull request #7479 from Razer6/feature/labels_api 
Implement complete labels API (create/delete/update)
 2014-08-15 10:25:48 +03:00
Jan-Willem van der Meer bb93dfb2c8 Remove old code 2014-08-14 12:54:26 +02:00
Robert Schilling cbc90565b5 Do label validation for issues/merge requests API 2014-08-14 10:17:52 +02:00
Jan-Willem van der Meer 673b9a373b Add method to get the current cns the user has access to 2014-08-13 16:48:36 +02:00
Dmitriy Zaporozhets 7de26f1922 Merge branch 'ldap/cache_check' into 'master' 
Cache LDAP check everywhere

Tested as follows:

- sign in LDAP user;
- disable access via LDAP (in this case, disable the account in AD);
- check that the user can still access Git via SSH;
- check that the user can still browse and do API calls (issue dropdown);
- set the last_credential_check_at attribute to 2 hours ago in the console;
- SSH access fails;
- API call returns 401.

If I try to sign in again after the LDAP account was disabled, the effect is immediate.

See merge request !139
 2014-08-13 13:11:30 +00:00
Dmitriy Zaporozhets ffc284301e Merge branch 'ldap/cache_check' into 'master' 
Cache LDAP check everywhere

See merge request !1008
 2014-08-13 13:11:04 +00:00
Robert Schilling cf3ba0209d Update labels via API 2014-08-13 12:29:03 +02:00
Robert Schilling 9284038dbe Add, delete labels via API 2014-08-13 12:28:19 +02:00
Jan-Willem van der Meer 3a42051d55 Use CGI encoding to ensure email address is transported correctly 
Tnx to @jacobvosmaer for the suggestion
source: http://stackoverflow.com/questions/4394381/rails-url-helper-not-encoding-ampersands
 2014-08-13 12:04:53 +02:00
Jan-Willem van der Meer 22b0b2b40e Match rails naming convention 
Otherwise IDE won't be able to find the tests
 2014-08-13 11:00:19 +02:00
Jan-Willem van der Meer 352ec75b7d Merge remote-tracking branch 'origin/master' into feature-admin-emails 
Conflicts:
	db/schema.rb
 2014-08-12 17:59:24 +02:00
Jan-Willem van der Meer 1dd995a763 Move tests as well, remove public namespace from controller 2014-08-12 17:56:29 +02:00
Jan-Willem van der Meer 725891d80f Do not display other behaviour if the email address does not exist 2014-08-12 17:47:01 +02:00
Dmitriy Zaporozhets 53ead2e35c Merge branch 'more-email-threading' into 'master' 
Additions to email threading

This MR follows !142:

* Add threading to "Merge request reopened" emails (see 310231dbed)

See merge request !145
 2014-08-12 12:28:19 +00:00
Jan-Willem van der Meer 196921e5fc Add test for jira_issue_transition_id 2014-08-12 09:54:43 +02:00
Jan-Willem van der Meer e0d6a086c1 Add request specs for unsubscribe 2014-08-11 13:37:21 +02:00
Jan-Willem van der Meer aa31260d7e Enable unsubscribe for admin emails 2014-08-11 13:01:53 +02:00