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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Removes EE differences6360-tree-header	Filipa Lacerda	2019-06-27	1	-0/+1
\|
*	Merge branch 'sh-add-gitaly-ref-caching-search-controller' into 'master'	Kamil Trzciński	2019-06-27	3	-6/+8
\|\ \| \| \| \| \| \| \| \|	Enable Gitaly ref caching for SearchController See merge request gitlab-org/gitlab-ce!30105
\| *	Enable Gitaly ref caching for SearchControllersh-add-gitaly-ref-caching-search-controller	Stan Hu	2019-06-26	3	-6/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	As we noticed in https://gitlab.com/gitlab-org/gitlab-ce/issues/56627#note_185828742, clicking on the "Issues" tab often requests the same reference in rendering Markdown.
* \|	Fix styling for `app/assets/stylesheets/framework/notes.scss`	George Tsiolis	2019-06-27	2	-11/+1
\| \|
* \|	Fix incorrect reaction placement in commit diff discussion	Samantha Ming	2019-06-27	1	-1/+1
\| \|
* \|	Update action selector	Jacques Erasmus	2019-06-27	1	-2/+2
\| \| \| \| \| \| \| \|	Updated the toast action selector to `first-of-type` instead
* \|	Conform related issues/MRs card to design docs	Martin Hanzel	2019-06-27	3	-91/+144
\| \|
* \|	Merge branch '53811-issue-boards-to-core-projects-backend-ce' into 'master'	Stan Hu	2019-06-27	12	-26/+160
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Move Multiple Issue Boards for Projects to Core See merge request gitlab-org/gitlab-ce!29757
\| * \|	Move Multiple Issue Boards for Projects to Core53811-issue-boards-to-core-projects-backend-ce	Alexandru Croitor	2019-06-26	12	-26/+160
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor code to allow multiple issue boards management for projects in CE
* \| \|	Merge branch '61156-instance-level-cluster-pod-terminal-access' into 'master'	Thong Kuah	2019-06-27	2	-36/+32
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instance-level cluster pod terminal access Closes #55489, #55488, #55487, and #61156 See merge request gitlab-org/gitlab-ce!28613
\| * \| \|	Move terminal construction logic to Environment61156-instance-level-cluster-pod-terminal-access	Tiger	2019-06-25	2	-36/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This enables terminals for group and project level clusters. Previously there was no way to determine which project (and therefore kubernetes namespace) to connect to, moving this logic onto Environment means the assoicated project can be used to look up the correct namespace.
* \| \| \|	Merge branch 'sh-update-mermaid' into 'master'	Fatih Acet	2019-06-27	1	-0/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Mermaid to 8.1.0 Closes #60869 See merge request gitlab-org/gitlab-ce!30036
\| * \| \| \|	Update Mermaid to 8.1.0	Stan Hu	2019-06-25	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes dotted lines not rendering when the htmlLabels setting is false (https://github.com/knsv/mermaid/pull/828). Full list of changes: https://github.com/knsv/mermaid/releases Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60869
* \| \| \| \|	Merge branch 'dz-remove-deprecated-user-routes' into 'master'	Mike Greiling	2019-06-27	1	-2/+2
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated user routes See merge request gitlab-org/gitlab-ce!30044
\| * \| \| \|	Remove deprecated /u/:username routesdz-remove-deprecated-user-routes	Dmitriy Zaporozhets	2019-06-26	1	-2/+2
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also release `u` from TOP_LEVEL_ROUTES Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Basic note appears	Sarah Groff Hennigh-Palermo	2019-06-26	10	-51/+142
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This happens in multiple files
* \| \| \|	Externalize strings of access tokens page in user profile	antony liu	2019-06-26	5	-43/+43
\| \| \| \|
* \| \| \|	Add feature flag and dashboard endpoint	Simon Knox	2019-06-26	6	-9/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	First part of FE for Prometheus API Dashboard endpoint fetches all info except for chart results Renders empty groups after loading
* \| \| \|	Merge branch 'refactor/remove-sentry-from-app-settings' into 'master'	Stan Hu	2019-06-26	6	-84/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Sentry settings from application settings See merge request gitlab-org/gitlab-ce!28447
\| * \| \| \|	refactor: remove Sentry from application settings	Roger Meier	2019-06-25	6	-84/+5
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch '62938-wcag-aa-edited-text-color' into 'master'	Phil Hughes	2019-06-26	2	-4/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use darker gray color for system note metadata and edited text Closes #62938 See merge request gitlab-org/gitlab-ce!30054
\| * \| \| \|	Use darker gray color for system note metadata and edited text62938-wcag-aa-edited-text-color	Annabel Dunstone Gray	2019-06-25	2	-4/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'vue-tree-logs-tree-request' into 'master'	Filipa Lacerda	2019-06-26	10	-7/+150
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fetch commit message with logs_tree endpoint See merge request gitlab-org/gitlab-ce!29796
\| * \| \| \| \|	Fetch commit message with log_tree endpoint	Phil Hughes	2019-06-25	10	-7/+150
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '12428-pipelines' into 'master'	Phil Hughes	2019-06-26	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes EE differences for app/assets/javascripts/pipelines/pipeline_details_mediator.js Closes gitlab-ee#12428 See merge request gitlab-org/gitlab-ce!30085
\| * \| \| \| \| \|	Removes EE differences12428-pipelines	Filipa Lacerda	2019-06-26	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Always display environment selector	Reuben Pereira	2019-06-26	1	-37/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On the metrics dashboard, always display the environment selector, even if there is no data to display for that environment. This allows the user to switch to the metrics dashboard of another environment.
* \| \| \| \| \| \|	Re-name entries in one commit	Denys Mishunov	2019-06-26	6	-15/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update window's URL after entry's re-name Set proper hook for correct fileLanguage Filtered out `moved` entries from the tree
* \| \| \| \| \| \|	Merge branch '12257-sidebar-mediator' into 'master'	Phil Hughes	2019-06-26	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes EE differences for app/assets/javascripts/sidebar/sidebar_mediator.js Closes gitlab-ee#12257 See merge request gitlab-org/gitlab-ce!30077
\| * \| \| \| \| \| \|	Removes EE differences12257-sidebar-mediator	Filipa Lacerda	2019-06-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Uses ee_else_ce to remove the differences
* \| \| \| \| \| \| \|	Merge branch '12427-comparision-pane' into 'master'	Phil Hughes	2019-06-26	1	-3/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes EE differences for `app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue` Closes gitlab-ee#12427 See merge request gitlab-org/gitlab-ce!30078
\| * \| \| \| \| \| \| \|	Removes EE differences12427-comparision-pane	Filipa Lacerda	2019-06-26	1	-3/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '12364-sortable-default-mixin' into 'master'	Phil Hughes	2019-06-26	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes EE differences for sortable_default_options Closes gitlab-ee#12364 See merge request gitlab-org/gitlab-ce!30074
\| * \| \| \| \| \| \| \| \|	Removes EE differences12364-sortable-default-mixin	Filipa Lacerda	2019-06-26	1	-1/+1
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	uses ee_else_ce to remove ee differences
* \| \| \| \| \| \| \| \|	Merge branch '62214-migrations-and-models' into 'master'	Andreas Brandl	2019-06-26	3	-0/+19
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Step 1 of !28996: Adds models and migrations for Namespaces statistics See merge request gitlab-org/gitlab-ce!29570
\| * \| \| \| \| \| \| \|	Add two new ActiveRecord models62214-migrations-and-models	Mayra Cabrera	2019-06-25	3	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Namespace::Storagestatistics will persist root namespace statistics - Namespace::AggregationSchedule will save information when a new update to the namespace statistics needs to be scheduled Both tables use 'namespace_id' as primary key
* \| \| \| \| \| \| \| \|	Speed up obtaining Let's Encrypt certificates	Vladimir Shushlin	2019-06-26	1	-0/+10
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '51952-forking-via-webide' into 'master'	Nick Thomas	2019-06-26	5	-21/+13
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "500 error when forking via the web IDE button" See merge request gitlab-org/gitlab-ce!29909
\| * \| \| \| \| \| \| \| \|	Support redirect paths starting with a dash51952-forking-via-webide	Markus Koller	2019-06-25	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We use a leading dash for certain things like the WebIDE, which had the side effect of losing the `params[:continue][:to]` param when opening the WebIDE on a project where the user doesn't have push access and therefore needs to fork the project first.
\| * \| \| \| \| \| \| \| \|	Make checks for continue_params more robust	Markus Koller	2019-06-25	4	-19/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The check for continue_params&.key?(:to) in Projects::ImportsController caused an exception in redirect_to if this key contained a nil value. Since url_for won't add any params for an empty hash, we can just return that in continue_params if params[:continue] isn't present, and simplify the code in the controllers to check for the values we actually want to use.
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-service-template-bug' into 'master'	Thong Kuah	2019-06-26	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable Rails SQL query cache when applying service templates Closes #63595 See merge request gitlab-org/gitlab-ce!30060
\| * \| \| \| \| \| \| \| \|	Disable Rails SQL query cache when applying service templatessh-service-template-bug	Stan Hu	2019-06-25	1	-1/+1
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When the SQL query cache is active, the SELECT query for finding projects to apply service templates returns the same values. This causes an infinite loop because even though bulk INSERT queries are made, the cached results never reflect that progress. To fix this, we call `Project.uncached` around the query to ensure new data is retrieved. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63595
* \| \| \| \| \| \| \| \|	Merge branch 'from-installable-to-not-installable' into 'master'	Kushal Pandya	2019-06-26	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle dependencies between cluster managed apps installation status See merge request gitlab-org/gitlab-ce!29999
\| * \| \| \| \| \| \| \|	Transition from installable to not_installablefrom-installable-to-not-installable	Enrique Alcantara	2019-06-24	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Contemplate the scenario where a K8 managed application becomes not_installable after being installable.
* \| \| \| \| \| \| \| \|	In dev, always allow access to health endpoints from localhost	Andrew Newdigate	2019-06-26	1	-0/+4
\| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change will allow developers to easily hook up a Prometheus instance to their local development instance, without making any configuration changes.
* \| \| \| \| \| \| \|	Bring Manual Ordering on Issue List	Rajat Jain	2019-06-26	11	-3/+91
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On all the issue lists -- Group, Project and Dashboard -- this change adds a new option for managing the lists. "Manual Ordering" option is added which when flipped on will allow an user to drag and drop issues around to create a relative ordering among them.
* \| \| \| \| \| \| \|	Vue-i18n: app/assets/javascripts/diffs directory	Ezekiel Kigbo	2019-06-26	4	-17/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n linting for .vue files under the app/assets/javascripts/diffs directory
* \| \| \| \| \| \| \|	Merge branch 'da-fix-cache-for-broadcast-message' into 'master'	Stan Hu	2019-06-25	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set 2 weeks as the expiration time for the current broadcast message See merge request gitlab-org/gitlab-ce!30062
\| * \| \| \| \| \| \| \|	Set 2 weeks as the expiration time for the current broadcast message	Douglas Barbosa Alexandre	2019-06-25	1	-1/+1
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	New RecaptchaExperimentHelper modules	Ash McKenzie	2019-06-25	4	-12/+32
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RecaptchaExperimentHelper contains helper methods to assist in the controller and view layers.