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
Jan-Willem van der Meer
11bb67c3c6
Test authenticate method for Gitlab::LDAP::User
2014-09-08 14:53:59 +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
Marin Jankovski
721b75733c
Take the next type into consideration
2014-09-08 09:05:17 +02:00
Marin Jankovski
f827482c12
Remove duplication, expand for next_line.
2014-09-08 09:05:16 +02:00
Marin Jankovski
1067b00724
Duplicate the behaviour and refactor for use with parallel diff.
2014-09-08 09:05:16 +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
Ben Bodenmiller
c41e5f5018
update ssl_ciphers
...
taken from
https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html /
https://cipherli.st/
backwards compatible ciphers not needed since gitlab does not support
ie8
2014-09-07 14:55:11 -07:00
Ralf Seidler
9edf6d4dd0
Fixed trailing white space
2014-09-06 20:42:11 +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
Ralf Seidler
23241c181c
Fixed houndci complaining over too long lines
2014-09-06 11:46:14 +02:00
Charles Bushong
858dbd0842
Updating to persist a params snippets variable
2014-09-05 13:30:55 -04: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
Ralf Seidler
d93b046c4c
Added search wiki feature
2014-09-05 13:36:43 +02: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
jubianchi and jubianchi
0ac4a933ff
Filters issues by labels via API
2014-09-04 14:41:31 +02:00
Jan-Willem van der Meer
18f88a1b76
Add new Gitlab::Oauth::AuthHash class
2014-09-04 13:00:27 +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
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
Jan-Willem van der Meer
1bd15fa717
Use instance methods of LDAP::User as well
...
Still in need of some proper cleanup
2014-09-03 17:33:03 +02:00
Jan-Willem van der Meer
62fc80642d
Refactor Oauth::User class to use instance methods
2014-09-03 15:59:50 +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
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
Charles Bushong
b1411e90f8
Changing some formatting for the Hound, modifying some UI text
2014-09-02 08:33:23 -04: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
Ben Bodenmiller
765eabeacc
add HSTS Policy warning
...
Add warning about HSTS header as it means user will need to provide secure connection access to site for next 24 months from page view. See https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security for more details.
2014-09-01 15:47:15 -07: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
jubianchi and jubianchi
4fdd21685c
Filters issues by state via API
2014-09-01 13:51:40 +02:00