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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove confidential issue todos for project guestsfix-conf-issues-remove	Jarka Kadlecová	2018-08-03	4	-31/+104
\|
*	Merge branch ↵	Dmitriy Zaporozhets	2018-08-02	11	-10/+130
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'48834-chart-versions-for-applications-installed-by-one-click-install-buttons-should-be-version-locked' into 'master' Resolve "Chart versions for applications installed by one click install buttons should be version locked" Closes #48834 See merge request gitlab-org/gitlab-ce!20765
\| *	Lock helm charts to the VERSION already specified for each application.	Thong Kuah	2018-08-02	11	-10/+130
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix up VERSION for each of the applications * There is no 0.0.1 helm version for jupyterhub. Use the latest version instead * `:nginx` is not a valid chart version. Lock the ingress application GitLab installs to the latest chart version. * Use the latest gitlab-runner chart to prevent GitLab installing older versions when users have been installing the lastest version Always install from the VERSION and not the database `version` column. This should fix cases like https://gitlab.com/gitlab-org/gitlab-ee/issues/6795 in the instances where an install command failed previously, which locked the version in the database to an older version. Also, ensure that the version column is updated to the version we are installing. Add specs to show how previously failed appplications will be handled when the helm installation is run again Add changelog entry
* \|	Merge branch 'fix/indentation-issue' into 'master'	Rémy Coutable	2018-08-02	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix indentation for artifacts example in docs See merge request gitlab-org/gitlab-ce!20971
\| * \|	Fix indentation for artifacts example in docs	Adam Liter	2018-08-01	1	-2/+2
\| \| \|
* \| \|	Merge branch '49830-use-helm-272' into 'master'	Dmitriy Zaporozhets	2018-08-02	3	-2/+7
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Helm 2.7.2 for GitLab Managed Apps Closes #49830 See merge request gitlab-org/gitlab-ce!20956
\| * \| \|	Update Helm Tiller used by gitlab-managed-apps to 2.7.2	Thong Kuah	2018-08-02	3	-2/+7
\| \| \|/ \| \|/\|
* \| \|	Merge branch ↵	Sean McGivern	2018-08-02	5	-1/+73
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'44824-remove-ghost-notification-settings-for-group-and-project' into 'master' Resolve "Remove ghost notification settings for groups and projects" Closes #44824 See merge request gitlab-org/gitlab-ce!20567
\| * \| \|	Resolve "Remove ghost notification settings for groups and projects"	🙈 jacopo beschi 🙉	2018-08-02	5	-1/+73
\|/ / /
* \| \|	Merge branch 'update-gitlab-shell-to-8.1.0' into 'master'	Nick Thomas	2018-08-02	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update GITLAB_SHELL_VERSION to 8.1.0 See merge request gitlab-org/gitlab-ce!20975
\| * \| \|	Update GITLAB_SHELL_VERSION to 8.1.0	James Lopez	2018-08-02	1	-1/+1
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'patch-28' into 'master'	Marcia Ramos	2018-08-02	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update two_factor_authentication.md See merge request gitlab-org/gitlab-ce!20943
\| * \| \|	Update two_factor_authentication.md	John Burak	2018-07-31	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'frozen-string-enable-app-models' into 'master'	Rémy Coutable	2018-08-02	139	-7/+286
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable frozen string in app/models/*.rb See merge request gitlab-org/gitlab-ce!20851
\| * \| \| \|	Enable frozen string in app/models/*.rbrepo-forks/gitlab-ce-frozen-string-enable-app-models	gfyoung	2018-07-26	139	-7/+286
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Partially addresses #47424.
* \| \| \| \|	Merge branch '48246-osw-load-diffs-improvement' into 'master'	Sean McGivern	2018-08-02	3	-5/+15
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Filter diff files by given path on DB instead Ruby See merge request gitlab-org/gitlab-ce!20940
\| * \| \| \| \|	Only serializes diff files found by paths query	Oswaldo Ferreira	2018-08-01	3	-5/+15
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '49851-link-to-runners' into 'master'	Phil Hughes	2018-08-02	3	-2/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Link to the runners page should automatically expand the runners settings" Closes #49851 See merge request gitlab-org/gitlab-ce!20967
\| * \| \| \| \| \|	Automatically expand runner's settings block when linking to the runner's ↵	Filipa Lacerda	2018-08-01	3	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	settings page by using page anchor on the link
* \| \| \| \| \| \|	Merge branch 'gitaly-import-bare' into 'master'	Sean McGivern	2018-08-02	24	-80/+77
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor gitlab:import:repos task to remove direct disk access Closes gitaly#953 See merge request gitlab-org/gitlab-ce!20864
\| * \| \| \| \| \|	Refactor gitlab:import:repos task to remove direct disk access	Alejandro Rodríguez	2018-07-31	24	-80/+77
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'zj-repository-languages' into 'master'	Nick Thomas	2018-08-01	29	-4/+478
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add repository languages for projects Closes #23931, #34671, #48647, and #47301 See merge request gitlab-org/gitlab-ce!19480
\| * \| \| \| \| \|	Add repository languages for projects	Zeger-Jan van de Weg	2018-08-01	29	-4/+478
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Our friends at GitHub show the programming languages for a long time, and inspired by that this commit means to create about the same functionality. Language detection is done through Linguist, as before, where the difference is that we cache the result in the database. Also, Gitaly can incrementaly scan a repository. This is done through a shell out, which creates overhead of about 3s each run. For now this won't be improved. Scans are triggered by pushed to the default branch, usually `master`. However, one exception to this rule the charts page. If we're requesting this expensive data anyway, we just cache it in the database. Edge cases where there is no repository, or its empty are caught in the Repository model. This makes use of Redis caching, which is probably already loaded. The added model is called RepositoryLanguage, which will make it harder if/when GitLab supports multiple repositories per project. However, for now I think this shouldn't be a concern. Also, Language could be confused with the i18n languages and felt like the current name was suiteable too. Design of the Project#Show page is done with help from @dimitrieh. This change is not visible to the end user unless detections are done.
* \| \| \| \| \| \|	Merge branch 'backstage/avatar-helper-vanilla-js' into 'master'	Clement Ho	2018-08-01	9	-45/+200
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add vanilla JS avatar_helper and update existing avatar helpers See merge request gitlab-org/gitlab-ce!20886
\| * \| \| \| \| \| \|	Add vanilla JS avatar_helper and update existing avatar helpers	Paul Slaughter	2018-08-01	9	-45/+200
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '5488_license_management_backport_css' into 'master'	Clement Ho	2018-08-01	1	-10/+6
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport CSS changes from gitlab-ee!6638 See merge request gitlab-org/gitlab-ce!20961
\| * \| \| \| \| \|	backport CSS from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6638	Lukas Eipert	2018-08-01	1	-10/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '49837-fix-changelog' into 'master'	Robert Speicher	2018-08-01	1	-12/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Clean up changelog for 11.1.3 and 11.1.4" Closes #49837 [ci skip] See merge request gitlab-org/gitlab-ce!20962
\| * \| \| \| \| \| \|	Fixes changelog entries to reflect that 11.1.3 wasn't released	Filipa Lacerda	2018-08-01	1	-12/+3
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'winh-raise-karma-timeout' into 'master'	Tim Zallmann	2018-08-01	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Raise timeout for Karma tests to 2 seconds See merge request gitlab-org/gitlab-ce!20963
\| * \| \| \| \| \| \|	Raise timeout for Karma tests to 2 seconds	Winnie Hellmann	2018-08-01	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'rjh/pages-update-on-patch-version' into 'master'	Rémy Coutable	2018-08-01	1	-3/+13
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added gitlab-pages update instructions. See merge request gitlab-org/gitlab-ce!19674
\| * \| \| \| \| \| \|	Added gitlab-pages update instructions.	Richard Hancock	2018-08-01	1	-3/+13
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'fj-49802-bug-api-set-http-headers' into 'master'	Nick Thomas	2018-08-01	3	-1/+40
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug setting http headers in Files API See merge request gitlab-org/gitlab-ce!20938
\| * \| \| \| \| \| \|	Fix bug setting http headers in Files API	Francisco Javier López 🌴 On vacation; back on August 22th!	2018-08-01	3	-1/+40
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch ↵	Phil Hughes	2018-08-01	4	-1/+42
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'49499-list-of-projects-not-loading-when-trying-to-create-an-issue-from-a-board-typeerror' into 'master' Resolve "List of projects not loading when trying to create an issue from a board (TypeError)" Closes #49499 See merge request gitlab-org/gitlab-ce!20955
\| * \| \| \| \| \| \|	Resolve "List of projects not loading when trying to create an issue from a ↵	Constance Okoghenun	2018-08-01	4	-1/+42
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	board (TypeError)"
* \| \| \| \| \| \|	Merge branch 'bvl-port-of-ee-translations' into 'master'	Nick Thomas	2018-08-01	21	-2647/+49957
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port of EE-translations See merge request gitlab-org/gitlab-ce!20960
\| * \| \| \| \| \|	Merge branch 'master-i18n' into 'master'	Nick Thomas	2018-08-01	21	-2647/+49957
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New Crowdin translations See merge request gitlab-org/gitlab-ee!6706
* \| \| \| \| \|	Merge branch 'bvl-user-status-message-35463' into 'master'	Rémy Coutable	2018-08-01	66	-18/+816
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow users to set a status Closes #35463 See merge request gitlab-org/gitlab-ce!20614
\| * \| \| \| \| \|	Add the message HTML to the UserStatus api	Bob Van Landuyt	2018-08-01	3	-19/+39
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Regenerate locale/gitlab.pot	Winnie Hellmann	2018-07-30	1	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Make it explicit that the message can contain emojis in the settings	Winnie Hellmann	2018-07-30	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Make it explicit that the status message can contain emojis	Winnie Hellmann	2018-07-30	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Hide the status fields behind a feature flag	Bob Van Landuyt	2018-07-30	4	-11/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since the frontend for this feature isn't ready, better to hide the confusing field behind a feature flag.
\| * \| \| \| \| \|	Show the status of a user in interactions	Bob Van Landuyt	2018-07-30	43	-15/+328
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The status is shown for - The author of a commit when viewing a commit - Notes on a commit (regular/diff) - The user that triggered a pipeline when viewing a pipeline - The author of a merge request when viewing a merge request - The author of notes on a merge request (regular/diff) - The author of an issue when viewing an issue - The author of notes on an issue - The author of a snippet when viewing a snippet - The author of notes on a snippet - A user's profile page - The list of members of a group/user
\| * \| \| \| \| \|	Allow users to set a status	Bob Van Landuyt	2018-07-30	21	-6/+395
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This can be done trough the API for the current user, or on the profile page.
\| * \| \| \| \| \|	Add the `UserStatus` model	Bob Van Landuyt	2018-07-25	3	-0/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This model will hold the status of a user, including these fields: - emoji: always present, with a default value - user: always present, foreign key to user - message: optional, maximum length of 100 The table also stores - cached_markdown_version - message_html For rendering markdown in the `message` field.
* \| \| \| \| \| \|	Merge branch '41416-making-instance-wide-data-tools-more-accessible' into ↵	Filipa Lacerda	2018-08-01	39	-46/+315
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Making instance-wide data tools more accessible" Closes #41416 and #48507 See merge request gitlab-org/gitlab-ce!20874
\| * \| \| \| \| \|	Correct the correction for application_setting.rb	Luke Bennett	2018-07-31	1	-2/+2
\| \| \| \| \| \| \|