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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Initial setup GraphQL using graphql-ruby 1.8bvl-graphql-start-34754	Bob Van Landuyt	2018-06-05	46	-391/+587
\| \| \| \| \| \| \| \| \|	- All definitions have been replaced by classes: http://graphql-ruby.org/schema/class_based_api.html - Authorization & Presentation have been refactored to work in the class based system - Loaders have been replaced by resolvers - Times are now coersed as ISO 8601
*	Handle exceptions outside the GraphQL schema	Bob Van Landuyt	2018-06-05	4	-23/+72
\| \| \| \| \|	This allows us to report JSON parse exceptions to clients and ignore them in sentry.
*	Add `present_using` to types	Bob Van Landuyt	2018-06-05	14	-33/+292
\| \| \| \| \| \| \| \|	By specifying a presenter for the object type, we can keep the logic out of `GitlabSchema`. The presenter gets initialized using the object being presented, and the context (including the `current_user`).
*	Convert from GraphQL::Batch to BatchLoader	Nick Thomas	2018-06-05	12	-86/+42
\|
*	Add a minimal GraphQL API	Nick Thomas	2018-06-05	26	-5/+700
\|
*	Merge branch 'update_vendored_ADO_template' into 'master'	Kamil Trzciński	2018-06-05	1	-10/+55
\|\ \| \| \| \| \| \| \| \|	Updated vendored ADO template See merge request gitlab-org/gitlab-ce!19380
\| *	Updated vendored ADO templateupdate_vendored_ADO_template	Olivier Gonzalez	2018-06-04	1	-10/+55
\| \|
* \|	Merge branch 'osw-ignore-diff-header-when-persisting-diff-hunk' into 'master'	Sean McGivern	2018-06-05	4	-53/+78
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Adjust insufficient diff hunks being persisted on NoteDiffFile See merge request gitlab-org/gitlab-ce!19399
\| * \|	Adjust insufficient diff hunks being persisted on NoteDiffFileosw-ignore-diff-header-when-persisting-diff-hunk	Oswaldo Ferreira	2018-06-05	4	-53/+78
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This currently causes 500's errors when loading the MR page (Discussion) in a few scenarios. We were not considering detailed diff headers such as "--- a/doc/update/mysql_to_postgresql.md\n+++ b/doc/update/mysql_to_postgresql.md" to crop the diff. In order to address it, we're now using Gitlab::Diff::Parser, clean the diffs and builds Gitlab::Diff::Line objects we can iterate and filter on.
* \| \|	Merge branch '36862-subgroup-milestones' into 'master'	Sean McGivern	2018-06-05	5	-14/+52
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include all ancestors milestones in json list & autocomplete Closes #36862 See merge request gitlab-org/gitlab-ce!19317
\| * \| \|	Include all ancestors milestones in json list & autocomplete36862-subgroup-milestones	Jarka Kadlecová	2018-06-04	5	-14/+52
\| \| \| \|
* \| \| \|	Merge branch '47266-visiblity-import-sources-checkbox-styling' into 'master'	Sean McGivern	2018-06-05	2	-4/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Admin area > Import sources and restricted visibility level checkboxes styling" Closes #47266 See merge request gitlab-org/gitlab-ce!19397
\| * \| \| \|	Add form-check-input class to checkbox input for visibility levels and ↵47266-visiblity-import-sources-checkbox-styling	tauriedavis	2018-06-04	2	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	import sources in admin area
* \| \| \| \|	Merge branch 'bvl-hide-archived-shared-projects' into 'master'	Sean McGivern	2018-06-05	2	-2/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide archived projects from `shared_projects` Closes #47206 See merge request gitlab-org/gitlab-ce!19361
\| * \| \| \| \|	Hide archived projects from `shared_projects`bvl-hide-archived-shared-projects	Bob Van Landuyt	2018-06-04	2	-2/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we don't show the archived projects, we shouldnot load them and pass them to the fronted to be filtered out again.
* \| \| \| \| \|	Merge branch 'dm-gitlab-shell-7-1-4' into 'master'	Sean McGivern	2018-06-05	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gitlab-shell 7.1.4 See merge request gitlab-org/gitlab-ce!19360
\| * \ \ \ \ \	Merge branch 'master' into 'dm-gitlab-shell-7-1-4'dm-gitlab-shell-7-1-4	Sean McGivern	2018-06-04	11	-36/+57
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # GITLAB_SHELL_VERSION
\| * \| \| \| \| \| \|	Use gitlab-shell 7.1.4	Douwe Maan	2018-06-04	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '47147-project-visibility-alignment' into 'master'	Clement Ho	2018-06-05	2	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "New project visibility level description alignment" Closes #47147 and #46885 See merge request gitlab-org/gitlab-ce!19389
\| * \| \| \| \| \| \| \|	Resolve "New project visibility level description alignment"	Taurie Davis	2018-06-05	2	-3/+3
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '47115-fix-markdown-blockquote' into 'master'	Clement Ho	2018-06-05	2	-11/+13
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Markdown blockquote is not displaying properly" Closes #47115 See merge request gitlab-org/gitlab-ce!19395
\| * \| \| \| \| \| \| \|	Resolve "Markdown blockquote is not displaying properly"	Paul Slaughter	2018-06-05	2	-11/+13
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '6287-epics-page-styling-is-broken' into 'master'	Clement Ho	2018-06-05	2	-3/+8
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport of Resolve "Epics Page Styling is broken" See merge request gitlab-org/gitlab-ce!19407
\| * \| \| \| \| \| \| \|	Backport of Resolve "Epics Page Styling is broken"	Clement Ho	2018-06-04	2	-3/+8
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '47273-bs4-header-sub-nav-dropdown-active-states' into 'master'	Clement Ho	2018-06-05	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Header sub-nav dropdown triggers missing active state on dropdown open" Closes #47273 See merge request gitlab-org/gitlab-ce!19402
\| * \| \| \| \| \| \| \| \|	update dropdown active states for bootstrap 447273-bs4-header-sub-nav-dropdown-active-states	Dennis Tang	2018-06-04	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '47158-bs4-nav-projects-dropdown-overflow' into 'master'	Annabel Gray	2018-06-05	2	-6/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Projects \/ menu displays scrolls bar for short period of time" Closes #47158 See merge request gitlab-org/gitlab-ce!19404
\| * \| \| \| \| \| \| \| \| \|	fix nav projects dropdown menu overflow due to bootstrap 4 upgrade	Dennis Tang	2018-06-04	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'bootstrap-markdown-code-highlight' into 'master'	Annabel Gray	2018-06-05	1	-0/+10
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix markdown code highlighting Closes #47131 See merge request gitlab-org/gitlab-ce!19325
\| * \| \| \| \| \| \| \| \| \| \|	Fix markdown code highlighting	Clement Ho	2018-06-05	1	-0/+10
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'jivl-fix-labels-not-displayed-after-selection' into 'master'	Clement Ho	2018-06-05	2	-1/+5
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve: Labels are not displayed after selection Closes #47250 See merge request gitlab-org/gitlab-ce!19394
\| * \| \| \| \| \| \| \| \| \|	fix labels showing up with no titlejivl-fix-labels-not-displayed-after-selection	Jose	2018-06-04	2	-1/+5
\| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '47236-github-import-btn' into 'master'	Clement Ho	2018-06-05	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Import from github button has no left-margin" Closes #47267 See merge request gitlab-org/gitlab-ce!19396
\| * \| \| \| \| \| \| \| \|	Fix spacing between github import button and text field47236-github-import-btn	Annabel Dunstone Gray	2018-06-04	1	-1/+1
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'rails5-fix-application-setting-spec' into 'master'	Nick Thomas	2018-06-04	1	-2/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Write repository_storages without type casting Closes #46238 See merge request gitlab-org/gitlab-ce!19367
\| * \| \| \| \| \| \| \|	Fix repository_storage spec for Rails5rails5-fix-application-setting-spec	Jarka Kadlecová	2018-06-04	1	-2/+1
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-responsive-mr-form' into 'master'	Annabel Gray	2018-06-04	1	-4/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix responsive layout for new MR metadata form See merge request gitlab-org/gitlab-ce!19390
\| * \| \| \| \| \| \| \|	Fix responsive layout for new MR metadata form	Clement Ho	2018-06-04	1	-4/+4
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '47162-styling-of-acceptance-terms-page-is-broken' into 'master'	Clement Ho	2018-06-04	3	-8/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Styling of acceptance terms page is broken" Closes #47162 See merge request gitlab-org/gitlab-ce!19371
\| * \| \| \| \| \| \| \|	Fixes the Terms Page47162-styling-of-acceptance-terms-page-is-broken	Tim Zallmann	2018-06-04	3	-8/+10
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '46754-error-message' into 'master'	Annabel Gray	2018-06-04	2	-1/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Error message after installing ingress does not ocupy full width" Closes #46754 See merge request gitlab-org/gitlab-ce!19376
\| * \| \| \| \| \| \| \|	Make error in clusters occupy full width46754-error-message	Filipa Lacerda	2018-06-04	2	-1/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'jivl-fix-labels-page' into 'master'	Annabel Gray	2018-06-04	2	-1/+9
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix labels page missing margins and oversized fonts Closes #46706 See merge request gitlab-org/gitlab-ce!19383
\| * \| \| \| \| \| \| \| \|	Fix labels page missing margins and oversized fontsjivl-fix-labels-page	Jose	2018-06-04	2	-1/+9
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'jivl-fix-gitea-import' into 'master'	Annabel Gray	2018-06-04	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix gitea import page Closes #46996 See merge request gitlab-org/gitlab-ce!19382
\| * \| \| \| \| \| \| \| \| \|	Fix gitea import pagejivl-fix-gitea-import	Jose	2018-06-04	1	-2/+2
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'winh-navigation-theme-heading' into 'master'	Annabel Gray	2018-06-04	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix navigation theme preference heading See merge request gitlab-org/gitlab-ce!19385
\| * \| \| \| \| \| \| \| \|	Fix navigation theme preference headingwinh-navigation-theme-heading	Winnie Hellmann	2018-06-04	1	-1/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'update-doorkeeper' into 'master'	Rémy Coutable	2018-06-04	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Doorkeeper OpenID for Kubernetes support Closes #44485 See merge request gitlab-org/gitlab-ce!19293
\| * \| \| \| \| \| \| \|	Update Doorkeeper OpenID for Kubernetes support	Maxime Guyot	2018-05-31	1	-1/+1
\| \| \| \| \| \| \| \| \|