delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	note votes methids implementationupvote_count_to_api	Valery Sizov	2015-12-29	1	-2/+2
\|
*	Revert upvotes and downvotes params to MR API	Valery Sizov	2015-12-28	6	-21/+22
\|
*	Merge branch 'revert_votes_back' into 'master'	Dmitriy Zaporozhets	2015-12-25	8	-16/+51
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	satisfy rubocoprevert_votes_back	Valery Sizov	2015-12-25	1	-1/+1
\| \|
\| *	fix spinach	Valery Sizov	2015-12-25	1	-3/+5
\| \|
\| *	add sorting of awards	Valery Sizov	2015-12-25	4	-2/+21
\| \|
\| *	revert back vote buttons to issue and MR pages	Valery Sizov	2015-12-25	4	-11/+25
\| \|
* \|	Merge branch 'rs-opengraph' into 'master'	Douwe Maan	2015-12-25	11	-8/+262
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Open Graph meta tags See merge request !2192
\| * \|	Add link to twitter docs	Douwe Maan	2015-12-25	1	-1/+2
\| \| \|
\| * \|	Add more twitter metatags.	Douwe Maan	2015-12-25	1	-0/+6
\| \| \|
\| * \|	Add og:site_name	Douwe Maan	2015-12-25	1	-2/+2
\| \| \|
\| * \|	Satisfy Rubocop	Douwe Maan	2015-12-25	1	-2/+2
\| \| \|
\| * \|	Add support for `twitter:label` meta tagsrs-opengraph	Robert Speicher	2015-12-24	7	-4/+86
\| \| \|
\| * \|	Use `request.fullpath` for `og:url` tag	Robert Speicher	2015-12-24	1	-1/+1
\| \| \|
\| * \|	Truncate page_description to 30 words	Robert Speicher	2015-12-24	2	-2/+15
\| \| \|
\| * \|	Account for `@project.description` being nil	Robert Speicher	2015-12-23	2	-1/+9
\| \| \|
\| * \|	Add page descriptions and images	Robert Speicher	2015-12-23	7	-9/+149
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A limited number of pages have defined their own descriptions, but otherwise we default to the Project's description (if `@project` is set), or the old `brand_title` fallback. The image will either be the uploaded project icon (never a generated one), the user's uploaded icon or Gravatar, or, finally, the GitLab logo.
\| * \|	Add gitlab_logo.png, remove brand_logo.png	Robert Speicher	2015-12-23	2	-0/+0
\| \| \|
\| * \|	Add Open Graph meta tags	Robert Speicher	2015-12-23	1	-1/+5
\| \| \|
* \| \|	Merge branch 'adding_crime_security' into 'master'	Achilleas Pipinellis	2015-12-25	2	-0/+64
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	Clean up CRIME security doc [ci skip]	Achilleas Pipinellis	2015-12-25	1	-37/+41
\| \| \|
\| * \|	Merge branch 'master' into adding_crime_security	Achilleas Pipinellis	2015-12-25	228	-868/+18553
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge branch 'ci_triggers_docs' into 'master'	Achilleas Pipinellis	2015-12-25	7	-20/+197
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \|	Add examples for triggers [ci skip]	Achilleas Pipinellis	2015-12-25	1	-5/+76
\| \| \| \|
\| * \| \|	Merge branch 'master' into ci_triggers_docsci_triggers_docs	Achilleas Pipinellis	2015-12-25	208	-820/+18111
\| \|\ \ \
\| * \| \| \|	Add images and examples	Achilleas Pipinellis	2015-12-25	5	-2/+95
\| \| \| \| \|
\| * \| \| \|	Remove triggers from yaml doc [ci skip]	Achilleas Pipinellis	2015-12-24	1	-27/+0
\| \| \| \| \|
\| * \| \| \|	Add triggers doc in top level readme [ci skip]	Achilleas Pipinellis	2015-12-24	1	-5/+6
\| \| \| \| \|
\| * \| \| \|	Document triggers in yaml/README.md [ci skip]	Achilleas Pipinellis	2015-12-21	1	-0/+27
\| \| \| \| \|
\| * \| \| \|	Init documentation on Triggers [ci skip]	Achilleas Pipinellis	2015-12-21	2	-19/+31
\| \| \| \| \|
* \| \| \| \|	Merge branch 'support-api-lookup-by-username' into 'master'	Dmitriy Zaporozhets	2015-12-25	4	-5/+29
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add API support for looking up a user by username Needed to support Huboard See merge request !2089
\| * \| \| \| \|	Add API support for looking up a user by username	Stan Hu	2015-12-24	4	-5/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Needed to support Huboard
* \| \| \| \| \|	Merge branch 'feature/force-tfa' into 'master'	Dmitriy Zaporozhets	2015-12-25	16	-27/+220
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Require two factor authentication Allow Admins to force 2FA on their users, as discussed here: gitlab-org/gitlab-ce#3783 See merge request !2155
\| * \| \| \| \|	Fixed codestyle and added 2FA documentationfeature/force-tfa	Gabriel Mazetto	2015-12-24	4	-3/+44
\| \| \| \| \| \|
\| * \| \| \| \|	Updated CHANGELOG	Gabriel Mazetto	2015-12-24	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Add to application_settings forced TFA options	Gabriel Mazetto	2015-12-24	2	-0/+14
\| \| \| \| \| \|
\| * \| \| \| \|	specs for forced two-factor authentication and grace period	Gabriel Mazetto	2015-12-24	3	-8/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	simplified code and fixed stuffs
\| * \| \| \| \|	Grace period support for TFA	Gabriel Mazetto	2015-12-24	7	-3/+53
\| \| \| \| \| \|
\| * \| \| \| \|	WIP require two factor authentication	Gabriel Mazetto	2015-12-24	6	-26/+58
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'ref-filter-html' into 'master'	Robert Speicher	2015-12-24	5	-17/+20
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Escape all the things. See merge request !2209
\| * \| \| \| \|	Escape all the things.	Douwe Maan	2015-12-24	5	-17/+20
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-add-key-submit' into 'master'	Douwe Maan	2015-12-24	2	-1/+4
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable "Add key" button when user fills in a proper key Closes #4295 See merge request !2208
\| * \| \| \| \|	Enable "Add key" button when user fills in a proper key	Stan Hu	2015-12-24	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #4295
* \| \| \| \| \|	Update CHANGELOG	Robert Speicher	2015-12-24	1	-1/+3
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Robert Speicher	2015-12-24	1	-8/+8
\|\ \ \ \ \
\| * \ \ \ \	Merge pull request #9915 from huacnlee/avoid-ability-methods-allocations	Dmitriy Zaporozhets	2015-12-24	1	-8/+8
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|	Avoid allocations in Ability class.
\| \| * \| \| \|	Avoid allocations in Ability class.	Jason Lee	2015-12-16	1	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It won't change anything after they are first invoke, so add method cache to avoid allocations and avoid GC. Benchmarks: ``` Calculating ------------------------------------- project_guest_rules without method cache 79.352k i/100ms project_guest_rules with method cache 93.634k i/100ms ------------------------------------------------- project_guest_rules without method cache 2.865M (±32.5%) i/s - 11.982M project_guest_rules with method cache 4.419M (± 7.4%) i/s - 22.004M Comparison: project_guest_rules with method cache: 4418908.0 i/s project_guest_rules without method cache: 2864514.0 i/s - 1.54x slower Calculating ------------------------------------- project_report_rules without method cache 53.126k i/100ms project_report_rules with method cache 97.473k i/100ms ------------------------------------------------- project_report_rules without method cache 1.093M (±36.5%) i/s - 4.675M project_report_rules with method cache 4.420M (± 7.2%) i/s - 22.029M Comparison: project_report_rules with method cache: 4420054.3 i/s project_report_rules without method cache: 1092509.6 i/s - 4.05x slower ``` https://gist.github.com/huacnlee/b04788ae6df42fe769e4
* \| \| \| \| \|	Merge branch 'fix-changelog' into 'master'	Robert Speicher	2015-12-24	1	-5/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move changelog items to their correct place. Fixes #4236 See merge request !2201
\| * \| \| \| \| \|	Move changelog items to their correct place.	Douwe Maan	2015-12-24	1	-3/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'ldap-special-chars-fix' into 'master'	Douwe Maan	2015-12-24	4	-4/+20
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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