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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix error tracking page, not showing an empty state56851-error-tracking-page-seems-broken	Jose Vargas	2019-02-05	5	-15/+47
\| \| \| \| \| \| \|	This MR adds a missing empty state for when a backend response contains an empty error list, it shows the table but with `no data to display` empty state, also adds a reload button that allows to refresh for data
*	Merge branch 'adriel-use-svg-icon-for-deployment-series' into 'master'	Phil Hughes	2019-02-05	3	-0/+99
\|\ \| \| \| \| \| \| \| \|	Use SVG icon for deployment series See merge request gitlab-org/gitlab-ce!24652
\| *	Use svg icon for deployment series	Adriel Santiago	2019-02-05	3	-0/+99
\| \| \| \| \| \| \| \|	Use the rocket GitLab SVG to show deployment data
* \|	Merge branch 'jej/avoid-csrf-check-on-saml-failure' into 'master'	Rémy Coutable	2019-02-05	3	-1/+29
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Skip CSRF check on SAML failure endpoint Closes #56574 See merge request gitlab-org/gitlab-ce!24509
\| * \|	Avoid CSRF check on SAML failure endpoint	James Edwards-Jones	2019-02-04	3	-1/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SAML and OAuth failures should cause a message to be presented, as well as logging that an attempt was made. These were incorrectly prevented by the CSRF check on POST endpoints such as SAML. In addition we were using a NullSession forgery protection, which made testing more difficult and could have allowed account linking to take place if a CSRF was ever needed but not present.
* \| \|	Merge branch 'ce-reduce-diff-in-groups-update_service' into 'master'	Nick Thomas	2019-02-05	1	-0/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce diff with EE in Groups::UpdateService See merge request gitlab-org/gitlab-ce!24912
\| * \| \|	Reduce diff with EE in Groups::UpdateService	Rémy Coutable	2019-02-04	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'ce-reduce-diff-in-ci-create_pipeline_service' into 'master'	Nick Thomas	2019-02-05	4	-3/+72
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce the diff with EE in Ci::CreatePipelineService See merge request gitlab-org/gitlab-ce!24831
\| * \| \| \|	Reduce the diff with EE in Ci::CreatePipelineService	Rémy Coutable	2019-02-04	4	-3/+72
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'docs-operations-index' into 'master'	Achilleas Pipinellis	2019-02-05	1	-0/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: add index for project operations Closes #56115 See merge request gitlab-org/gitlab-ce!24565
\| * \| \| \| \|	Docs: add index for project operations	Marcia Ramos	2019-02-05	1	-0/+11
\|/ / / / /
* \| \| \| \|	Merge branch 'ce-reduce-diff-in-search-global_service' into 'master'	Douglas Barbosa Alexandre	2019-02-05	1	-4/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce diff with EE in Search::GlobalService See merge request gitlab-org/gitlab-ce!24914
\| * \| \| \| \|	Reduce diff with EE in Search::GlobalService	Rémy Coutable	2019-02-05	1	-4/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'mj/security-mr-template' into 'master'	Yorick Peterse	2019-02-05	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Author is Developer in sec. release MR template See merge request gitlab-org/gitlab-ce!24934
\| * \| \| \| \| \|	Author is Developer in sec. release MR template	Marin Jankovski	2019-02-05	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'diff-file-finder' into 'master'	Filipa Lacerda	2019-02-05	22	-304/+404
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added fuzzy file finder to merge requests Closes #53304 See merge request gitlab-org/gitlab-ce!24434
\| * \| \| \| \| \| \|	Added fuzzy file finder to merge requests	Phil Hughes	2019-02-05	22	-304/+404
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53304
* \| \| \| \| \| \| \|	Merge branch 'jlenny-DocPagesTemplates' into 'master'	Marcia Ramos	2019-02-05	2	-4/+18
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instructions on how to use Pages templates Closes #56991 See merge request gitlab-org/gitlab-ce!24796
\| * \| \| \| \| \| \| \|	Instructions on how to use Pages templates	Jason Lenny	2019-02-05	2	-4/+18
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'bvl-codeowner-rules-model-ce' into 'master'	Sean McGivern	2019-02-05	3	-27/+25
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds helper for `find_or_create_by` in transaction See merge request gitlab-org/gitlab-ce!24913
\| * \| \| \| \| \| \| \|	Adds helper for `find_or_create_by` in transaction	Bob Van Landuyt	2019-02-05	3	-27/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows us to call `find_or_create_by` on all models and scopes.
* \| \| \| \| \| \| \| \|	Merge branch 'speedup-gitlab-assets-compile' into 'master'	Sean McGivern	2019-02-05	9	-16/+72
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache assets in gitlab:assets:compile Closes #56691 See merge request gitlab-org/gitlab-ce!24542
\| * \| \| \| \| \| \| \|	Add cache to the 'compile-assets' and 'gitlab:assets:compile' jobs	Rémy Coutable	2019-02-05	7	-16/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Monkey-patch Sprockets to prevent cache ballooning	Rémy Coutable	2019-02-05	2	-0/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'sh-encode-content-disposition' into 'master'	Sean McGivern	2019-02-05	13	-24/+129
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Encode Content-Disposition filenames Closes #47673 See merge request gitlab-org/gitlab-ce!24919
\| * \| \| \| \| \| \| \| \|	Add Rails 6 deprecation error message	Stan Hu	2019-02-05	1	-0/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Encode Content-Disposition filenames	Stan Hu	2019-02-04	13	-24/+122
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Users downloading non-ASCII attachments would see garbled characters. When used with object storage, AWS S3 would return an InvalidArgument error: Header value cannot be represented using ISO-8859-1. Per RFC 5987 and RFC 6266, Content-Disposition should be encoded properly. This commit takes the Rails 6 implementation of ActiveSuppport::Http::ContentDisposition (https://github.com/rails/rails/pull/33829) and ports it here. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/47673
* \| \| \| \| \| \| \| \| \|	Merge branch 'jprovazn-remove-redcarpet' into 'master'	Grzegorz Bizon	2019-02-05	58	-699/+148
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Redcarpet markdown engine Closes #51374 See merge request gitlab-org/gitlab-ce!24819
\| * \| \| \| \| \| \| \| \|	Remove Redcarpet markdown engine	Jan Provaznik	2019-02-04	58	-699/+148
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This engine was replaced with CommonMarker in 11.4, it was deprecated since then.
* \| \| \| \| \| \| \| \| \|	Merge branch 'not-run-pipeline-on-empty-merge-request' into 'master'	Grzegorz Bizon	2019-02-05	4	-2/+30
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't create new pipeline for merge requests with no commits See merge request gitlab-org/gitlab-ce!24503
\| * \| \| \| \| \| \| \| \|	Fix false-positive spec	Hiroyuki Sato	2019-02-05	1	-18/+18
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Move validation logic to service layer	Hiroyuki Sato	2019-01-28	7	-30/+26
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Make presence_of_commits_in_merge_request private method	Hiroyuki Sato	2019-01-25	1	-6/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Don't create merge request pipeline without commits	Hiroyuki Sato	2019-01-20	6	-6/+38
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix_jira_integration_VCS1019' into 'master'	Sean McGivern	2019-02-05	3	-1/+16
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix comparing equality between `ActionController::Parameters` and a `Hash`.... Closes #57221 See merge request gitlab-org/gitlab-ce!24896
\| * \| \| \| \| \| \| \| \|	Fix comparing equality between `ActionController::Parameters` and a `Hash`....	Daniel Juarez	2019-02-05	3	-1/+16
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'pl-serialize-ac-parameters' into 'master'	Sean McGivern	2019-02-05	3	-6/+79
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make `ActionContorller::Parameters` serializable for sidekiq jobs See merge request gitlab-org/gitlab-ce!24864
\| * \| \| \| \| \| \| \| \|	Make `ActionContorller::Parameters` serializable for sidekiq jobs	Peter Leitzen	2019-02-05	3	-6/+79
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'fe-grammar-util' into 'master'	Phil Hughes	2019-02-05	3	-0/+84
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	FE grammar util See merge request gitlab-org/gitlab-ce!24893
\| * \| \| \| \| \| \| \|	Add grammar util	Paul Slaughter	2019-02-04	3	-0/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This contains the function `toNounSeriesText` which can be used to build i18n noun series fragments (i.e. "A, B, and C").
* \| \| \| \| \| \| \| \|	Merge branch 'search-title' into 'master'	Sean McGivern	2019-02-05	13	-5/+132
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add 'in' filter that modifies scope of 'search' filter to issues and merge requests API See merge request gitlab-org/gitlab-ce!24350
\| * \| \| \| \| \| \| \| \|	Fix grammar and spelling	Hiroyuki Sato	2019-02-05	8	-15/+15
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add 'in' filter that modifies scope of 'search' filter to issues and merge ↵	Hiroyuki Sato	2019-01-14	13	-5/+132
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	requests API
* \| \| \| \| \| \| \| \| \|	Merge branch 'refactor/56370-extract-reply-placeholder-component' into 'master'	Phil Hughes	2019-02-05	6	-25/+79
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract ReplyPlaceholder from NoteableDiscussion component Closes #56370 See merge request gitlab-org/gitlab-ce!24904
\| * \| \| \| \| \| \| \| \| \|	Extract ReplyPlaceholder from NoteableDiscussion component	Winnie Hellmann	2019-02-05	6	-25/+79
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'adriel-add-deployment-data' into 'master'	Phil Hughes	2019-02-05	2	-0/+43
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add deployment data to metrics graphs See merge request gitlab-org/gitlab-ce!24650
\| * \| \| \| \| \| \| \| \| \|	Add deployment data	Adriel Santiago	2019-02-04	2	-0/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds scatter type series to metrics graph for deployments
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'tz-update-register-element-for-emojis' into 'master'	Phil Hughes	2019-02-05	3	-14/+17
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated document-register-element and registering emojis in the new way See merge request gitlab-org/gitlab-ce!24899
\| * \| \| \| \| \| \| \| \| \| \|	Updated document-register-element and registering emojis in the new way	Tim Zallmann	2019-02-05	3	-14/+17
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'update-pages-config-only-when-changed' into 'master'	Grzegorz Bizon	2019-02-05	3	-14/+57
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update pages config only when changed See merge request gitlab-org/gitlab-ce!24424