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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove orphaned haml filesremove-orphans	Clement Ho	2017-07-06	2	-42/+0
\|
*	Merge branch 'merge-request-commits-table' into 'master'	Douwe Maan	2017-07-06	21	-123/+222
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add table for merge request commits Closes #30224 See merge request !12527
\| *	Add table for merge request commits	Sean McGivern	2017-07-06	21	-123/+222
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is an ID-less table with just three columns: an association to the merge request diff the commit belongs to, the relative order of the commit within the merge request diff, and the commit SHA itself. Previously we stored much more information about the commits, so that we could display them even when they were deleted from the repo. Since 8.0, we ensure that those commits are kept around for as long as the target repo itself is, so we don't need to duplicate that data in the database.
* \|	Merge branch '34702-draw-legacy-builds' into 'master'	Douwe Maan	2017-07-06	3	-38/+23
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Just draw :legacy_builds Closes #34702 See merge request !12681
\| * \|	Just draw :legacy_builds34702-draw-legacy-builds	Lin Jen-Shin	2017-07-06	3	-38/+23
\| \| \|
* \| \|	Merge branch '34727-simplified-member-settings' into 'master'	Clement Ho	2017-07-06	2	-3/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	34727 Remove two columned layout from project member settings Closes #34727 See merge request !12663
\| * \| \|	34727 Remove two columned layout from project member settings	tauriedavis	2017-07-06	2	-3/+6
\| \| \|/ \| \|/\|
* \| \|	Fixed CHANGELOG.md for 9.3.4 release	James Edwards-Jones	2017-07-06	1	-1/+1
\| \| \|
* \| \|	Merge branch ↵	Tim Zallmann	2017-07-06	4	-10/+16
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'34655-label-field-for-setting-a-chart-s-legend-text-is-not-working' into 'master' Resolve "`label` field for setting a chart's legend text is not working" Closes #34655 See merge request !12628
\| * \|	Added test for the chart legend	Jose Ivan Vargas	2017-07-06	3	-1/+7
\| \| \|
\| * \|	Use correct field for label name, fix default for unit to be blank	Joshua Lambert	2017-07-06	1	-9/+9
\| \| \|
* \| \|	Merge branch 'repo-limited-width' into 'master'	Filipa Lacerda	2017-07-06	1	-3/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit the file tree view container width Closes #34670 See merge request !12643
\| * \| \|	Limit the file tree view container widthrepo-limited-width	Phil Hughes	2017-07-05	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #34670
* \| \| \|	Merge branch 'helm-runner-doc-certs' into 'master'	Marin Jankovski	2017-07-06	1	-0/+53
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add GitLab Runner Helm Chart documenation for custom certificates See merge request !12594
\| * \| \| \|	Add GitLab Runner Helm Chart documenation for cucstom certificateshelm-runner-doc-certs	DJ Mountney	2017-06-30	1	-0/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This outlines how to provide the custom ssl certificate to the runner for accessing GitLab in the case that GitLab is using a custom/self-signed certificate.
* \| \| \| \|	Merge branch 'enable-polling-env' into 'master'	Kamil Trzciński	2017-07-06	3	-4/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-enable polling for environments See merge request !12678
\| * \| \| \| \|	Re-enable polling for environmentsenable-polling-env	Filipa Lacerda	2017-07-06	3	-4/+8
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'backport_slack_application_changes' into 'master'	Sean McGivern	2017-07-06	3	-14/+24
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport Service changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2259 See merge request !12653
\| * \| \| \| \|	Backport Service changes from ↵backport_slack_application_changes	Valery Sizov	2017-07-05	3	-14/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2259
* \| \| \| \| \|	Merge branch '34653-minor-ux-cleanups-for-performance-dashboard' into 'master'	Tim Zallmann	2017-07-06	6	-23/+40
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup minor UX issues in the performance dashboard Closes #34653 See merge request !12635
\| * \| \| \| \|	Cleanup minor UX issues in the performance dashboard	Jose Ivan Vargas	2017-07-06	6	-23/+40
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'revert-018f7e46' into 'master'	Phil Hughes	2017-07-06	2	-56/+19
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'winh-mr-widget-no-pipeline' into 'master'" See merge request !12674
\| * \| \| \| \| \|	Revert "Merge branch 'winh-mr-widget-no-pipeline' into 'master'"revert-018f7e46	Kamil Trzciński	2017-07-06	2	-56/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !12127
* \| \| \| \| \| \|	Merge branch '34716-environment-specific-variables-ce' into 'master'	Douwe Maan	2017-07-06	12	-35/+140
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backports for ee-2112 Closes #34716 See merge request !12671
\| * \| \| \| \| \| \|	Backports for ee-2112	Lin Jen-Shin	2017-07-06	12	-35/+140
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2112
* \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2017-07-06	2	-1/+41
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'34172_add_traditional_chinese_in_taiwan_translations_of_commits_page' into 'master' Add Traditional Chinese in Taiwan translations of Commits Page See merge request !12407
\| * \| \| \| \| \| \| \|	Synchronous discussion in the translation	Huang Tao	2017-07-06	1	-6/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	synchronize changes in community translation of msgid	黄涛	2017-07-05	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add Traditional Chinese in Taiwan translations of Commits Page	黄涛	2017-07-05	2	-53/+37
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch ↵	黄涛	2017-07-05	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'34172_add_traditional_chinese_in_taiwan_translations_of_commits_page' of gitlab.com:htve/gitlab-ce into 34172_add_traditional_chinese_in_taiwan_translations_of_commits_page
\| \| * \| \| \| \| \| \| \|	add changelog	黄涛	2017-06-23	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[skip ci]
\| \| * \| \| \| \| \| \| \|	Add Traditional Chinese in Taiwan translations of Commits Page	黄涛	2017-06-23	1	-0/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[skip ci]
\| * \| \| \| \| \| \| \| \|	add changelog	黄涛	2017-07-05	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[skip ci]
\| * \| \| \| \| \| \| \| \|	Add Traditional Chinese in Taiwan translations of Commits Page	黄涛	2017-07-05	1	-0/+52
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[skip ci]
* \| \| \| \| \| \| \| \|	Merge branch '33360-generate-kubeconfig' into 'master'	Kamil Trzciński	2017-07-06	8	-16/+150
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Generate KUBECONFIG in KubernetesService#predefined_variables Closes #33360 See merge request !12223
\| * \| \| \| \| \| \| \| \|	Encode certificate-authority-data in base64	Lin Jen-Shin	2017-07-06	3	-6/+15
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Rename KUBECONFIG_FILE to KUBECONFIG	Lin Jen-Shin	2017-07-06	4	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into 33360-generate-kubeconfig	Lin Jen-Shin	2017-07-06	2359	-20554/+43844
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (888 commits) Fix Rubocop offense Use a previous approach for cycle analytics dummy pipeline Allow admin to disable all restricted visibility levels Removes file_name_regex from Gitlab::Regex Remove IIFEs around several javascript classes Update CHANGELOG.md for 9.3.5 Add ProjectPathHelper cop Create and use project path helpers that only need a project, no namespace Handles realtime with 2 states for environments table Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'" Allow creation of files and directories with spaces in web UI Disable Flipper memoizer in tests to avoid transient failures Introduce cache policies for CI jobs fix sidebar padding for full-width items (Time Tracking help) Replace 'snippets/snippets.feature' spinach with rspec Rename ci_config_file to ci_config_path Add back Pipeline#ci_yaml_file_path due to all the troubles Revert change to design. Go back to scrollable page Fix cycle analytics tests by making pipeline valid Fixes the column widths for the new navigation options in settings ...
\| * \| \| \| \| \| \| \| \| \|	Fix rubocop offense33360-generate-kubeconfig	Lin Jen-Shin	2017-06-16	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Changelog entry, doc, and only pass KUBECONFIG_FILE	Lin Jen-Shin	2017-06-16	4	-3/+6
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Generate KUBECONFIG in KubernetesService#predefined_variables	Lin Jen-Shin	2017-06-16	6	-16/+138
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '18000-remember-me-for-oauth-login' into 'master'	Douwe Maan	2017-07-06	12	-4/+254
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix `migration:path` build for "Honor the 'Remember me' parameter for OAuth-based login" Closes #34713 See merge request !12668
\| * \| \| \| \| \| \| \| \| \|	Remove Authentiq from the OAuth login integration tests.	Timothy Andrew	2017-07-06	2	-5/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- This is causing autoload-related errors in the `migration:path` builds. We need to find a better way of testing this provider.
\| * \| \| \| \| \| \| \| \| \|	Add Jasmine tests for `OAuthRememberMe`	Timothy Andrew	2017-07-06	2	-0/+31
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix build for !11963.	Timothy Andrew	2017-07-06	3	-24/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Don't use `request.env['omniauth.params']` if it isn't present. - Remove the `saml` section from the `gitlab.yml` test section. Some tests depend on this section not being initially present, so it can be overridden in the test. This MR doesn't add any tests for SAML, so we didn't really need this in the first place anyway. - Clean up the test -> omniauth section of `gitlab.yml`
\| * \| \| \| \| \| \| \| \| \|	Implement review comments for !11963 from @filipa.	Timothy Andrew	2017-07-06	2	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Disable an ESLint check rather than work around it (by converting `OAuthRememberMe` from a regular class to a static class. - Scope `$` calls inside `OAuthRememberMe`
\| * \| \| \| \| \| \| \| \| \|	Implement review comments for !11963 from @adamniedzielski.	Timothy Andrew	2017-07-06	5	-19/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Change double quotes to single quotes. - Why is `OmniAuth.config.full_host` being reassigned in the integration test? - Use `map` over `map!` to avoid `dup` in the `gitlab:info` rake task - Other minor changes
\| * \| \| \| \| \| \| \| \| \|	Don't allow the `gitlab:env:info` rake task to mutate the list of omniauth ↵	Timothy Andrew	2017-07-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	providers. - The test for `rake gitlab:env:info` executed the rake task, which mutated the list of omniauth providers, breaking subsequent tests relying on this list. - I've changed the rake task to duplicate the providers list before modifying it.
\| * \| \| \| \| \| \| \| \| \|	Add CHANGELOG entry for CE MR 11963	Timothy Andrew	2017-07-06	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Get ESLint spec passing for the `OAuthRememberMe` class.	Timothy Andrew	2017-07-06	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \|