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

	Commit message (Collapse)	Author	Age	Files	Lines
*	elastic: almost all integrated exept view logicelasticsearch	Valery Sizov	2016-01-07	13	-85/+58
\|
*	elastic search init commit	Valery Sizov	2016-01-05	16	-35/+1075
\|
*	Merge branch 'improve_weight_icon' into 'master'	Dmitriy Zaporozhets	2016-01-05	4	-3/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve weight icon The scale as an icon for issue weight seems a little easier to recognize. I also removed the icon from the issuable form because none of the other fields have icons. We have similar icons for assignee and milestone, but they are not present here. If we want the weight icon, I propose we add the respective icons for each field. Screenshots: ### Issue list ![Screen_Shot_2015-12-21_at_3.10.56_PM](/uploads/1578b649a7481fcc99e098ccde59d846/Screen_Shot_2015-12-21_at_3.10.56_PM.png) ![Screen_Shot_2015-12-21_at_3.08.37_PM](/uploads/f58e87c615ff68d97b509f0974833619/Screen_Shot_2015-12-21_at_3.08.37_PM.png) ### Form ![Screen_Shot_2015-12-21_at_3.12.15_PM](/uploads/54338e7c65cc9ee2645f4c7a27a0be7b/Screen_Shot_2015-12-21_at_3.12.15_PM.png) ![Screen_Shot_2015-12-21_at_3.07.19_PM](/uploads/61761287d261dfa1b37d4a1f98a9a442/Screen_Shot_2015-12-21_at_3.07.19_PM.png) ### Sidebar ![Screen_Shot_2015-12-21_at_3.13.01_PM](/uploads/2e69888e7438946df45eb988e16c65f0/Screen_Shot_2015-12-21_at_3.13.01_PM.png) ![Screen_Shot_2015-12-21_at_3.13.15_PM](/uploads/78ffcbf426f71cddbff731dd04a48687/Screen_Shot_2015-12-21_at_3.13.15_PM.png) See merge request !88
\| *	Improve weight icon	Drew Blessing	2015-12-22	5	-4/+3
\| \|
* \|	Merge branch 'approvers_data_consistency' into ee_master	Valery Sizov	2016-01-04	2	-4/+6
\|\ \
\| * \|	User is not automatically removed from suggested approvers list if user is ↵	Valery Sizov	2015-12-30	2	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \|	deleted.
* \| \|	Merge branch 'approvals_reset_for_fork' into 'master'	Dmitriy Zaporozhets	2016-01-04	3	-10/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Approvals are not reset after a new push is made if the request is coming from a fork https://gitlab.com/gitlab-org/gitlab-ee/issues/83 See merge request !105
\| * \| \|	Approvals are not reset after a new push is made if the request is coming ↵	Valery Sizov	2015-12-30	3	-10/+8
\| \|/ / \| \| \| \| \| \| \| \| \|	from a fork
* \| \|	Merge branch 'jenkins-integration-fix' into 'master'	Marin Jankovski	2016-01-04	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added class to self when calling a post method. This is a very small change to fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/160 by prepending `class`to the `post` method. See merge request !106
\| * \|	Added class to self when calling a post method.	Jose Torres	2015-12-31	1	-1/+1
\|/ /
* \|	Merge branch 'ce_upstream' into 'master'	Valery Sizov	2015-12-30	176	-778/+17601
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE upstream Unmerged paths: (use "git add <file>..." to mark resolution) both modified: app/assets/stylesheets/pages/projects.scss both modified: app/views/shared/_clone_panel.html.haml @jschatz1 Please resolve these conflicts. See merge request !99
\| * \|	fixes tests so KRB5 button is clickable	Jacob Schatz	2015-12-29	1	-1/+2
\| \| \|
\| * \|	fix spinach	Valery Sizov	2015-12-29	2	-2/+2
\| \| \|
\| * \|	fix syntax error	Valery Sizov	2015-12-29	1	-3/+3
\| \| \|
\| * \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream	Valery Sizov	2015-12-29	8	-285/+292
\| \|\ \
\| * \| \|	fixes conflicts with frontend code	Jacob Schatz	2015-12-28	2	-82/+65
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'origin/master' into ce_upstream	Valery Sizov	2015-12-25	175	-1034/+17873
\| \|\ \ \
\| \| * \ \	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
\| \| \| \| \| \| \| \| \| \|