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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove #make_updated! as have #make_installed! nowremove_make_updated_cluster_applications	Thong Kuah	2019-02-08	2	-35/+0
\| \| \| \| \|	We can have multiple and conditional transistions in a event, so make use of that.
*	Merge branch 'gitaly-update-1.19.0' into 'master'	Stan Hu	2019-02-07	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Upgrade Gitaly to 1.19.0 See merge request gitlab-org/gitlab-ce!25019
\| *	Upgrade gitaly to 1.19.0gitaly-update-1.19.0	Douglas Barbosa Alexandre	2019-02-07	1	-1/+1
\| \|
* \|	Merge branch 'use_upgrade_install_for_helm_apps' into 'master'	Douglas Barbosa Alexandre	2019-02-07	39	-350/+894
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade cluster applications, starting with runner See merge request gitlab-org/gitlab-ce!24789
\| * \|	Upgrade cluster applications, starting with runner	Thong Kuah	2019-02-07	39	-350/+894
\|/ /
* \|	Merge branch 'leipert-fix-webpack-bundle' into 'master'	Mek Stittri	2019-02-07	1	-1/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix increased package size of public/assets Closes gitlab-org/distribution/team-tasks#310 See merge request gitlab-org/gitlab-ce!25018
\| * \|	Fix increased package size of public/assetsleipert-fix-webpack-bundle	Lukas Eipert	2019-02-07	1	-1/+0
\| \|/
* \|	Merge branch 'jlenny-AddPagesTemplates' into 'master'	Douglas Barbosa Alexandre	2019-02-07	18	-30/+86
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pages templates on the new project templates menu Closes #47857 See merge request gitlab-org/gitlab-ce!24906
\| * \|	Project template: Fall back to GitLab logojlenny-AddPagesTemplates	Lukas Eipert	2019-02-07	9	-34/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gitlab-svg to provide the icons for rails, spring and express. For the new GitLab pages templates, we are falling back to the GitLab logo.
\| * \|	Add Pages templates	Jason Lenny	2019-02-07	11	-4/+72
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds templates for the 5 most popular Pages templates to the new project menu. This does not add unique icons for the templates because that turned out more complicated than expected, and this feature is valuable without them.
* \| \|	Merge branch 'qa-quarantine-flaky-tests' into 'master'	Mark Lapierre	2019-02-07	6	-6/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Quarantine flaky tests See merge request gitlab-org/gitlab-ce!25015
\| * \| \|	Quarantine flaky testsqa-quarantine-flaky-tests	Mark Lapierre	2019-02-07	6	-6/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See issues: https://gitlab.com/gitlab-org/quality/nightly/issues/70 https://gitlab.com/gitlab-org/quality/nightly/issues/72 https://gitlab.com/gitlab-org/quality/staging/issues/21 https://gitlab.com/gitlab-org/quality/staging/issues/31 https://gitlab.com/gitlab-org/quality/staging/issues/30 https://gitlab.com/gitlab-org/quality/staging/issues/26
* \| \| \|	Merge branch 'qa-check-server-responding-before-suit' into 'master'	Mark Lapierre	2019-02-07	2	-11/+17
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Wait for login page to load at the beginning of QA suite See merge request gitlab-org/gitlab-ce!24991
\| * \| \|	Load login page only if gitlab_address is definedqa-check-server-responding-before-suit	Sanad Liaquat	2019-02-07	1	-3/+5
\| \| \| \|
\| * \| \|	Wait for login page to load at the beginning of QA suite	Sanad Liaquat	2019-02-07	2	-11/+15
\| \| \| \|
* \| \| \|	Merge branch 'tooltips-to-top' into 'master'	Filipa Lacerda	2019-02-07	6	-13/+12
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change spawning of tooltips to be top by default Closes #39044 and #48581 See merge request gitlab-org/gitlab-ce!21223
\| * \| \|	Changed default tooltip position to be top, instead of bottomtooltips-to-top	Dimitrie Hoekstra	2019-02-06	6	-13/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Tooltips, by default, will display at the top of the element, instead of at the bottom - Note actions and emoji awards tooltips are now top-positioned
* \| \| \|	Merge branch ↵	Douglas Barbosa Alexandre	2019-02-07	1	-0/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'9255-implement-access-controls-when-sso-enforcement-enabled-ce' into 'master' Port migration fix from EE 9270 See merge request gitlab-org/gitlab-ce!25004
\| * \| \| \|	Fix migration failure9255-implement-access-controls-when-sso-enforcement-enabled-ce	James Lopez	2019-02-07	1	-0/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'gitlab-use-group-milestones' into 'master'	Mike Lewis	2019-02-07	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	docs: GitLab uses group milestones to handle issues See merge request gitlab-org/gitlab-ce!24953
\| * \| \| \| \|	GitLab uses group milestones to handle issues	Hiroyuki Sato	2019-02-06	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '19745-new-tasklists-for-merge-requests' into 'master'	Sean McGivern	2019-02-07	12	-97/+164
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable fast task lists for merge requests Closes #19745 See merge request gitlab-org/gitlab-ce!24779
\| * \| \| \| \| \|	Add fast tasklist support to MR tasklist	Fatih Acet	2019-02-07	5	-24/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also adds specs and fixes existing specs
\| * \| \| \| \| \|	Enable fast task lists for merge requests	Brett Walker	2019-02-07	7	-73/+98
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow single tasks to be updated quickly
* \| \| \| \| \| \|	Merge branch '2105-add-setting-for-first-day-of-the-week' into 'master'	Sean McGivern	2019-02-07	25	-6/+189
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add setting for first day of the week Closes #19282 and #2105 See merge request gitlab-org/gitlab-ce!22755
\| * \ \ \ \ \ \	Merge branch 'master' into ↵	Sean McGivern	2019-02-07	21	-219/+794
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fabsrc/gitlab-ce-2105-add-setting-for-first-day-of-the-week
\| * \ \ \ \ \ \ \	Merge branch 'master' into ↵	Sean McGivern	2019-02-07	167	-674/+2592
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fabsrc/gitlab-ce-2105-add-setting-for-first-day-of-the-week
\| * \| \| \| \| \| \| \|	Improve docs	Fabian Schneider	2019-02-07	2	-3/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add tests for preferences_helper	Fabian Schneider	2019-02-06	2	-4/+28
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add 'first_day_of_week' to API settings docs	Fabian Schneider	2019-02-06	1	-0/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Rename setting, fix wordings	Fabian Schneider	2019-02-06	11	-36/+28
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add helpers for first day of the week	Fabian Schneider	2019-02-06	5	-18/+36
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add default setting for first day of the week preference	Fabian Schneider	2019-02-06	3	-2/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add setting for first day of the week	Fabian Schneider	2019-02-06	23	-5/+144
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'docs-fixes-cluster-domain-documentation' into 'master'	Achilleas Pipinellis	2019-02-07	3	-7/+5
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes Cluster base domain documentation See merge request gitlab-org/gitlab-ce!25008
\| * \| \| \| \| \| \| \|	Fixes Cluster domain documentation	Mayra Cabrera	2019-02-07	3	-7/+5
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Uses the preferred way for introduced blocks instead of notes, on auto devops and cluster documentation. Also fixes some typos.
* \| \| \| \| \| \| \|	Merge branch '47149-override-squash-commits-message-clean' into 'master'	Phil Hughes	2019-02-07	20	-215/+783
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Override squash commit message" Closes #47149 See merge request gitlab-org/gitlab-ce!24724
\| * \| \| \| \| \| \|	Resolve "Override squash commit message"	Natalia Tepluhina	2019-02-07	20	-215/+783
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'sh-fix-ee-issue-8871' into 'master'	Sean McGivern	2019-02-07	1	-4/+11
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix failing test in spec/workers/post_receive_spec.rb Closes gitlab-ee#8871 See merge request gitlab-org/gitlab-ce!24993
\| * \| \| \| \| \|	Fix failing test in spec/workers/post_receive_spec.rbsh-fix-ee-issue-8871	Stan Hu	2019-02-06	1	-4/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is what was happening before: 1. `Project#set_timestamps_for_create` was called at creation time and set the `last_activity_at` and `last_repository_updated_at` to the current timestamp T. 2. The test ran `PostReceive#perform`, which then called `PostReceive#process_wiki_changes`. If less than 500 milliseconds elapsed since T, then the update would just set the timestamp to T. To fix this problem, we can just use Timecop to ensure at least one second has elapsed after attempting to process changes. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/8871
* \| \| \| \| \| \|	Merge branch '52363-update-cluster-and-ado-docs' into 'master'	Grzegorz Bizon	2019-02-07	3	-21/+45
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds a base domain doc section on cluster pages See merge request gitlab-org/gitlab-ce!24740
\| * \| \| \| \| \| \|	Adds a base domain doc section on cluster pages52363-update-cluster-and-ado-docs	Mayra Cabrera	2019-02-06	3	-21/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The changes are included for project and group cluster documentation pages. Also specifies that AUTO_DEVOPS_DOMAIN will be deprecated on 12.0 Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/52363
* \| \| \| \| \| \| \|	Merge branch '52363-ui-changes-to-cluster-and-ado-pages' into 'master'	Grzegorz Bizon	2019-02-07	23	-205/+489
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves domain setting to Clusters page Closes #52363 See merge request gitlab-org/gitlab-ce!24580
\| * \| \| \| \| \| \| \|	Addresses UX and BE comments:52363-ui-changes-to-cluster-and-ado-pages	Mayra Cabrera	2019-02-06	9	-166/+103
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Changes help text on clusters form to make it more explicit. - Removes unnecessary warnings on auto devops form - Simplifies cluster methods logic
\| * \| \| \| \| \| \| \|	Addresses backend/db review comments	Mayra Cabrera	2019-02-04	13	-24/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Fixes multiple typos on AutoDevops script - Add an alias to Clusters::Cluster#domain as base_domain, so it's more descriptive - Removes unnecessary memoization on qa specs - Changes migration to a post migration to deal better with traffic on big instances (like gitlab.com)
\| * \| \| \| \| \| \| \|	Use a single sql statement for ADO query	Mayra Cabrera	2019-02-04	2	-55/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since cluster_projects table does not have a lot of records, currently it has 11,638, it seems better to use a single sql statement to update all the records
\| * \| \| \| \| \| \| \|	Modifies ADO script to include new variable	Mayra Cabrera	2019-02-04	1	-12/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure KUBE_INGRESS_BASE_DOMAIN existence by setting his value to AUTO_DEVOPS_DOMAIN if the first one doesnt exists. Also made corresponding changes throughout the whole script Related to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24580
\| * \| \| \| \| \| \| \|	Moves domain setting to Cluster setting	Mayra Cabrera	2019-02-04	19	-62/+421
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes domain field to be on the Cluster page show, removing it from Auto DevOps setting. Also injects the new environment variable KUBE_INGRESS_BASE_DOMAIN into kubernetes#predefined_variables. Migration to move the information from ProjectAutoDevops#domain to Clusters::Cluster#domain. As well as necessary modifications to qa selectors Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52363
* \| \| \| \| \| \| \| \|	Merge branch 'ce-version-fix-failing-resolve-conflicts-spec' into 'master'	Sean McGivern	2019-02-07	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update spec/features/merge_request/user_resolves_conflicts_spec.rb See merge request gitlab-org/gitlab-ce!24996
\| * \| \| \| \| \| \| \| \|	Update spec/features/merge_request/user_resolves_conflicts_spec.rb	Phil Hughes	2019-02-07	1	-0/+2
\| \| \| \| \| \| \| \| \| \|