7 commits

Author	SHA1	Message	Date
GitLab Bot	587794b4b8	Add latest changes from gitlab-org/gitlab@master	2019-10-02 00:06:26 +00:00
Thong Kuah	94bb660460	Add frozen_string_literal to spec/factories ... Using the sed script from https://gitlab.com/gitlab-org/gitlab-ce/issues/59758	2019-07-26 13:18:39 +12:00
Matija Čupić	316889cb47	Revert "Merge branch 'revert-8baf9e5f' into 'master'" ... This reverts commit f5201a816f, reversing changes made to 48e6db0dad.	2019-02-27 12:52:53 +01:00
Kamil Trzciński	7b445f9b15	Revert "Merge branch '13784-simple-masking-of-protected-variables-in-logs' into 'master'" ... This reverts merge request !25293	2019-02-26 17:32:23 +00:00
Matija Čupić	c9125c4786	Add Maskable concern for CI variables ... This adds a concern that abstracts the concept of masking a variable, including the RegEx for validation.	2019-02-26 14:03:42 +00:00
Rémy Coutable	4af9d592c5	Replace factory_girl_rails with factory_bot_rails ... I've followed the [upgrade guide](https://github.com/thoughtbot/factory_bot/blob/4-9-0-stable/UPGRADE_FROM_FACTORY_GIRL.md) and ran these two commands: ``` grep -e FactoryGirl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|FactoryGirl|FactoryBot|" grep -e factory_girl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|factory_girl|factory_bot|" ``` Signed-off-by: Rémy Coutable <remy@rymai.me>	2017-12-14 15:01:55 +01:00
Shinya Maeda	5b0954759c	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 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	2017-07-07 15:33:17 +09:00