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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'tc-remove-20181218192239-migration' into 'master'	Stan Hu	2019-01-10	1	-1/+1
\| \| \| \| \| \| \| \| \|	Remove backfill migration for legacy projects See merge request gitlab-org/gitlab-ce!24299 (cherry picked from commit 626bd9d4cca652f2f21d2aba8d76e1959ffacda0) b87dcc23 Remove backfill migration for legacy projects
*	Merge branch 'ce-9090-follow_up_on_store_container_scanning_results_in_db' ↵	Kamil Trzciński	2019-01-10	2	-107/+105
\| \| \| \| \| \| \| \| \| \| \|	into 'master' Backport container scanning fixtures See merge request gitlab-org/gitlab-ce!24292 (cherry picked from commit 33d69aaeeebb7126373b107afc42a3d2bfc5ae5a) 9f6f42db Backport container scanning fixtures
*	Merge branch 'sh-fix-request-profiles-html' into 'master'	Sean McGivern	2019-01-10	1	-0/+47
\| \| \| \| \| \| \| \| \| \| \|	Fix requests profiler in admin page not rendering HTML properly Closes #56152 See merge request gitlab-org/gitlab-ce!24291 (cherry picked from commit 59c0c173b471d50007442c95464df0cac0030fc6) 4ac4ba26 Fix requests profiler in admin page not rendering HTML properly
*	Merge branch 'sh-fix-real-size-warnings' into 'master'	Robert Speicher	2019-01-10	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \|	Fix broken templated "Too many changes to show" text Closes #56138 See merge request gitlab-org/gitlab-ce!24282 (cherry picked from commit 819de8e8084e1b0cc102664abb8bbc836ff99ede) 488d7d1f Fix broken templated "Too many changes to show" text
*	Merge branch '55945-suggested-change-highlight' into 'master'	Phil Hughes	2019-01-10	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|	Add syntax highlighting to suggestion diff Closes #55945 See merge request gitlab-org/gitlab-ce!24156 (cherry picked from commit da3b20f7a4cbcbf1698b995f6dc69fa388bc5b2f) 2635f2c6 Add syntax highlighting to suggestion diff e3919efd Add unit test for syntax highlighting 95f2d284 Add changelog entry
*	Merge branch 'sh-revert-mr-23135' into 'master'	Robert Speicher	2019-01-09	2	-29/+11
\| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch '3062-improve-project-cache' into 'master'" Closes #56103 See merge request gitlab-org/gitlab-ce!24244 (cherry picked from commit a0aca3ac3a4ef56429104c27cd03ce00dcaeafce) e884795e Revert "Merge branch '3062-improve-project-cache' into 'master'"
*	Merge branch ↵	Robert Speicher	2019-01-09	1	-5/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	'56093-11-7-rc2-prevents-people-from-merging-merge-requests-even-when-they-should-be-able-to' into 'master' Fix MR sidebar to correctly warning if assignee can't merge Closes #56093 See merge request gitlab-org/gitlab-ce!24243 (cherry picked from commit 71026ffd7e71da726a9b740d42093926f8477c3e) 76895008 Fix MR sidebar to correctly warning if assignee can't merge 469678b0 Remove CHANGELOG entry
*	Merge branch ↵	Robert Speicher	2019-01-09	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|	'50224-rails5-duplicate-key-value-violates-unique-constraint-index_gpg_signatures_on_commit_sha' into 'master' Resolve "[Rails5] duplicate key value violates unique constraint "index_gpg_signatures_on_commit_sha"" Closes #50224 See merge request gitlab-org/gitlab-ce!24226 (cherry picked from commit abe4e325a20435b6cb1ce6d6ba1a8dcd0a82ea14) df5b7a66 Wait for requests in LFS files spec
*	Merge branch 'ce-5606-issues-and-mr-autocomplete-in-epics' into 'master'	Robert Speicher	2019-01-08	1	-0/+36
\|\ \| \| \| \| \| \| \| \|	CE backport of gitlab-ee!8936 See merge request gitlab-org/gitlab-ce!23976
\| *	CE backport for `reference` in gfm_autocompletece-5606-issues-and-mr-autocomplete-in-epics	Heinrich Lee Yu	2019-01-07	1	-0/+36
\| \| \| \| \| \| \| \|	Currently not used by any CE code
* \|	Merge branch '53966-hashed-storage-read-only' into 'master'	Douglas Barbosa Alexandre	2019-01-08	3	-19/+72
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Hashed Storage: Only set as `read_only` when starting the per-project migration See merge request gitlab-org/gitlab-ce!24128
\| * \|	Only set as `read_only` when starting the per-project migration53966-hashed-storage-read-only	Gabriel Mazetto	2019-01-07	3	-19/+72
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the previous code, we locked the project during the migration scheduling step, which works fine for small setups, but can be problematic in really big installations. We now moved the logic to inside the worker, so we minimize the time a project will be read-only. We also make sure we only do that if reference counter is `0` (no current operation is in progress).
* \| \|	Merge branch '49231-import-issues-csv' into 'master'	Douwe Maan	2019-01-07	8	-2/+199
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Import issues from CSV Closes #49231 See merge request gitlab-org/gitlab-ce!23532
\| * \| \|	Remove caching of CSV file49231-import-issues-csv	Heinrich Lee Yu	2019-01-07	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load whole file in memory to simplify code
\| * \| \|	Improve email messages	Heinrich Lee Yu	2019-01-07	2	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also refactored cleanup view to use the same localized string
\| * \| \|	Refactor upload service to return uploader	Heinrich Lee Yu	2019-01-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also changes old calls to the service
\| * \| \|	Import CSV Backend	Heinrich Lee Yu	2019-01-07	7	-0/+197
\| \| \|/ \| \|/\| \| \| \| \| \| \|	Process CSV uploads async using a worker then email results
* \| \|	Merge branch 'ce-7407-label-quick-epics' into 'master'	Lin Jen-Shin	2019-01-07	1	-0/+15
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE port: Use parent instead of project for quick actions See merge request gitlab-org/gitlab-ce!24124
\| * \| \|	Use parent instead of project	Jarka Košanová	2019-01-08	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for group entities to quick actions
* \| \| \|	Merge branch '55177-sentry-configuration' into 'master'	Kamil Trzciński	2019-01-07	4	-11/+296
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Sentry Configuration" See merge request gitlab-org/gitlab-ce!23724
\| * \| \| \|	Implement error tracking configuration	Peter Leitzen	2019-01-07	2	-11/+218
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-use operations controller which already handles tracing settings.
\| * \| \| \|	Add view and feature test for error tracking settings	Tristan Read	2019-01-07	2	-0/+78
\| \|/ / /
* \| \| \|	Merge branch '7061_store_container_scanning_reports_in_db_be-ce' into 'master'	Stan Hu	2019-01-07	1	-10/+84
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Use Container Scaning report fixture from EE See merge request gitlab-org/gitlab-ce!23836
\| * \| \|	Use Container Scaning report fixture from EE7061_store_container_scanning_reports_in_db_be-ce	Gilbert Roulot	2019-01-07	1	-10/+84
\| \| \| \|
* \| \| \|	Add table and model for error tracking settings	Reuben Pereira	2019-01-07	7	-0/+113
\|/ / /
* \| \|	Merge branch 'leipert-dedupe-vue' into 'master'	Mike Greiling	2019-01-07	1	-1/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update to Vue 2.5.21 Closes #55592 See merge request gitlab-org/gitlab-ce!23969
\| * \| \|	Changed failing karma spec	Phil Hughes	2019-01-07	1	-1/+0
\| \| \| \|
* \| \| \|	Merge branch ↵	Fatih Acet	2019-01-07	1	-1/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'53796-discard-draft-comment-button-to-easy-to-accidentally-hit-on-mobile' into 'master' Resolve "Discard draft comment button to easy to accidentally hit on mobile" Closes #53796 See merge request gitlab-org/gitlab-ce!24185
\| * \| \| \|	Removed discard comment button	Constance Okoghenun	2019-01-07	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed the button and associated tests form notes on Issues and Merge request page.
* \| \| \| \|	Merge branch 'user-update-head-pipeline-worker-2' into 'master'	Grzegorz Bizon	2019-01-07	4	-14/+56
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor the logic of updating head pipelines for merge requests See merge request gitlab-org/gitlab-ce!23502
\| * \| \| \| \|	Refactor the logic of updating head pipelines	Shinya Maeda	2019-01-04	4	-14/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sort out some logic
* \| \| \| \| \|	Merge branch 'mk/geo-deprecate-legacy-storage-ce' into 'master'	Nick Thomas	2019-01-07	1	-0/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport persistent user callout flash message to CE See merge request gitlab-org/gitlab-ce!24166
\| * \| \| \| \| \|	Port of mk/geo-deprecate-legacy-storage to CEmk/geo-deprecate-legacy-storage-ce	Michael Kozono	2019-01-04	1	-0/+9
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '54311-fix-board-add-label' into 'master'	Kushal Pandya	2019-01-07	1	-0/+21
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error when creating labels in a new issue in the boards page Closes #54311 See merge request gitlab-org/gitlab-ce!24039
\| * \ \ \ \ \ \	Merge branch 'master' into 54311-fix-board-add-label	rubenmoya	2019-01-05	195	-3452/+8618
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Add specs	rubenmoya	2019-01-05	1	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Co-Authored-By: André Luis <aluis@gitlab.com>
* \| \| \| \| \| \| \| \|	Merge branch '54981-extended-user-centric-tooltips-add-missing-cases' into ↵	Kushal Pandya	2019-01-07	2	-1/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Extended user centric tooltips: Add missing cases" Closes #54981 See merge request gitlab-org/gitlab-ce!24132
\| * \| \| \| \| \| \| \| \|	Fixed Data Attribute Test54981-extended-user-centric-tooltips-add-missing-cases	Tim Zallmann	2019-01-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Added Spec for Vue Commit Item	Tim Zallmann	2019-01-06	1	-0/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Added Class check to commits helper Spec	Tim Zallmann	2019-01-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-issue-55914' into 'master'	Rémy Coutable	2019-01-07	1	-0/+11
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Bitbucket Server import only including first 25 pull requests Closes #55914 See merge request gitlab-org/gitlab-ce!24178
\| * \| \| \| \| \| \| \| \|	Fix Bitbucket Server import only including first 25 pull requests	Stan Hu	2019-01-06	1	-0/+11
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The change to paginate repos in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22825 caused the paginator to stop after 25 pull requests because the limit was set to 25 if none was defined. To fix this, we should only stop if the limit has actually been set and use the limit parameter to determine the maximum number of items to process per page. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55914
* \| \| \| \| \| \| \| \|	Merge branch 'include-project' into 'master'	Grzegorz Bizon	2019-01-07	9	-15/+176
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to include another project files Closes #53903 See merge request gitlab-org/gitlab-ce!24101
\| * \| \| \| \| \| \| \|	Allow to include files from another projects	Kamil Trzciński	2019-01-07	9	-15/+176
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds `project:, file:, ref:` specification support.
* \| \| \| \| \| \| \| \|	Merge branch 'ee1979-user-avatar-list-component' into 'master'	Kushal Pandya	2019-01-07	1	-0/+130
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create shared user-avatar-list component See merge request gitlab-org/gitlab-ce!24139
\| * \| \| \| \| \| \| \| \|	Create shared user-avatar-list componentee1979-user-avatar-list-component	Paul Slaughter	2019-01-04	1	-0/+130
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? We need a component that can expand / collapse a list of avatars for approval rules table. See issue https://gitlab.com/gitlab-org/gitlab-ee/issues/1979
* \| \| \| \| \| \| \| \|	Merge branch 'suggestion-dashes' into 'master'	Kushal Pandya	2019-01-07	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes diff sugestions removing dashes from diff Closes #55634 See merge request gitlab-org/gitlab-ce!23994
\| * \| \| \| \| \| \| \| \|	Fixes diff sugestions removing dashes from diff	Phil Hughes	2018-12-21	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55634
* \| \| \| \| \| \| \| \| \|	Merge branch 'fl-releases-fix-author' into 'master'	Kushal Pandya	2019-01-07	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes if case to render author info in releases See merge request gitlab-org/gitlab-ce!23989
\| * \| \| \| \| \| \| \| \| \|	Fixes if case to render author info in releasesfl-releases-fix-author	Filipa Lacerda	2018-12-21	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|