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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \|	Merge branch 'sh-fix-import-export-suggestions' into 'master'	Michael Kozono	2019-08-12	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Properly save suggestions in project exports Closes #65880 See merge request gitlab-org/gitlab-ce!31690
\| * \| \| \| \| \|	Properly save suggestions in project exportssh-fix-import-export-suggestions	Stan Hu	2019-08-10	1	-1/+1
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously imports would fail if a merge request note included a suggestion with an `ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection` exception. This was happening because suggestions were listed as a descendant of merge requests, but this doesn't work because suggestions are directly associated with notes, not merge requests, and that association is lost. Rails also disallows creating intializing a has_many association through a different object. We fix this by making `suggestions` a child of `notes` within a merge request. This doesn't fix previously broken exported project exports, but new exports will work. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65880
* \| \| \| \| \|	Merge branch '65790-highlight' into 'master'	Annabel Dunstone Gray	2019-08-12	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds highlight to collapsible line in job log Closes #65790 See merge request gitlab-org/gitlab-ce!31665
\| * \| \| \| \| \|	Adds highlight to collapsible line	Filipa Lacerda	2019-08-12	1	-1/+1
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the job log adds a highlight when hovering the collapsible line
* \| \| \| \| \|	Merge branch '65278-fix-puma-master-counter-wipe' into 'master'	Stan Hu	2019-08-12	1	-3/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix active metric files being wiped after the app starts See merge request gitlab-org/gitlab-ce!31668
\| * \| \| \| \| \|	Remove worker label from puma terminations metric65278-fix-puma-master-counter-wipe	Aleksei Lipniagov	2019-08-12	1	-3/+1
\| \|/ / / / /
* \| \| \| \| \|	Update Gitaly server and gem to 1.58.0	Jacob Vosmaer	2019-08-12	1	-22/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'georgekoltsov/63408-user-mapping' into 'master'	Grzegorz Bizon	2019-08-12	4	-4/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add author lines to project import comments See merge request gitlab-org/gitlab-ce!31579
\| * \| \| \| \| \|	Add code review suggestions	George Koltsov	2019-08-12	1	-4/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Apply code review feedback	George Koltsov	2019-08-08	1	-6/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add author lines to project import comments	George Koltsov	2019-08-07	4	-5/+13
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Add changelog entry	George Koltsov	2019-08-12	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Add BitBucketServerImport project filtering	George Koltsov	2019-08-12	1	-1/+2
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Split MR widget into cached and non-cached serializers	Igor	2019-08-09	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Splits auto-refreshing of MR widget into 2 requests: - the one which uses etag-caching and invalidates the fields on change - the one without caching The idea is to gradually move all the fields to etag-cached endpoint
* \| \| \| \| \|	Merge branch 'issue_58494' into 'master'	Robert Speicher	2019-08-09	1	-1/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent rewritting plain links as embedded Closes #58494 See merge request gitlab-org/gitlab-ce!31489
\| * \| \| \| \| \|	Prevent rewritting plain links as embeddedissue_58494	Felipe Artur	2019-08-07	1	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevents rewritting plain image/video links as embedded when moving issues.
* \| \| \| \| \| \|	Remove gfm_embed_metrics flag from BE	Tristan Read	2019-08-09	3	-9/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes the feature flag that controls whether metrics dashboard urls unfurl the metrics dashboard charts.
* \| \| \| \| \| \|	Merge branch 'revert-d61dab91' into 'master'	Bob Van Landuyt	2019-08-09	2	-8/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch '65152-selective-highlight' into 'master'" See merge request gitlab-org/gitlab-ce!31643
\| * \| \| \| \| \| \|	Revert "Merge branch '65152-selective-highlight' into 'master'"revert-d61dab91	Patrick Bajao	2019-08-09	2	-8/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !31361
* \| \| \| \| \| \| \|	Merge branch 'lib-differences' into 'master'	Rémy Coutable	2019-08-09	2	-1/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve EE differences in the lib/ directory See merge request gitlab-org/gitlab-ce!31582
\| * \| \| \| \| \| \| \|	Backport EE changes to ProjectSearchResultslib-differences	Yorick Peterse	2019-08-08	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	EE made some changes to the project_ids_relation method, but these were not backported to CE.
\| * \| \| \| \| \| \| \|	Backport EE changes to the project import API	Yorick Peterse	2019-08-08	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	EE added a single line to this file that can easily be backported to CE, but it appears this was overlooked. The method called is a noop in CE, so no additional changes are necessary.
* \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-sidekiq-scheduling-latency' into 'master'	Thong Kuah	2019-08-09	1	-1/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Sidekiq scheduling_latency_s Closes #65748 See merge request gitlab-org/gitlab-ce!31650
\| * \| \| \| \| \| \| \| \|	Fix Sidekiq scheduling_latency_ssh-fix-sidekiq-scheduling-latency	Stan Hu	2019-08-08	1	-1/+5
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This number was reporting a negative number because `current_time` was a monotonic counter, not an absolute time. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65748
* \| \| \| \| \| \| \| \|	Add Gitaly and Rugged call timing in Sidekiq logs	Stan Hu	2019-08-09	4	-4/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will help identify Sidekiq jobs that invoke excessive number of filesystem access. The timing data is stored in `RequestStore`, but this is only active within the middleware and is not directly accessible to the Sidekiq logger. However, it is possible for the middleware to modify the job hash to pass this data along to the logger.
* \| \| \| \| \| \| \| \|	Merge branch '39217-remove-kubernetes-service-integration' into 'master'	James Lopez	2019-08-09	1	-27/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove KubernetesService integration See merge request gitlab-org/gitlab-ce!31365
\| * \| \| \| \| \| \| \| \|	Final removal of KubernetesService39217-remove-kubernetes-service-integration	Tiger	2019-08-08	1	-27/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Creating new records has been disabled, and all existing records been migrated to clusters as of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28534
* \| \| \| \| \| \| \| \| \|	Merge branch 'speed-up-labels-api' into 'master'	Rémy Coutable	2019-08-09	4	-9/+19
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove label issue and MR counts from default API responses See merge request gitlab-org/gitlab-ce!31543
\| * \| \| \| \| \| \| \| \|	Remove label issue and MR counts from default API responsesspeed-up-labels-api	Sean McGivern	2019-08-08	4	-9/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These counts significantly increase the load time for these requests. Users can now opt in to receiving the counts by setting `with_counts=true` in requests. This is a breaking change, but hopefully a fairly minor one.
* \| \| \| \| \| \| \| \| \|	Add a field for released_at to GH importer	Cindy Pallares 🦉	2019-08-09	1	-0/+1
\| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Rename githost.log -> git_json.log	Stan Hu	2019-08-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The githost.log name was often confused with GitHost.io. Rename this to git_json.log to make it clear it's coming from Git and that it's JSON data.
* \| \| \| \| \| \| \| \|	Bring scoped environment variables to core	Hordur Freyr Yngvason	2019-08-08	4	-19/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As decided in https://gitlab.com/gitlab-org/gitlab-ce/issues/53593
* \| \| \| \| \| \| \| \|	Merge branch '12026-use-notes-finder-target-for-epics-ce' into 'master'	Robert Speicher	2019-08-08	1	-3/+9
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use NotesFinder#target to find Epics See merge request gitlab-org/gitlab-ce!31408
\| * \| \| \| \| \| \| \| \|	Use NotesFinder#target to find Epics12026-use-notes-finder-target-for-epics-ce	Patrick Derichs	2019-08-04	1	-3/+9
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Record usage on snippet usage	Mark Chao	2019-08-08	5	-27/+91
\| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Generalize wiki page counter for other page types to extend to.
* \| \| \| \| \| \| \|	Merge branch '63181-collapsible-line' into 'master'	Kushal Pandya	2019-08-08	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Makes section title clickable and collapsible Closes #63181 See merge request gitlab-org/gitlab-ce!31571
\| * \| \| \| \| \| \| \|	Makes title section collapsible63181-collapsible-line	Filipa Lacerda	2019-08-07	1	-2/+2
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the job log, if the user clicks the section title the job log section will be collapsed
* \| \| \| \| \| \| \|	Merge branch 'patch-71' into 'master'	Grzegorz Bizon	2019-08-08	1	-2/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicated line from Maven CI template See merge request gitlab-org/gitlab-ce!31440
\| * \| \| \| \| \| \| \|	Remove duplicated line from Maven CI template	Zsolt Kovari	2019-08-03	1	-2/+0
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '20137-starrers' into 'master'	Stan Hu	2019-08-08	2	-0/+34
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add possibilty to view starrers ("stargazers") of a repository & any user's starred repositories Closes #20137 See merge request gitlab-org/gitlab-ce!24690
\| * \| \| \| \| \| \|	Fix tests	Camil Staps	2019-08-07	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Expose time since starring on project/:id/starrers API endpoint; exclude ↵	Camil Staps	2019-08-07	2	-4/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	private profiles here as well
\| * \| \| \| \| \| \|	Fix API endpoint for starred projects of a user; add info about starred ↵	Camil Staps	2019-08-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	projects on profile to documentation
\| * \| \| \| \| \| \|	Add documentation and changelog for !24690	Camil Staps	2019-08-07	1	-4/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add users/:user_id/starred_projects API endpoint for projects starred by a user	Camil Staps	2019-08-07	1	-0/+16
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add projects/:id/starrers API endpoint for users who starred a repository	Camil Staps	2019-08-07	1	-0/+12
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'sh-add-missing-csp-report-uri' into 'master'	Mayra Cabrera	2019-08-07	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing report-uri to CSP config See merge request gitlab-org/gitlab-ce!31593
\| * \| \| \| \| \| \| \|	Add missing report-uri to CSP configsh-add-missing-csp-report-uri	Stan Hu	2019-08-07	1	-1/+1
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is supported in Rails 5.2, although it may be deprecated in the future by reports-to.
* \| \| \| \| \| \| \|	Checksum clair executable	Philippe Lafoucrière	2019-08-07	1	-0/+2
\| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Save instance administration project id in DB	Reuben Pereira	2019-08-07	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- This will make it easy to identify the project even if admins change the name of the project or move it.