Commit Graph

691 Commits

Author SHA1 Message Date
Sean McGivern 75d04f6a29 Fix replying to commit comments on MRs from forks
A commit comment shows in the MR, but if the MR is from a fork, it will have a
different project ID to the MR's target project. In that case, add an
note_project_id param so that we can pick the correct project for the note.
2017-07-28 16:25:13 +01:00
Kamil Trzciński ac948684fc Merge branch '30634-protected-pipeline' into 'master'
Implement "Block pipelines on protected branches"

Closes #30634, #34616, and #33130

See merge request !11910
2017-07-25 15:04:23 +00:00
Rémy Coutable e43bda0ebb Merge branch 'dz-update-shoulda' into 'master'
Update shoulda-matchers gem to 3.1.2

See merge request !13040
2017-07-25 08:08:26 +00:00
Dmitriy Zaporozhets eafb03cfd5
Remove unnecessary set_flash.now from controller specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-07-24 15:21:16 +03:00
Jarka Kadlecova 2fa22a0729 Associate Issues tab only with internal issues tracker 2017-07-24 08:10:14 +02:00
Z.J. van de Weg 2086483b24 Rename build to pipeline for status badges
First commit in probably 2, for resolve gitlab-org/gitlab-ce#15582. This
commit is renaming files and classes from build to pipeline. Also
wording is editted to pipeline. Given `pipeline` had more characters
than `build`, I've made the field a bit wider. The width now matchers
the one for the coverage badge, so they look nice when in a table
format, or in a list.

As soon as this commit is merged to master, and released, the build.svg
is deprecated, meaning that all users which already placed a badge
should update it. However, to make sure it keeps working tests are added
for this case.
2017-07-21 10:22:09 +02:00
Alexander Randa e0ab5618a0 Wrong data type when testing webhooks 2017-07-20 15:12:06 +00:00
Lin Jen-Shin 43aa8866bc Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline
* upstream/master: (130 commits)
  Change auto-retry count to a correct value in docs
  Fix background migration cleanup specs
  Fix CI/CD job auto-retry specs
  Fix JS; make buttons sr accessibile; fix overlay
  remove redundant changelog entries
  Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3'
  Merge branch '33303-404-for-unauthorized-project' into 'security-9-3'
  Merge branch '33359-pers-snippet-files-location' into 'security-9-3'
  Merge branch 'bvl-remove-appearance-symlink' into 'security-9-3'
  Hide description about protected branches to non-member
  Update CHANGELOG.md for 9.0.11
  Update CHANGELOG.md for 9.1.8
  Update CHANGELOG.md for 8.17.7
  Update CHANGELOG.md for 9.2.8
  Update CHANGELOG.md for 9.3.8
  Respect blockquote line breaks in markdown
  35209 Add wip message to new navigation preference section
  Add github imported projects count to usage data
  Add versions to Prometheus metrics doc
  Add Bulgarian translations of Pipeline Schedules
  ...
2017-07-20 20:36:43 +08:00
Kamil Trzciński 542b675cf6 Merge branch 'fix/gb/fix-container-registry-tag-routing' into 'master'
Fix docker tag reference routing constraints

Closes #35220 and gitlab-com/support-forum#2246

See merge request !12961
2017-07-20 11:50:21 +00:00
Sean McGivern c6e979587a Merge branch '34930-fix-edited-by' into 'master'
Fix issue detail if user who last edited an issue was deleted

Closes #34930

See merge request !12933
2017-07-19 16:19:32 +00:00
Jarka Kadlecova a9d940bffc Use Ghost user when edited_by, merged_by deleted 2017-07-19 11:35:17 +02:00
Grzegorz Bizon 9f36012e02 Fix docker tag reference routing constraints 2017-07-19 10:30:57 +02:00
Lin Jen-Shin 7bd5e57125 Instead of adding master, stub_not_protect_default_branch 2017-07-18 23:48:14 +08:00
Felipe Artur 3715c1cfb5 Fix external issue trackers redirect 2017-07-18 11:44:47 -03:00
Lin Jen-Shin 65e722ee97 Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline
* upstream/master: (638 commits)
  Simplify background migrations stealing code
  Expire cached user IDs that can see the performance after 5 minutes
  Promote visibility level helpers from Group to Namespace
  Fix off-by-one error in background migration retries
  Recover from all exceptions when stealing bg migration
  Fix label creation from new list for subgroup projects
  move click handler to button. when on the icon it wasn't triggered in firefox
  Fix incorrect AWS ELB metrics.
  Fix wrong link to docs in docs styleguide
  Update issue-related docs
  Refactor groups docs
  Add subgroups limitations to Pages docs
  Update Google launcher details
  Split docs on IP whitelist for monitoring access
  Update health check docs
  Bump fog-core to 1.44.3 and fog providers' plugins to latest
  Introduce have_gitlab_http_status
  Remove Repository#search_files
  Update Pipeline's badge count in Merge Request and Commits view to match real-time content
  Fixes the user order being overriden in the autocomplete controller
  ...
2017-07-17 22:38:37 +08:00
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
Lin Jen-Shin 28553dbc05 Update tests due to permission changes 2017-07-04 21:56:41 +08: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