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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update template name via sentence caseupdate-template-name-via-sentence-case	Andreas Kämmerle	2018-06-01	1	-0/+2
\|
*	Merge branch 'fix-feature-memoization' into 'master'	Stan Hu	2018-06-01	3	-3/+34
\|\ \| \| \| \| \| \| \| \|	Use RequestStore to memoize Flipper features so that memoized values are cleared between requests See merge request gitlab-org/gitlab-ce!19281
\| *	Remove ambiguity in Group class causing build failures	Stan Hu	2018-06-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/71887977 was failing due to confusion between Ci::Group and Group. https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/71887977
\| *	Use RequestStore to memoize Flipper features so that memoized values are ↵	Rémy Coutable	2018-06-01	2	-2/+33
\| \| \| \| \| \| \| \| \| \| \| \|	cleared between requests Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'sh-bump-ruby-2.4' into 'master'	Stan Hu	2018-06-01	15	-18/+27
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade to Ruby 2.4.4 See merge request gitlab-org/gitlab-ce!19055
\| * \|	Upgrade to Ruby 2.4.4sh-bump-ruby-2.4	Stan Hu	2018-05-29	15	-18/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes that make this work: * A change in Ruby (https://github.com/ruby/ruby/commit/ce635262f53b760284d56bb1027baebaaec175d1) requires passing in the exact required length for OpenSSL keys and IVs. * Ensure the secrets.yml is generated before any prepended modules are loaded. This is done by renaming the `secret_token.rb` initializer to `01_secret_token.rb`, which is a bit ugly but involves the least impact on other files.
* \| \|	Merge branch 'revert-c640e579' into 'master'	Clement Ho	2018-06-01	4	-3/+128
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch '46833-sticky-polyfill' into 'master'" See merge request gitlab-org/gitlab-ce!19322
\| * \| \|	Revert "Merge branch '46833-sticky-polyfill' into 'master'"	Clement Ho	2018-06-01	4	-3/+128
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !19304
* \| \| \|	Merge branch '46696-branch-names-in-system-notes-have-incorrect-color' into ↵	Annabel Gray	2018-06-01	2	-4/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Branch names in system notes have incorrect color" Closes #46696 See merge request gitlab-org/gitlab-ce!19296
\| * \| \| \|	Resolve "Branch names in system notes have incorrect color"	Clement Ho	2018-06-01	2	-4/+6
\|/ / / /
* \| \| \|	Merge branch 'sh-bump-omniauth-gitlab' into 'master'	Robert Speicher	2018-06-01	2	-1/+6
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Bump omniauth-gitlab to 1.0.3 See merge request gitlab-org/gitlab-ce!19319
\| * \| \|	Bump omniauth-gitlab to 1.0.3	Stan Hu	2018-06-01	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This version of the gem uses API v4 by default: https://github.com/linchus/omniauth-gitlab/commit/fd13de9f251fdaa72ba0195bda47cd2cb8731084
* \| \| \|	Merge branch 'new-label-spelling-error' into 'master'	Phil Hughes	2018-06-01	3	-2/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds "the" to the new label page to correct the sentence. See merge request gitlab-org/gitlab-ce!19316
\| * \| \| \|	Adds "the" to the new label page to correct the sentence.	Sam Beckham	2018-06-01	3	-2/+7
\|/ / / /
* \| \| \|	Merge branch '46833-sticky-polyfill' into 'master'	Clement Ho	2018-06-01	4	-128/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update position sticky polyfill Closes #46833 See merge request gitlab-org/gitlab-ce!19304
\| * \| \|	Update position sticky polyfill	Paul Slaughter	2018-06-01	4	-128/+3
\|/ / /
* \| \|	Merge branch '47113-modal-header-styling-is-broken' into 'master'	Filipa Lacerda	2018-06-01	18	-27/+42
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Modal header styling is broken" Closes #47113 See merge request gitlab-org/gitlab-ce!19312
\| * \|	Adds the changelog entry for the modal header fix	samdbeckham	2018-06-01	1	-0/+5
\| \| \|
\| * \|	Updated the styling for modal titles	samdbeckham	2018-06-01	7	-8/+7
\| \| \|
\| * \|	Updates a load of modal headers to use better markup	samdbeckham	2018-06-01	16	-21/+32
\| \| \|
* \| \|	Merge branch 'docs-update-fe-dependencies-guide' into 'master'	Tim Zallmann	2018-06-01	1	-1/+18
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update FE guides with dependency/devDependency distinction See merge request gitlab-org/gitlab-ce!19287
\| * \| \|	update the frontend dependency guide with distinction between dependencies ↵	Mike Greiling	2018-05-31	1	-1/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and devDependencies
* \| \| \|	Merge branch 'ce-6145-extract-app-views-shared-issuable' into 'master'	Robert Speicher	2018-06-01	3	-8/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE: Part of "Extract EE specific files/lines for app/views/shared/issuable" See merge request gitlab-org/gitlab-ce!19113
\| * \| \| \|	Unify app/views/shared/issuable/form/_merge_params.html.haml	Lin Jen-Shin	2018-06-01	1	-7/+3
\| \| \| \| \|
\| * \| \| \|	Unify app/views/shared/issuable/_sidebar.html.haml	Lin Jen-Shin	2018-06-01	1	-1/+6
\| \| \| \| \|
\| * \| \| \|	Unify app/views/shared/issuable/_form.html.haml	Lin Jen-Shin	2018-06-01	1	-0/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch '46619-strong-tag-font-weight' into 'master'	Clement Ho	2018-06-01	1	-0/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "The font is too bold in Issue events tab on Activity page" Closes #46619 See merge request gitlab-org/gitlab-ce!19291
\| * \| \| \| \|	Reset b and strong font weight to bold instead of bolder	Annabel Dunstone Gray	2018-05-31	1	-0/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '46478-update-updated-at-on-mr' into 'master'	Douwe Maan	2018-06-01	11	-18/+43
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Update `updated_at` on an issue/mr on every issue/mr changes" Closes #46478 See merge request gitlab-org/gitlab-ce!19065
\| * \| \| \| \| \|	Resolve "Update `updated_at` on an issue/mr on every issue/mr changes"	🙈 jacopo beschi 🙉	2018-06-01	11	-18/+43
\|/ / / / / /
* \| \| \| \| \|	Merge branch '46815-monitoring-active-tab' into 'master'	Clement Ho	2018-06-01	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Admin area > Monitoring > Logs > No default active tab" Closes #46815 See merge request gitlab-org/gitlab-ce!19298
\| * \| \| \| \| \|	Fix active states on monitoring logs tabs	Annabel Dunstone Gray	2018-05-31	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-http-proxy' into 'master'	Kamil Trzciński	2018-06-01	2	-1/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make http_io honor HTTP(S)_PROXY environment. Closes #46968 and #46982 See merge request gitlab-org/gitlab-ce!19282
\| * \| \| \| \| \| \|	Make http_io honor HTTP(S)_PROXY environment.	NLR	2018-06-01	2	-1/+6
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'reactive-caching-alive-bug' into 'master'	Nick Thomas	2018-06-01	3	-0/+8
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ReactiveCaching#clear_reactive_cache! should not keep the cache alive See merge request gitlab-org/gitlab-ce!19311
\| * \| \| \| \| \|	ReactiveCaching#clear_reactive_cache! should clear the not keep the cache alive	Tiago Botelho	2018-06-01	3	-0/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2018-06-01	2	-37/+134
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'46913-appearance-uploader-fields-and-description-html-are-missing-in-cached-version' into 'master' Resolve "Appearance uploader fields and description HTML are missing in cached version" Closes #46913 See merge request gitlab-org/gitlab-ce!19203
\| * \| \| \| \| \|	Use RequestStore in CacheableAttributes.cached for greater performance	Rémy Coutable	2018-06-01	2	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Revert to caching the AR object in CacheableAttributes	Rémy Coutable	2018-06-01	2	-37/+121
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Caching the attributes as JSON and manually instantiating the record ended-up very complex since the edge-cases such as upload fields, serialized fields, and fields with custom accessors had to be handled. To ensure 3 points out of 4 are checked from https://gitlab.com/gitlab-org/gitlab-ce/issues/45175 we now include the Rails version in the cache key. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'ide-list-merge-requests' into 'master'	Filipa Lacerda	2018-06-01	12	-0/+342
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show merge requests in web IDE Closes #45184 See merge request gitlab-org/gitlab-ce!18898
\| * \| \| \| \| \| \|	set is loading in success mutation	Phil Hughes	2018-06-01	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into ide-list-merge-requests	Phil Hughes	2018-06-01	481	-20335/+6104
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| * \| \| \| \| \| \|	removed CHANGELOG as their are no user facing components in this merge requestide-list-merge-requests	Phil Hughes	2018-05-30	1	-5/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	ability to search merge requests	Phil Hughes	2018-05-30	4	-10/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reset merge requests before fetch
\| * \| \| \| \| \| \|	improved stored data	Phil Hughes	2018-05-30	6	-3/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	created reset action to reset stored merge requests
\| * \| \| \| \| \| \|	Merge branch 'master' into ide-list-merge-requests	Phil Hughes	2018-05-30	989	-5362/+8631
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	fixed tests failing caused by rewire	Phil Hughes	2018-05-25	2	-0/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Show merge requests in web IDE	Phil Hughes	2018-05-25	12	-0/+271
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #45184
* \| \| \| \| \| \| \| \|	Merge branch 'backup-delete-all-use-file-join' into 'master'	Sean McGivern	2018-06-01	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use File.join in DeleteAllRepositories test Closes #47108 See merge request gitlab-org/gitlab-ce!19310
\| * \| \| \| \| \| \| \| \|	Use File.join in DeleteAllRepositories test	Jacob Vosmaer	2018-06-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \|