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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix other tests which tested against error message30634-protected-pipeline	Lin Jen-Shin	2017-06-07	2	-2/+4
\|
*	Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline	Lin Jen-Shin	2017-06-07	80	-1056/+1666
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: Fix missing tooltip and ARIA labels for accessibility Add info on using self-signed certs with Registry Introduce optimistic locking support via optional parameter last_commit_id on File Update API Move issuable bulk edit form into a new sidebar. Add PowerShell to CI variable docs Responsive environment tables Accept a username for User-level Events API Introduce an Events API Update GitLab Pages to v0.4.3 Allow numeric pages domain Remove references to old settings location Resolve "API: Environment info missed" Fix Projects API spec Update explanation of job-level variable override to fit example Per discussion Make sketch dynamic and link back to production architecture
\| *	Merge branch '31656-fix-hyperlink-a11y' into 'master'	Phil Hughes	2017-06-06	6	-7/+7
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix missing tooltip and ARIA labels for accessibility Closes #31656 See merge request !11907
\| \| *	Fix missing tooltip and ARIA labels for accessibility	Kushal Pandya	2017-06-06	6	-7/+7
\| \|/
\| *	Merge branch '28340-mass-edit-issues-and-mrs-from-sidebar' into 'master'	Phil Hughes	2017-06-06	24	-394/+553
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move issuable bulk edit form into a sidebar Closes #28340 See merge request !11351
\| \| *	Move issuable bulk edit form into a new sidebar.28340-mass-edit-issues-and-mrs-from-sidebar	Bryce Johnson	2017-06-06	24	-394/+553
\| \| \|
\| * \|	Merge branch 'pages-v0.4.3' into 'master'	Grzegorz Bizon	2017-06-06	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update GitLab Pages to v0.4.3 See merge request !11930
\| \| * \|	Update GitLab Pages to v0.4.3	Nick Thomas	2017-06-06	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'docs/registry-self-sign' into 'master'	Sean Packham	2017-06-06	1	-10/+20
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add info on using self-signed certs with Registry Closes #18239 See merge request !11938
\| \| * \| \|	Add info on using self-signed certs with Registry	Achilleas Pipinellis	2017-06-06	1	-10/+20
\| \| \| \| \|
\| * \| \| \|	Merge branch 'docs/powershell-ci-vars' into 'master'	Sean Packham	2017-06-06	2	-4/+49
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Add PowerShell to CI variable docs See merge request !11935
\| \| * \| \|	Add PowerShell to CI variable docsdocs/powershell-ci-vars	John Spaetzel	2017-06-06	2	-4/+49
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge branch '32642_last_commit_id_in_file_api' into 'master'	Grzegorz Bizon	2017-06-06	4	-2/+33
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduce optimistic locking support via optional parameter last_commit_id on File Update API See merge request !11694
\| \| * \| \|	Introduce optimistic locking support via optional parameter last_commit_id ↵	Roman Safronov	2017-06-06	4	-2/+33
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	on File Update API
\| * \| \|	Merge branch '29271-fix-pages-numeric-domain' into 'master'	Grzegorz Bizon	2017-06-06	3	-33/+26
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow numeric pages domain Closes #29271 See merge request !11927
\| \| * \| \|	Allow numeric pages domain	Drew Blessing	2017-06-06	3	-33/+26
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, `PagesDomain` would not allow a domain such as 123.example.com. With this change, this is now allowed, because it is a perfectly valid domain.
\| * \| \|	Merge branch 'fix_explanation_of_job_level_variable_override' into 'master'	Grzegorz Bizon	2017-06-06	2	-2/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update explanation of job-level variable override to fit example See merge request !11923
\| \| * \| \|	Update explanation of job-level variable override to fit example	Tor Bechmann Yamamoto-Sørensen	2017-06-06	2	-2/+2
\| \| \| \| \|
\| * \| \| \|	Merge branch '14707-allow-activity-feed-to-be-accessible-through-api' into ↵	Rémy Coutable	2017-06-06	15	-443/+721
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Introduce an Events API Closes #14707 See merge request !11755
\| \| * \| \|	Accept a username for User-level Events API	Mark Fletcher	2017-06-06	3	-3/+12
\| \| \| \| \|
\| \| * \| \|	Introduce an Events API	Mark Fletcher	2017-06-06	15	-443/+712
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Meld the following disparate endpoints: * `/projects/:id/events` * `/events` * `/users/:id/events` + Add result filtering to the above endpoints: * action * target_type * before and after dates
\| * \| \|	Merge branch '23643-responsive-environment-tables' into 'master'	Phil Hughes	2017-06-06	15	-123/+232
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Responsive environment tables See merge request !11836
\| \| * \|	Responsive environment tables	Annabel Dunstone Gray	2017-06-06	15	-123/+232
\| \|/ /
\| * \|	Merge branch '33340-fix-broken-master' into 'master'	Sean McGivern	2017-06-06	1	-2/+2
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Projects API spec Closes #33340 See merge request !11928
\| \| * \|	Fix Projects API spec33340-fix-broken-master	Rémy Coutable	2017-06-06	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	Merge branch 'evn-crosslink-to-architecture' into 'master'	Achilleas Pipinellis	2017-06-06	1	-3/+5
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sketch dynamic and link back to production architecture See merge request !11617
\| \| * \| \|	Per discussionevn-crosslink-to-architecture	Ernst van Nierop	2017-05-22	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Make sketch dynamic and link back to production architecture	ernstvn	2017-05-22	1	-3/+5
\| \| \| \| \|
\| * \| \| \|	Merge branch 'docs/remove-ref-to-wheel-settings' into 'master'	Sean Packham	2017-06-06	7	-32/+14
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove references to old settings location Closes #33041 See merge request !11932
\| \| * \| \| \|	Remove references to old settings location	Achilleas Pipinellis	2017-06-06	7	-32/+14
\| \|/ / / /
\| * \| \| \|	Merge branch '30156-api-environment-info-missed' into 'master'	Achilleas Pipinellis	2017-06-06	2	-0/+1
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "API: Environment info missed" Closes #30156 See merge request !11900
\| \| * \| \|	Resolve "API: Environment info missed"	Sébastien	2017-06-06	2	-0/+1
\| \|/ / /
* \| \| \|	Still allow legacy triggers, feedback:	Lin Jen-Shin	2017-06-06	2	-8/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11910#note_31632911
* \| \| \|	Try to report why it's failing and fix tests	Lin Jen-Shin	2017-06-06	8	-20/+35
\| \| \| \|
* \| \| \|	Disallow legacy trigger without a owner	Lin Jen-Shin	2017-06-06	2	-3/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11910#note_31594492 https://gitlab.com/gitlab-org/gitlab-ce/issues/30634#note_31601001
* \| \| \|	Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline	Lin Jen-Shin	2017-06-06	110	-723/+2323
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (56 commits) Resolve "When changing project visibility setting, change other dropdowns automatically" change headings to improve SEO backports changed import logic from pull mirroring feature into CE Fix header component spec Add a Rake task to aid in rotating otp_key_base Remove unnecessary variable Add changelog entry Allow users to be hard-deleted from the admin user show page Allow users to be hard-removed from the admin users list page Support hard deletion in Admin::UsersController#destroy Add changelog entry Extract and memoize `user_access` Remove GitAccessStatus (no longer needed) Refactor construction of response Refactor to remove a special case Fix would-be regression Clarify error messages Refactor to let GitAccess errors bubble up Refactor to let `GitAccess` check protocol config Specify new Git-LFS-over-HTTP behavior ...
\| * \| \|	Merge branch '32236-fix-typo-in-helm-chart-installation-doc' into 'master'	Achilleas Pipinellis	2017-06-06	1	-2/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in helm chart installation doc (#32236) Closes #32236 See merge request !11891
\| \| * \| \|	Fix typo on namespace	Sébastien	2017-06-03	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Merge branch 'dz-backport-codeclimate-docs' into 'master'	Achilleas Pipinellis	2017-06-06	1	-3/+9
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport CI codeclimate example doc change from EE See merge request !11903
\| \| * \| \| \|	Fix link to ee code quality docdz-backport-codeclimate-docs	Dmitriy Zaporozhets	2017-06-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \|	Backport CI codeclimate example doc change from EE	Dmitriy Zaporozhets	2017-06-05	1	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Merge branch 'add-note-on-body-size' into 'master'	Achilleas Pipinellis	2017-06-06	1	-1/+3
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add note on customizing body size to support Registry See merge request !11904
\| \| * \| \| \| \|	Update gitlab_chart.mdadd-note-on-body-size	Joshua Lambert	2017-06-05	1	-1/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'patch-23' into 'master'	Achilleas Pipinellis	2017-06-06	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Corrected spelling mistake in permissions.md "it total" -> "in total". See merge request !11908
\| \| * \| \| \| \| \|	Corrected spelling mistake in permissions.md "it total" -> "in total".	Andrew Featherstone	2017-06-05	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'docs/fix-headings-for-seo' into 'master'	Achilleas Pipinellis	2017-06-06	1	-4/+4
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issues documentation: improve SEO See merge request !11919
\| \| * \| \| \| \| \| \|	change headings to improve SEOdocs/fix-headings-for-seo	Marcia Ramos	2017-06-06	1	-4/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch ↵	Phil Hughes	2017-06-06	10	-17/+95
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'24032-when-changing-project-visibility-setting-change-other-dropdowns-automatically' into 'master' Resolve "When changing project visibility setting, change other dropdowns automatically" Closes #24032 See merge request !11831
\| \| * \| \| \| \| \| \| \|	Resolve "When changing project visibility setting, change other dropdowns ↵	Mike Greiling	2017-06-06	10	-17/+95
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	automatically"
\| * \| \| \| \| \| \| \|	Merge branch 'issue-23254' into 'master'	Rémy Coutable	2017-06-06	3	-8/+10
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup style of confirmation page See merge request !11774