Commit Graph

675 Commits

Author SHA1 Message Date
Filipa Lacerda 706d99aed8 Update Pipeline's badge count in Merge Request and Commits view to match real-time content 2017-07-14 15:52:54 +00:00
Kamil Trzciński a77158ff31 Merge branch 'feature/intermediate/32568-adding-variables-to-pipelines-schedules' into 'master'
Add variables to pipelines schedules

Closes #32568

See merge request !12372
2017-07-07 15:17:02 +00:00
Felipe Artur b5f596c3ff Native group milestones 2017-07-07 15:08:49 +00:00
Tim Zallmann 64e589c581 Resolve "Inconsistent location of members page between groups and projects" 2017-07-07 14:40:41 +00:00
Shinya Maeda e0c150da2f Merge from master(Fix conflicts) 2017-07-07 22:33:32 +09:00
Shinya Maeda 08fba1327f merge from master 2017-07-07 16:12:13 +09:00
Shinya Maeda 8c434a52fc gb nice catches 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
Shinya Maeda f8391bd782 Remove validates :key, uniqueness due to new validator covers the case 2017-07-07 02:49:24 +09:00
Filipa Lacerda 03976c8f62 Re-enable polling for environments 2017-07-06 14:31:24 +01:00
Douwe Maan fe13f11041 Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
Shinya Maeda 60425c2309 Reduce less meaningful test suits from pipeline_schedules_controller_spec.rb 2017-07-06 01:00:54 +09:00
Shinya Maeda 1acaf75d9f Implement ayufan validator 2017-07-06 00:45:26 +09:00
Shinya Maeda 0c9795a7b6 Improve spec: use go instead of put :update 2017-07-06 00:26:09 +09:00
Shinya Maeda dafc341794 Revert "Implement Ci::NestedUniquenessValidator"
This reverts commit 8f0a2b6d78.
2017-07-06 00:23:28 +09:00
Shinya Maeda 8f0a2b6d78 Implement Ci::NestedUniquenessValidator 2017-07-05 18:38:37 +09:00
Shinya Maeda 1bfa818a1f zj nice catchies 3 2017-07-05 18:38:35 +09:00
Shinya Maeda 2f70f3fa35 Improve spec 2017-07-05 18:38:35 +09:00
Shinya Maeda 621f9307ff Implement uniqueness_of_in_memory_validator 2017-07-05 18:38:35 +09:00
Shinya Maeda 124170093a Improved AccessMatchers and tests 2017-07-05 18:38:34 +09:00
Shinya Maeda 8a9d08af07 Fix policy by new guild line 2017-07-05 18:38:34 +09:00
Shinya Maeda 4fb645a678 Fix StaticAnlysys 2017-07-05 18:38:28 +09:00
Shinya Maeda f433fee057 Revert extra validation for duplication between same keys on a submit 2017-07-05 18:38:27 +09:00
Shinya Maeda 6e8ea52be6 Add functionality and security. 2017-07-05 18:38:25 +09:00
Shinya Maeda e364c118a0 Implement variables_attributes create/update cases 2017-07-05 18:38:10 +09:00
Shinya Maeda bbbd5521d2 Improve spec 2017-07-05 18:36:19 +09:00
Shinya Maeda c99f8e8884 Implement uniqueness_of_in_memory_validator 2017-07-05 18:36:19 +09:00
Shinya Maeda 9fe7f0c706 Improved AccessMatchers and tests 2017-07-05 18:36:19 +09:00
Shinya Maeda c023bbbb50 Fix policy by new guild line 2017-07-05 18:36:19 +09:00
Shinya Maeda 749f05ae34 Fix StaticAnlysys 2017-07-05 18:36:19 +09:00
Shinya Maeda a91f581e6d Revert extra validation for duplication between same keys on a submit 2017-07-05 18:36:19 +09:00
Shinya Maeda 1247ae0de9 Add functionality and security. 2017-07-05 18:36:18 +09:00
Shinya Maeda 3ea04616c3 Implement variables_attributes create/update cases 2017-07-05 18:36:18 +09:00
Douwe Maan adf792f1f7 Merge branch '33082-use-update_pipeline_schedule-for-edit-and-take_ownership-in-pipelineschedulescontroller' into 'master'
Use authorize_update_pipeline_schedule in PipelineSchedulesController

Closes #33082

See merge request !11846
2017-06-29 13:11:46 +00:00
Douwe Maan 70b05a8377 Split up MergeRequestsController 2017-06-28 18:17:44 -05:00
Shinya Maeda af129038e0 Fix sa 2017-06-28 21:58:31 +09:00
Shinya Maeda a513ae4ae5 use go instead of let proc 2017-06-28 21:58:31 +09:00
Shinya Maeda 07b0615e2b Fixed typo and hash alighment 2017-06-28 21:58:31 +09:00
Shinya Maeda c215b10426 Fix static analysis 2017-06-28 21:58:31 +09:00
Shinya Maeda ac7ad42281 IMprove access_matchers 2017-06-28 21:58:31 +09:00
Shinya Maeda 359d72ba3e Fix static analysys 2017-06-28 21:58:31 +09:00
Shinya Maeda 8026f47d67 Add changelog. Add AccessMatchersForController 2017-06-28 21:58:31 +09:00
Pawel Chojnacki 97c42df3b8 Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch 2017-06-22 15:05:52 +02:00
Grzegorz Bizon 0430b76441 Enable Style/DotPosition Rubocop 👮 2017-06-21 13:48:12 +00:00
Kamil Trzcinski 91a550f583 Disable environment list polling as it breaks deployboard 2017-06-21 14:10:37 +02:00
Pawel Chojnacki 19812e3eca Make queries not die when underlying data cannot be found 2017-06-20 16:09:38 +02:00
Pawel Chojnacki 6e4d533421 Move Prometheus service to project model 2017-06-16 20:48:34 +02:00
Pawel Chojnacki 9f2c992ff1 Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch 2017-06-16 18:19:41 +02:00
Pawel Chojnacki 64bb0d37d4 cleanup wip 2017-06-16 16:53:02 +02:00
Eric Eastwood ea090291bb Rename "Slash commands" to "Quick actions"
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27070

Deprecate "chat commands" in favor of "slash commands"

We looked for things like:

 - `slash commmand`
 - `slash_command`
 - `slash-command`
 - `SlashCommand`
2017-06-15 09:01:56 -05:00