home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,009 Commits 48 Branches 340 Tags
c68f8533aabe5e6fcc516ac8a67d29aaacb1b40b
Commit Graph
22009 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Job van der Voort c68f8533aa add issue weight to contributing 2015-12-28 14:02:18 +01:00
Dmitriy Zaporozhets 202010e33f Merge branch 'add-recaptcha-support' into 'master' 
Add support for Google reCAPTCHA in user registration to prevent spammers

To do:

- [x] Failing reCAPTCHA test causes all the fields to be lost
- ~~[ ] Improve styling of reCAPTCHA box~~ (not possible)
- ~~[ ] Put settings in `application_settings` (?)~~

![image](/uploads/d38ca89820d3c0066fb8aeb645fd77f0/image.png)

![image](/uploads/6b050749963691b023d076682abcf736/image.png)

Page when you fail CAPTCHA:

![image](/uploads/bc4846f0a5144985bc41dfa75eeab4c1/image.png)


See merge request !2216
 2015-12-28 11:55:21 +00:00
Dmitriy Zaporozhets 19054ba32b Merge branch 'rs-bump-brakeman' into 'master' 
Bump brakeman to ~> 3.1.0



See merge request !2219
 2015-12-28 11:23:25 +00:00
Sytse Sijbrandij fecae9f2bd Merge branch 'initscript-duplicate-update' into 'master' 
update-init-script was listed two times. removed one without explanation.

`update-init-script` was listed two times. removed one without explanation.

See merge request !2170
 2015-12-28 10:21:59 +00:00
Valery Sizov 797387c66f Merge branch 'fix_frequently_emojis' into 'master' 
[emoji-picker] Do not show frequently used category when it's empty

I added one condition.

See merge request !2221
 2015-12-28 09:46:21 +00:00
Valery Sizov 004b85540f Do not show frequently used emojis when empty 2015-12-28 10:11:05 +02:00
Robert Speicher 854f57e732 Merge branch 'issue_4662' into 'master' 
Fix intermittent timeout problems with feature specs.

This MR updates the gitlab-ci config to compile assets before running feature specs.

Closes #4662

See merge request !2220
 2015-12-28 06:12:10 +00:00
Rubén Dávila e4ec34468f Precompile assets before running feature specs. #4662 2015-12-28 00:40:37 -05:00
Stan Hu 9e0f532f3e Add documentation for using reCAPTCHA 2015-12-27 20:38:44 -08:00
Stan Hu 4c6591c922 Make sign-up form retain fields after failed CAPTCHA test 2015-12-27 19:47:21 -08:00
Stan Hu 6f0ee5c908 Fix failed spec 2015-12-27 19:47:10 -08:00
Robert Speicher 1bda2e43a2 Prevent an XSS warning from the updated Brakeman 2015-12-27 21:19:14 -05:00
Robert Speicher 7a20c6da91 Bump brakeman to ~> 3.1.0 2015-12-27 21:19:01 -05:00
Robert Speicher a97a2d2720 Merge branch 'mention-all' into 'master' 
Only allow group/project members to mention `@all`

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3473

See merge request !2205
 2015-12-27 21:09:16 +00:00
Stan Hu 9f7d379c2a Add support for Google reCAPTCHA in user registration to prevent spammers 2015-12-27 09:04:11 -08:00
Achilleas Pipinellis a52746649d Merge branch 'grammar_fix' into 'master' 
Fix typo on triggers docs



See merge request !2214
 2015-12-26 12:00:00 +00:00
Achilleas Pipinellis 8eed3ab359 Fix typo on triggers docs [ci skip] 2015-12-26 13:56:33 +02:00
Achilleas Pipinellis dab0224bd6 Merge branch 'fix_triggers_doc' into 'master' 
Remove incomplete text on triggers doc



See merge request !2213
 2015-12-26 11:52:30 +00:00
Achilleas Pipinellis f0d46b4de6 Remove incomplete text [ci skip] 2015-12-26 13:50:47 +02:00
Robert Speicher 98f77d2edc Merge branch 'close-open-ajax-issue' into 'master' 
open and close issue via ajax request. With tests

Close and Reopen issues with ajax request.

See merge request !2164
 2015-12-25 21:00:16 +00:00
Dmitriy Zaporozhets fd231ff9fb Merge branch 'revert_votes_back' into 'master' 
Revert vote buttons back to issue and MR pages

https://gitlab.com/gitlab-org/gitlab-ce/issues/3672



/cc @dzaporozhets @JobV 


![joxi_screenshot_1450809309400](/uploads/379a75505e0d5f24e743aa0a6a6684e2/joxi_screenshot_1450809309400.png)


See merge request !2206
 2015-12-25 15:52:06 +00:00
Valery Sizov c79ffa01b4 satisfy rubocop 2015-12-25 15:46:01 +02:00
Douwe Maan 7d5b51f387 Merge branch 'rs-opengraph' into 'master' 
Add Open Graph meta tags



