Commit graph

22 commits

Author SHA1 Message Date
Nick Thomas
11d0787961
Speed up Unicorn specs by using a dummy Rack application instead of GitLab 2017-11-22 19:51:57 +00:00
Bob Van Landuyt
9b0899cb80 Remove EE-specific group paths 2017-11-07 19:52:10 +01:00
Bob Van Landuyt
58d1d6a5c7 Free up some group reserved words 2017-11-07 19:52:09 +01:00
Bob Van Landuyt
5dde0536c3 Free up avatar, group_members and milestones as paths 2017-11-07 19:52:09 +01:00
Bob Van Landuyt
5d14337baf Free up labels as a group name 2017-11-07 19:52:09 +01:00
Douwe Maan
79e889122b Merge branch 'bvl-group-trees' into 'master'
Show collapsible tree on the project show page

Closes #30343

See merge request gitlab-org/gitlab-ce!14055
2017-10-17 10:03:03 +00:00
Valery Sizov
4f76a2e573 Remove boards from the list of reserved top paths 2017-10-13 11:28:56 +03:00
Shinya Maeda
1f14e9c2bc Remove unnecessary TOLLEVEL routes from path_regex.rb 2017-10-11 16:36:59 +09:00
Bob Van Landuyt
741fb49378 Merge branch 'master' into bvl-group-trees 2017-10-10 17:53:42 +02:00
Bob Van Landuyt
80780018a9 Update children route to handle projects and groups 2017-10-04 22:46:49 +02:00
Shinya Maeda
20abcbffae Add google_api to TOP_LEVEL_ROUTES. Import/Export model failure fix. Fix static analysys. 2017-10-04 16:04:45 +09:00
Felipe Artur
f5bb1789ee Fix specs BACKPORT 2017-09-04 16:55:29 -03:00
Bob Van Landuyt
bf114b3111 Add contents of public as forbidden top-level routes 2017-07-25 09:18:54 +02:00
Bob Van Landuyt
1dcf799c76 Remove a bunch of reserved top level routes
These don't seem to be used anywhere, so can be removed.
2017-07-25 09:18:54 +02:00
Bob Van Landuyt
6f26f6f79f Allow groups with the name system 2017-07-18 16:23:38 +02:00
Shinya Maeda
d228662fb7 Add dash for GROUP_ROUTES 2017-07-07 15:35:12 +09:00
Shinya Maeda
f8a2f6f115 Wrap additional routes by dash(-). And remove those routes from path_regex.rb. 2017-07-07 15:35:12 +09: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
DJ Mountney
1d1363e2bb Bring in security changes from the 9.2.5 release
Ran:
 - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch
 - git checkout -b 9-2-5-security-patch origin/v9.2.2
 - git apply patchfile.patch
 - git commit
 - [Got the sha ref for the commit]
 - git checkout -b upstream-9-2-security master
 - git cherry-pick <SHA of the patchfile commit>
 - [Resolved conflicts]
 - git cherry-pick --continue
2017-06-07 21:16:20 -07:00
Lin Jen-Shin
c94db0c290 Use - as the prefix so we don't conflict with namespaces
The decision was made around:
https://gitlab.com/gitlab-org/gitlab-ce/issues/26407#note_30624641
2017-05-26 23:06:20 +08:00
Douwe Maan
c27877cab5 Remove extra space 2017-05-24 16:56:16 -05:00
Douwe Maan
43b1750892 Revert "Remove changes that are not absolutely necessary"
This reverts commit b0498c176f
2017-05-24 20:59:26 +00:00