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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Generate searchable JSDoc documentation	Winnie Hellmann	2019-01-14	8	-77/+159
\|
*	Merge branch 'gt-externalize-app-views-projects-project_members' into 'master'	Clement Ho	2019-01-14	8	-35/+86
\|\ \| \| \| \| \| \| \| \|	Externalize strings from `/app/views/projects/project_members` See merge request gitlab-org/gitlab-ce!23227
\| *	Externalize strings from `/app/views/projects/project_members`	George Tsiolis	2019-01-14	8	-35/+86
\|/
*	Merge branch 'gt-rename-gray-theme-color-variables' into 'master'	Annabel Dunstone Gray	2019-01-14	27	-94/+99
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Remove all `$theme-gray-{weight}` variables in favor of `$gray-{weight}` Closes #56266 See merge request gitlab-org/gitlab-ce!24333
\| *	Remove all `$theme-gray-{weight}` variables in favor of `$gray-{weight}`	George Tsiolis	2019-01-14	27	-94/+99
\|/
*	Merge branch '8688-recursive-pipelines-ce-backport' into 'master'	Phil Hughes	2019-01-14	4	-42/+53
\|\ \| \| \| \| \| \| \| \|	Moves shared code into a mixin See merge request gitlab-org/gitlab-ce!24322
\| *	Moves shared code into a mixin	Filipa Lacerda	2019-01-11	4	-42/+53
\| \| \| \| \| \| \| \| \| \| \| \|	To reduce code duplication between CE and EE components, creates a mixin with the common methods for the graph component
* \|	Merge branch 'import-export-dev-doc' into 'master'	Marcia Ramos	2019-01-14	2	-0/+353
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Import/Export dev docs Closes #36055 See merge request gitlab-org/gitlab-ce!23835
\| * \|	Add Import/Export dev docs	James Lopez	2019-01-14	2	-0/+353
\|/ /
* \|	Merge branch 'patch-31' into 'master'	Rémy Coutable	2019-01-14	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	GitLab 11.4.3 "Outbound requests" setting path See merge request gitlab-org/gitlab-ce!22898
\| * \|	GitLab 11.4.3 "Outbound requests" setting path	Thunk	2018-11-08	1	-1/+1
\| \| \|
* \| \|	Merge branch 'sh-fix-gon-helper-avatar' into 'master'	Rémy Coutable	2019-01-14	3	-4/+25
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix no avatar not showing in user selection box Closes #56268 See merge request gitlab-org/gitlab-ce!24346
\| * \| \|	Fix no avatar not showing in user selection box	Stan Hu	2019-01-13	3	-4/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	After upgrading to Ruby 2.5.3, we switched `URI.join` in favor of `Gitlab::Utils.append_path`. However, ActionController::Base.helpers.image_path can return a full URL if a CDN host is present. Rails provides a way to generate the full URL using the asset path, but that doesn't appear to work because `request` is nil`. Revert to the previous behavior to handle CDNs and relative URLs. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56268
* \| \| \|	Merge branch 'leipert-11.8-upgrade-doc' into 'master'	Achilleas Pipinellis	2019-01-14	1	-0/+393
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add 11.7 -> 11.8 update doc See merge request gitlab-org/gitlab-ce!24283
\| * \| \| \|	Add 11.7 -> 11.8 update doc	Lukas 'Eipi' Eipert	2019-01-14	1	-0/+393
\|/ / / /
* \| \| \|	Merge branch '25341-add-what-s-new-menu-item-in-top-navigation' into 'master'	Dmitriy Zaporozhets	2019-01-14	11	-15/+303
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add "What's new" menu item in top navigation" Closes #25341 See merge request gitlab-org/gitlab-ce!23186
\| * \| \| \|	Resolve "Add "What's new" menu item in top navigation"	Brandon Labuschagne	2019-01-14	11	-15/+303
\|/ / / /
* \| \| \|	Merge branch 'sh-fix-bitbucket-server-error-handling' into 'master'	Rémy Coutable	2019-01-14	7	-23/+43
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Bitbucket Server importer error handling Closes #56154 See merge request gitlab-org/gitlab-ce!24343
\| * \| \| \|	Fix Bitbucket Server importer error handling	Stan Hu	2019-01-12	7	-23/+43
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The importer would display a 500 error page if you attempted to import using a non-existent DNS entry. This commit rescues known network issues and consolidates them into BitbucketServer::Connection::ConnectionError`. The previous error handling in the paginator doesn't work because it returns a lazy collection. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56154
* \| \| \|	Merge branch 'zj-ensure-link-pool-repo-gc' into 'master'	Lin Jen-Shin	2019-01-14	4	-6/+21
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure pool participants are linked before GC Closes gitaly#1354 See merge request gitlab-org/gitlab-ce!24230
\| * \| \| \|	Ensure pool participants are linked before GC	Zeger-Jan van de Weg	2019-01-14	4	-6/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In theory the case could happen that the initial linking of the pool fails and so do all the retries that Sidekiq performs. This could lead to data loss. To prevent that case, linking is done before Gits GC too. This makes sure that case doesn't happen.
* \| \| \| \|	Merge branch '54065-bump-minimum-node-version-to-8' into 'master'	Mike Greiling	2019-01-14	4	-215/+303
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump minimal node version from 6 to 8.10.0 Closes #54065 See merge request gitlab-org/gitlab-ce!24305
\| * \| \| \| \|	Fenced code blocks for all the docs	Lukas Eipert	2019-01-14	1	-209/+298
\| \| \| \| \| \|
\| * \| \| \| \|	Update FE developer and installation documentation	Lukas Eipert	2019-01-14	2	-3/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Remove QA job for node@6	Lukas Eipert	2019-01-14	1	-4/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Enforce node >= 8.10.0 with engines flag	Lukas Eipert	2019-01-14	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'docs-gitaly-tls-version' into 'master'	Achilleas Pipinellis	2019-01-14	1	-0/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Gitaly documentation to indicate which version shipped with Gitaly TLS support See merge request gitlab-org/gitlab-ce!24334
\| * \| \| \| \| \|	Indicate which version shipped with Gitaly TLS support	Drew Blessing	2019-01-14	1	-0/+2
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'osw-fix-quick-suggestion-application-being-reverted' into 'master'	Douwe Maan	2019-01-14	5	-20/+226
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjust applied suggestion reverting previous changes Closes #56017 See merge request gitlab-org/gitlab-ce!24250
\| * \| \| \| \| \|	Adjust applied suggestion reverting previous changes	Oswaldo Ferreira	2019-01-11	5	-20/+226
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Avoid suggestions being applied on the same file from reverting previous changes 2. Gracefully use and handle file changes error when updating the file (though, it does not totally solves the sync problem for multiple suggestion applications at once)
* \| \| \| \| \| \|	Merge branch 'docs-fix-broken-mr-coach-link' into 'master'	Marcia Ramos	2019-01-14	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken MR coach link See merge request gitlab-org/gitlab-ce!24327
\| * \| \| \| \| \| \|	Fix broken MR coach link	Mark Lapierre	2019-01-11	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '56311-undefined-method-count_of_extra_tags_not_shown' into ↵	Filipa Lacerda	2019-01-14	2	-1/+25
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "undefined method `count_of_extra_tags_not_shown'" Closes #56311 See merge request gitlab-org/gitlab-ce!24354
\| * \| \| \| \| \| \| \|	Rename count_of_extra_tags_not_shown to count_of_extra_topics_not_shown	Martin Wortschack	2019-01-14	2	-1/+25
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add tests for project topics
* \| \| \| \| \| \| \|	Merge branch 'actioncontroller-parameters-deprecations' into 'master'	Rémy Coutable	2019-01-14	8	-7/+12
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes several ActionController::Parameters deprecations See merge request gitlab-org/gitlab-ce!24332
\| * \| \| \| \| \| \|	Fix several ActionController::Parameters deprecations	Jasper Maes	2019-01-11	8	-7/+12
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'auto-devops-kubectl-1-11-6' into 'master'	Dmitriy Zaporozhets	2019-01-14	2	-1/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump kubectl in Auto DevOps to 1.11.6 See merge request gitlab-org/gitlab-ce!24176
\| * \| \| \| \| \| \| \|	Bump kubectl in Auto DevOps to latest 1.11.6	Thong Kuah	2019-01-10	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the latest major version that will support the current clusters on GKE which is v1.10
* \| \| \| \| \| \| \| \|	Merge branch 'bump-ingress-chart-112' into 'master'	Dmitriy Zaporozhets	2019-01-14	3	-4/+9
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump nginx-ingress chart to 1.1.2 See merge request gitlab-org/gitlab-ce!24203
\| * \| \| \| \| \| \| \| \|	Bump nginx-ingress chart to 1.1.2	Thong Kuah	2019-01-10	3	-4/+9
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'web-terminal_xterm_weblinks' into 'master'55801-support-alerts-from-external-prometheus-servers	Filipa Lacerda	2019-01-14	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	web-terminal: Add support for URL to Link parsing See merge request gitlab-org/gitlab-ce!24242
\| * \| \| \| \| \| \| \| \|	web-terminal: Add support for URL to Link parsing	robertfoss	2019-01-08	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is desirable since it enables people who are viewing job results to quickly go from the logs to more detailed information about an issue.
* \| \| \| \| \| \| \| \| \|	Merge branch 'update-gitlab-styles' into 'master'	Lin Jen-Shin	2019-01-14	7	-12/+17
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitlab-styles to 2.5.1 See merge request gitlab-org/gitlab-ce!24336
\| * \| \| \| \| \| \| \| \| \|	Update gitlab-styles to 2.5.1	Jasper Maes	2019-01-11	7	-12/+17
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'move-job-cancel-btn' into 'master'	Filipa Lacerda	2019-01-14	8	-94/+47
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move job cancel button Closes #55944 and #54812 See merge request gitlab-org/gitlab-ce!24074
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Fernando Arias	2019-01-11	109	-714/+1674
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	move-job-cancel-btn
\| * \| \| \| \| \| \| \| \| \| \|	Code cleanup of headerActions and tests	Fernando Arias	2019-01-11	3	-20/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Remove headerAction getter from job getters * Remove prop from being passed into header_ci_component * Remove no longer needed tests
\| * \| \| \| \| \| \| \| \| \| \|	Update failing specs & linter errors & changelog	Fernando Arias	2019-01-10	4	-7/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Move job cancel/new button	Fernando Arias	2019-01-10	6	-72/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Move cancel button to where the Retry is normally placed * Move new issue button to be in sidebar view for desktop versions * Update specs Add changelog entry for moving cancel btn Remove mobile version job action buttons * Remove buttons showing up on seperate row on job sidebar * Show Retry button in mobile version next to build name Improve flexbox usage for job action buttons * Allow for cleaner scaling of job name and alignment of buttons Adjust the debug button icon size * Adjust debug icon size on the build sidebar so the debug button is the same height as the other buttons Tweak job name vertical margins * Changes are only made to job side vue * Remove old class that only changed margin on top * Adjust veritcal margin uniformy set to 0 via bootstrap margin class Update Karma tests for job side view * Update karms tests for mobile version of side view * Removed tests for new issue button since we are fixing in https://gitlab.com/gitlab-org/gitlab-ce/issues/55944 Fix rspec and static-analysis failures * Run Prettier * Update rspec css selectors Move job action buttons to new line * Move "New Issue" and "Debug" buttons to seperate line in job sidebar * Update specs Run Prettier to format JS Remove New Issue button from job header Make sure button spacing follows styleguide
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/style-propolal-template' into 'master'	Sean McGivern	2019-01-14	1	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename Add style proposal See merge request gitlab-org/gitlab-ce!24353