home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
21,992 Commits 48 Branches 340 Tags
297f83425e8917d6fbebdc00a612aa08ec855b5e
Commit Graph
21992 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sytse Sijbrandij 297f83425e Restart settings are moved too. 2015-12-28 16:33:37 +01:00
Sytse Sijbrandij fe2f1b4481 Add documentation and example file for environent variables. 2015-12-27 17:36:50 +01:00
Sytse Sijbrandij 4ebd447a05 Use environment variables to configure GitLab. 2015-12-27 17:36:08 +01: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
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
Douwe Maan 37993d3957 Escape all the things. 2015-12-24 21:36:33 +01:00
Douwe Maan 7b25da74ea Merge branch 'fix-add-key-submit' into 'master' 
Enable "Add key" button when user fills in a proper key

Closes #4295

See merge request !2208
 2015-12-24 20:28:34 +00:00
Achilleas Pipinellis aafd7ce83b Remove triggers from yaml doc [ci skip] 2015-12-24 21:50:03 +02:00
Achilleas Pipinellis 6fce8b6f5c Add triggers doc in top level readme [ci skip] 2015-12-24 21:48:24 +02:00
Stan Hu 8309ef45a9 Enable "Add key" button when user fills in a proper key 
Closes #4295
 2015-12-24 11:34:32 -08:00
Robert Speicher e3befaed82 Update CHANGELOG 
[ci skip]
 2015-12-24 14:14:03 -05:00
Robert Speicher 1042c16b4b Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-12-24 14:00:29 -05:00
Robert Speicher a9b82220e8 Merge branch 'fix-changelog' into 'master' 
Move changelog items to their correct place.

Fixes #4236

See merge request !2201
 2015-12-24 13:59:02 -05:00
Douwe Maan 835333c426 Merge branch 'ldap-special-chars-fix' into 'master' 
Fix identity and user retrieval when special characters are used

Fixes #4023

I also added tests to make sure the user with special characters in his name is returned correctly.

@rspeicher this probably should be added to 8.3 as a patch.

See merge request !2176
 2015-12-24 16:35:00 +00:00
Valery Sizov e1a47bd123 Merge branch 'emoji_picker_frequently_used' into 'master' 
Emoji picker: add "frequently used" category

depend on !2172

![Screen_Shot_2015-12-24_at_16.39.04](/uploads/7117173c6f519282054bcb1b7ba248f4/Screen_Shot_2015-12-24_at_16.39.04.png)


See merge request !2180
 2015-12-24 15:58:32 +00:00
Stan Hu 5a8c65b508 Add API support for looking up a user by username 
Needed to support Huboard
 2015-12-24 07:57:13 -08:00
Dmitriy Zaporozhets 7caaa10807 Merge pull request #9915 from huacnlee/avoid-ability-methods-allocations 
Avoid allocations in Ability class.
 2015-12-24 16:28:03 +01:00
Dmitriy Zaporozhets 1a23af485c Merge branch 'fix-explore-ui' into 'master' 
Fix explore projects page UI

# Before

![Screenshot_2015-12-24_14.13.03](/uploads/fdae7648acc8b8076709e4bfc867a5f8/Screenshot_2015-12-24_14.13.03.png)


# After

![Screenshot_2015-12-24_14.11.29](/uploads/b1ecd3bebfadab9d2ceabaae27046271/Screenshot_2015-12-24_14.11.29.png)



cc @jschatz1 @skyruler 


Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>


See merge request !2202
 2015-12-24 15:05:28 +00:00