home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,452 Commits 48 Branches 340 Tags
12fa3e1b94de7232fe0337033f9dbc600248d0ec
Commit Graph
1798 Commits
Author SHA1 Message Date
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
Jan-Willem van der Meer 0ec4abf73c Use local vars for tests 2014-09-01 13:02:41 +02:00
Jan-Willem van der Meer 0c34fa3ea0 Add tests for finding an oauth authenticated user 2014-09-01 12:59:04 +02:00
Dmitriy Zaporozhets 14f5199cdc Merge branch 'feature-ldap-tests' into 'master' 
Feature ldap tests

Move specs to proper places. Relates to #154

This is already mergeable, will continue in a new branch for additions & refactorings.

See merge request !1053
 2014-08-30 07:16:45 +00:00
Jan-Willem van der Meer 0d5ae2802e Move and rename ldap / oauth specs 2014-08-29 17:30:42 +02:00
Jan-Willem van der Meer 97547428bd Rename ldap tests even further 2014-08-29 16:04:00 +02:00
Jacob Vosmaer 614ca3ec65 Remove LDAP::Access#find_user 
This method existed to allow LDAP users to take over existing GitLab
accounts if the part before the '@' of their LDAP email attribute
matched the username of an existing GitLab user. I propose to disable
this behavior in order to prevent unintended GitLab account takeovers.

After this change it is still possible to take over an existing GitLab
account with your LDAP credentials, as long as the GitLab account email
address matches the LDAP user email address.
 2014-08-29 15:38:05 +02:00
Jan-Willem van der Meer 6840a276d5 Fix naming convention of LDAP tests 2014-08-29 13:49:01 +02:00
Job van der Voort 68fd66c6e3 block visibility level restriction override in controller 2014-08-28 20:33:41 +02:00
Dmitriy Zaporozhets c5c906fe64 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 15:26:35 +03:00
Dmitriy Zaporozhets 5087f36d23 Merge branch 'annotate' into 'master' 
Annotate

See merge request !1040
 2014-08-25 10:33:53 +00:00
Dmitriy Zaporozhets 92deb451da Annotate models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-25 12:25:02 +03:00
Dmitriy Zaporozhets 2e497d8438 Prevent project stars duplication when fork project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-25 12:19:52 +03:00
Robert Schilling 66f6ca0770 Fix tests after #7526 2014-08-20 20:34:55 +02: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
Robert Schilling 4ca3f64719 Fix labels return code 2014-08-18 00:25:49 +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
Robert Schilling cbc90565b5 Do label validation for issues/merge requests API 2014-08-14 10:17:52 +02: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
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
Robert Schilling 8265d43d01 Force of markup output to be the input encoding 2014-08-11 12:18:07 +02:00
Robert Schilling 99eb283101 Use readme we support to render if there are multiple readmes 2014-08-11 08:50:56 +02:00
Dmitriy Zaporozhets a0755d2f05 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-07 20:46:17 +03:00
Dmitriy Zaporozhets fe228b89d5 Fix application helper specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-07 20:12:02 +03:00
Jacob Vosmaer e0fea696c6 Skip LDAP cache check when LDAP is disabled 2014-08-06 18:03:01 +02:00