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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'speed-up-merge-request-all-commits-shas' into 'master'	Douwe Maan	2017-07-07	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Speed up `all_commit_shas` for new merge requests See merge request !12706
\| *	Speed up `all_commit_shas` for new merge requests	Sean McGivern	2017-07-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For merge requests created after 9.4, we have a `merge_request_diff_commits` table we can get all the SHAs from very quickly. We just need to exclude these when we load from the legacy format, by ignoring diffs with no serialised commits. Once these have been migrated in the background, every MR will see this improvement.
* \|	Resolve "Inconsistent location of members page between groups and projects"	Tim Zallmann	2017-07-07	6	-36/+16
\| \|
* \|	Merge branch 'bvl-backport-board-issue-create-service' into 'master'	Douwe Maan	2017-07-07	1	-0/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	This makes the `Boards::CreateService` more reusable for EE See merge request !12704
\| * \|	This makes the `Boards::CreateService` more reusable for EEbvl-backport-board-issue-create-service	Bob Van Landuyt	2017-07-07	1	-0/+2
\| \|/
* \|	Merge branch 'tc-follow-up-mia' into 'master'	Douwe Maan	2017-07-07	3	-20/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow-up from "Namespace license checks for multiple assignees" Closes gitlab-ee#2839 See merge request !12701
\| * \|	Remove /reassign quick actiontc-follow-up-mia	Toon Claes	2017-07-07	1	-16/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	/reassign should only work when multiple assignees are available. And since this is only the case for GitLab EE, remove it from CE. This was picked using 517c97eb12e44f354787313dd35ac7a1642f5b20 of gitlab-ee.
\| * \|	Remove CE from spec example descriptions	Toon Claes	2017-07-07	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	They are confusing.
* \| \|	Merge branch 'es-class-syntax' into 'master'	Tim Zallmann	2017-07-07	6	-43/+40
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor several javascript files to ES module syntax See merge request !12683
\| * \| \|	refactor SigninTabsMemoizer class to ES module syntax	Mike Greiling	2017-07-06	1	-9/+8
\| \| \| \|
\| * \| \|	refactor SingleFileDiff class to ES module syntax	Mike Greiling	2017-07-06	1	-1/+0
\| \| \| \|
\| * \| \|	refactor TaskList class to ES module syntax	Mike Greiling	2017-07-06	1	-26/+28
\| \| \| \|
\| * \| \|	refactor Todos class to ES module syntax	Mike Greiling	2017-07-06	1	-2/+2
\| \| \| \|
\| * \| \|	refactor VisibilitySelect class to ES module syntax	Mike Greiling	2017-07-06	1	-3/+1
\| \| \| \|
\| * \| \|	refactor ZenMode to ES module syntax	Mike Greiling	2017-07-06	1	-2/+1
\| \| \| \|
* \| \| \|	Merge branch 'fix-sha-attribute-no-table' into 'master'	Yorick Peterse	2017-07-07	1	-6/+25
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix ShaAttribute concern when there is no table Closes #34798 See merge request !12705
\| * \| \| \|	Fix ShaAttribute concern when there is no tablefix-sha-attribute-no-table	Sean McGivern	2017-07-07	1	-6/+25
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	When this is added to a new model, it would fail before the migrations were run - including when trying to run migrations in production mode!
* \| \| \|	Merge branch 'feature/intermediate/12729-group-secret-variables' into 'master'	Kamil Trzciński	2017-07-07	12	-13/+453
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Group secret variables Closes #12729 See merge request !12582
\| * \| \| \|	Fix to Variable was successfully created	Shinya Maeda	2017-07-07	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	Use new project_variables_path in this MR	Shinya Maeda	2017-07-07	1	-4/+4
\| \| \| \| \|
\| * \| \| \|	gb nice catches	Shinya Maeda	2017-07-07	2	-2/+2
\| \| \| \| \|
\| * \| \| \|	Add CASE When Clause for saving order when using where IN	Shinya Maeda	2017-07-07	1	-5/+12
\| \| \| \| \|
\| * \| \| \|	Basic BE change	Shinya Maeda	2017-07-07	12	-9/+442
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix static-snalysis Move the precedence of group secure variable before project secure variable. Allow project_id to be null. Separate Ci::VariableProject and Ci::VariableGroup Add the forgotton files Add migration file to update type of ci_variables Fix form_for fpr VariableProject Fix test Change the table structure according to the yorik advice Add necessary migration files. Remove unnecessary migration spec. Revert safe_model_attributes.yml Fix models Fix spec Avoid self.variable. Use becomes for correct routing. Use unique index on group_id and key Add null: false for t.timestamps Fix schema version Rename VariableProject and VariableGroup to ProjectVariable and GroupVariable Rename the rest of them Add the rest of files Basic BE change Fix static-snalysis Move the precedence of group secure variable before project secure variable. Allow project_id to be null. Separate Ci::VariableProject and Ci::VariableGroup Add the forgotton files Add migration file to update type of ci_variables Fix form_for fpr VariableProject Fix test Change the table structure according to the yorik advice Add necessary migration files. Remove unnecessary migration spec. Revert safe_model_attributes.yml Fix models Fix spec Avoid self.variable. Use becomes for correct routing. Use unique index on group_id and key Add null: false for t.timestamps Fix schema version Rename VariableProject and VariableGroup to ProjectVariable and GroupVariable Rename the rest of them Add the rest of files Implement CURD Rename codes related to VariableGroup and VariableProject FE part Remove unneccesary changes Make Fe code up-to-date Add protected flag to migration file Protected group variables essential package Update schema Improve doc Fix logic and spec for models Fix logic and spec for controllers Fix logic and spec for views(pre feature) Add feature spec Fixed bugs. placeholder. reveal button. doc. Add changelog Remove unnecessary comment godfat nice catches Improve secret_variables_for arctecture Fix spec Fix StaticAnlysys & path_regex spec Revert "Improve secret_variables_for arctecture" This reverts commit c3216ca212322ecf6ca534cb12ce75811a4e77f1. Use ayufan suggestion for secret_variables_for Use find instead of find_by Fix spec message for variable is invalid Fix spec remove variable.group_id = group.id godffat spec nitpicks Use include Gitlab::Routing.url_helpers for presenter spec
* \| \| \|	Merge branch 'gitaly-mandatory' into 'master'	Sean McGivern	2017-07-07	2	-7/+5
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Remove option to disable Gitaly in Rails See merge request !12677
\| * \| \|	Remove option to disable Gitaly completely	Jacob Vosmaer	2017-07-07	2	-7/+5
\| \| \| \|
* \| \| \|	Merge branch 'dm-readme-auxiliary-blob-viewer-without-wiki' into 'master'	Sean McGivern	2017-07-07	1	-0/+49
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't show auxiliary blob viewer for README when there is no wiki Closes #34732 See merge request !12689
\| * \| \|	Don't show auxiliary blob viewer for README when there is no wikidm-readme-auxiliary-blob-viewer-without-wiki	Douwe Maan	2017-07-06	1	-0/+49
\| \| \|/ \| \|/\|
* \| \|	Merge branch '33748-fix-n-plus-1-query-in-the-projects-api' into 'master'	Robert Speicher	2017-07-07	1	-2/+39
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix some N+1 queries in the GET /projects API Closes #33748 See merge request !12679
\| * \| \|	Fix some N+1 queries in the GET /projects API	Rémy Coutable	2017-07-07	1	-2/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'merge-request-commits-table' into 'master'	Douwe Maan	2017-07-06	9	-38/+70
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add table for merge request commits Closes #30224 See merge request !12527
\| * \| \| \|	Add table for merge request commits	Sean McGivern	2017-07-06	9	-38/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 ↵	Tim Zallmann	2017-07-06	2	-1/+3
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	2	-1/+3
\| \|/ / /
* \| \| \|	Re-enable polling for environmentsenable-polling-env	Filipa Lacerda	2017-07-06	1	-4/+2
\| \|/ / \|/\| \|
* \| \|	Merge branch 'revert-018f7e46' into 'master'	Phil Hughes	2017-07-06	1	-48/+18
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-48/+18
\| \|/ / \| \| \| \| \| \|	This reverts merge request !12127
* \| \|	Merge branch '34716-environment-specific-variables-ce' into 'master'	Douwe Maan	2017-07-06	4	-13/+63
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backports for ee-2112 Closes #34716 See merge request !12671
\| * \| \|	Backports for ee-2112	Lin Jen-Shin	2017-07-06	4	-13/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2112
* \| \| \|	Merge branch '33360-generate-kubeconfig' into 'master'	Kamil Trzciński	2017-07-06	4	-15/+94
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Generate KUBECONFIG in KubernetesService#predefined_variables Closes #33360 See merge request !12223
\| * \| \| \|	Encode certificate-authority-data in base64	Lin Jen-Shin	2017-07-06	2	-5/+14
\| \| \| \| \|
\| * \| \| \|	Rename KUBECONFIG_FILE to KUBECONFIG	Lin Jen-Shin	2017-07-06	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'upstream/master' into 33360-generate-kubeconfig	Lin Jen-Shin	2017-07-06	834	-8050/+17855
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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 ...
\| * \| \| \|	Changelog entry, doc, and only pass KUBECONFIG_FILE	Lin Jen-Shin	2017-06-16	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Generate KUBECONFIG in KubernetesService#predefined_variables	Lin Jen-Shin	2017-06-16	4	-15/+86
\| \| \| \| \|
* \| \| \| \|	Merge branch '18000-remember-me-for-oauth-login' into 'master'	Douwe Maan	2017-07-06	5	-1/+160
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+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	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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 @adamniedzielski.	Timothy Andrew	2017-07-06	3	-16/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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
\| * \| \| \|	Add Omniauth OAuth config to the test section of `gitlab.yml`	Timothy Andrew	2017-07-06	1	-51/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- I tried to get this to work by stubbing out portions of the config within the test. This didn't work as expected because Devise/Omniauth loaded before the stub could run, and the stubbed config was ignored. - I attempted to fix this by reloading Devise/Omniauth after stubbing the config. This successfully got Devise to load the stubbed providers, but failed while trying to access a route such as `user_gitlab_omniauth_authorize_path`. - I spent a while trying to figure this out (even trying `Rails.application.reload_routes!`), but nothing seemed to work. - I settled for adding this config directly to `gitlab.yml` rather than go down this path any further.