home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 11:36:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,414 Commits 48 Branches 340 Tags
3e66c6a47cdac739714abe9348a4f7190fe32f0b
Commit Graph
1648 Commits
Author SHA1 Message Date
Marin Jankovski 3131d0609c Merge pull request #7147 from zzet/patch-12 
Update markdown reference to external issues
 2014-09-08 14:56:29 +02:00
Dmitriy Zaporozhets 1c70e21113 Merge branch 'create-hooks' into 'master' 
Use create-hooks instead of rewrite-hooks.sh

The rewrite-hooks.sh script is a deprecated wrapper for gitlab-shell's
create-hooks script.

See merge request !1068
 2014-09-08 09:19:54 +00:00
Sytse Sijbrandij bef923055b Merge pull request #7583 from bbodenmiller/https 
[Documentation] simplify HTTPS setup details
 2014-09-08 11:05:19 +02:00
Sytse Sijbrandij 8904d86b7d Merge pull request #7580 from bbodenmiller/patch-7 
add optional nginx configs to make more secure
 2014-09-08 10:58:18 +02:00
Jacob Vosmaer 042465c448 Use create-hooks instead of rewrite-hooks.sh 
The rewrite-hooks.sh script is a deprecated wrapper for gitlab-shell's
create-hooks script.
 2014-09-08 10:16:15 +02:00
Ben Bodenmiller a2b36858f5 add optional nginx configs to make more secure 2014-09-07 23:17:37 -07:00
Ben Bodenmiller 5d5d4ef91a simplify HTTPS setup details 
also adds comment about updating nginx files during upgrades
 2014-09-07 15:31:13 -07: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 e088777e1b Merge pull request #7470 from bbodenmiller/patch-1 
change git to git bin path
 2014-09-05 14:49:33 +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
Dmitriy Zaporozhets 66516da3c1 Explicit issues order in API. Fixes tests for mysql. Again :) 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-04 17:15:08 +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
Dmitriy Zaporozhets 93f15a4953 Explicit order of issues in API. Fixes specs for mysql db 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-03 22:57:32 +03: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 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 cf53b361b9 Make sure /api/allowed return 200 status code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-03 13:33:44 +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
Dmitriy Zaporozhets 20c2e90222 Refactor finders. Prevent circular dependency error 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-02 15:28:27 +03:00
Dmitriy Zaporozhets 6438ac72fc Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-02 12:22:45 +03: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 19bda55fb6 Merge pull request #7663 from Razer6/all_is_not_a_valid_user 
'all' is not a valid username
 2014-09-02 11:54:06 +03:00
Dmitriy Zaporozhets 7e7f52862b Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-02 11:48:57 +03:00
Dmitriy Zaporozhets 0306a4e2e4 Rewrite GitAccess for gitlab-shell v2 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-01 19:57:25 +03:00
Robert Schilling 3e127a054b 'all' is not a valid username 2014-09-01 18:07:00 +02: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 ca17e4b7ad Remove duplicate method 2014-09-01 14:30:31 +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 0c34fa3ea0 Add tests for finding an oauth authenticated user 2014-09-01 12:59:04 +02:00
Ben Bodenmiller 5e2bce0fef change git to git bin path 2014-08-30 17:09:32 -07: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
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
Job van der Voort 68fd66c6e3 block visibility level restriction override in controller 2014-08-28 20:33:41 +02:00
Dmitriy Zaporozhets 3069826d1a Merge pull request #7378 from jojosch/nginx-ssl-redirect 
Use a ? after the $request_uri to perform a valid Redirect while cloning...
 2014-08-28 16:54:36 +03: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 8b00d01c67 Search by issue/mr title and description 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 12:47:30 +03:00
Dmitriy Zaporozhets 9e5bc43263 Pass scope and page to Gitlab::SearchResults#objects instead of initialize 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 00:04:14 +03:00
Dmitriy Zaporozhets 9a4ef7e7eb Search results libraries added 
Gitlab::SearchResults and Gitlab::ProjectSearchResults are libraries we
are going to use to get search results based on query, enitity type and
pagination.

It will allow us to get only issues from project #23 where title or
description includes 'foo'.

Ex:

search_results = Gitlab::ProjectSearchResults.new(project.id, 'foo', 'issues')

search_results.objects => # [<Issues #23>, <Issues #34>]
search_results.issues_count => 2
search_results.total_count => 12 (it includes results from comments and
merge requests too)

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-26 23:32:41 +03:00
Jacob Vosmaer 37d6293842 Write authorized_keys in tmp/tests during tests 
This should reduce the number of gitlab-shell error messages while the
tests run.
 2014-08-26 11:33:26 +02:00
Dmitriy Zaporozhets b5cc813612 Merge branch 'drop_post_recieve_jobs' into 'master' 
Add rake task to drop a project's PostReceive jobs

If a user pushes so many branches/tags to a project that Sidekiq
gets clogged, you can use this script to drop _all_ PostReceive
jobs for a given project.

See merge request !1030
 2014-08-25 18:55:13 +00:00
Dmitriy Zaporozhets eddfdc9edd Merge pull request #7558 from bbodenmiller/patch-4 
change X-Frame-Options to SAMEORIGIN for nginx SSL config
 2014-08-23 23:50:09 +03:00