See merge request !2192
 2015-12-25 13:41:55 +00:00
Achilleas Pipinellis 9dc1a53bb2 Merge branch 'adding_crime_security' into 'master' 
Adding  CRIME Vulnerability to Security doc

Added an additional page to the security section that goes over current status and fixes for the TLS Protocol CRIME Vulnerability. Also added its respective link at the security README. 

Any suggestions appreciated @JobV @sytses 

See merge request !2102
 2015-12-25 13:24:58 +00:00
Achilleas Pipinellis e081edc1c4 Clean up CRIME security doc [ci skip] 2015-12-25 15:23:06 +02:00
Douwe Maan 6d385e3365 Add link to twitter docs 2015-12-25 13:38:54 +01:00
Douwe Maan 0980dda6cd Add more twitter metatags. 2015-12-25 13:35:57 +01:00
Douwe Maan 4a2514ff0e Add og:site_name 2015-12-25 13:27:43 +01:00
Douwe Maan 6438c288a8 Satisfy Rubocop 2015-12-25 13:22:32 +01:00
Achilleas Pipinellis 05f8c585f7 Merge branch 'master' into adding_crime_security 2015-12-25 14:21:14 +02:00
Douwe Maan 9a0e16f454 Fix spec 2015-12-25 13:20:20 +01:00
Valery Sizov 5605e15914 fix spinach 2015-12-25 14:11:19 +02:00
Valery Sizov 195dc3a746 add sorting of awards 2015-12-25 14:11:19 +02:00
Valery SizovandValery Sizov a1b63e1252 revert back vote buttons to issue and MR pages 2015-12-25 14:11:19 +02:00
Achilleas Pipinellis ed777c7bcc Merge branch 'ci_triggers_docs' into 'master' 
Documentation on CI triggers

Closes #3432

## Notes

* Implement build trigger API - https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/229
* Build trigger API - https://gitlab.com/gitlab-org/gitlab-ci/issues/257
* Build pipeline - https://dev.gitlab.org/gitlab/gitlab-ci/issues/282 and https://gitlab.com/gitlab-org/gitlab-ce/issues/3743
* Dependent builds - https://dev.gitlab.org/gitlab/gitlab-ci/issues/328
* Travis docs - https://docs.travis-ci.com/user/triggering-builds/
* Custom variables Circle CI example - https://circleci.com/docs/nightly-builds
* Triggers API (CI) will be done in a separate MR
* Notify https://gitlab.com/gitlab-org/gitlab-ci/issues/368 once done

## Docs needed to change

- [x] `doc/ci/README.md`
- [x] `doc/README.md`

See merge request !2161
 2015-12-25 11:40:45 +00:00
Achilleas Pipinellis 662e9cffe1 Add examples for triggers [ci skip] 2015-12-25 13:37:46 +02:00
Dmitriy Zaporozhets 92bc703847 Merge branch 'support-api-lookup-by-username' into 'master' 
Add API support for looking up a user by username

Needed to support Huboard

See merge request !2089
 2015-12-25 11:23:29 +00:00
Dmitriy Zaporozhets b1b5b2218f Merge branch 'feature/force-tfa' into 'master' 
Require two factor authentication

Allow Admins to force 2FA on their users, as discussed here: gitlab-org/gitlab-ce#3783

See merge request !2155
 2015-12-25 09:27:02 +00:00
Achilleas Pipinellis d18fd3f648 Merge branch 'master' into ci_triggers_docs 2015-12-25 01:31:02 +02:00
Achilleas Pipinellis e74affcfa8 Add images and examples 2015-12-25 01:29:27 +02:00
Robert Speicher 350d65503f Merge branch 'ref-filter-html' into 'master' 
Escape all the things.

See merge request !2209
 2015-12-24 22:19:36 +00:00
Robert Speicher ab3d855c0e Add support for twitter:label meta tags 2015-12-24 17:11:08 -05:00
Robert Speicher 99dc1fce5e Use request.fullpath for og:url tag 2015-12-24 16:53:35 -05:00
Robert Speicher c6d2508362 Truncate page_description to 30 words 2015-12-24 16:26:52 -05:00
Gabriel Mazetto 1249289f89 Fixed codestyle and added 2FA documentation 2015-12-24 19:01:30 -02:00
Gabriel Mazetto 6e3fb5024a Updated CHANGELOG 2015-12-24 19:01:30 -02:00
Gabriel Mazetto cde06999c9 Add to application_settings forced TFA options 2015-12-24 19:01:30 -02:00
Gabriel Mazetto b61a5bc20c specs for forced two-factor authentication and grace period 
simplified code and fixed stuffs
 2015-12-24 19:01:30 -02:00
Gabriel Mazetto 31fb2b7702 Grace period support for TFA 2015-12-24 19:01:30 -02:00
Gabriel Mazetto 33964469b3 WIP require two factor authentication 2015-12-24 19:00:18 -02:00