Commit Graph

33 Commits

Author SHA1 Message Date
Lin Jen-Shin 1ed6d1541c Rename :user_cannot_update to :protected_ref 2017-07-18 22:13:57 +08:00
Lin Jen-Shin 679789ee93 Rename can_push_or_merge_to_branch? to can_update_branch?
Also make sure pipeline would also check against tag as well
2017-07-18 21:56:28 +08:00
Lin Jen-Shin 3c7cb6ad9e Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline
* upstream/master: (25 commits)
  Remove unneeded asserts and add tests for inactive RequestStore
  Rename the methods to make it fit with current name
  Follow feedback on the merge request
  Make sure it checks against the tag only when it's a tag
  Renamed Gitaly services
  fix transient rspec failure due to Poll.js race condition
  Refactor variables initialization in dropzone_input.js
  cache the cache key...
  avoid #respond_to? in Cache.id_for
  cache DeclarativePolicy.class_for at the class level
  Update 9.3-to-9.4.md
  fix padding on filtered search dropdown. Styles should only apply to li in list
  Cache Note#notable for commits and fix tests
  Add changelog entry
  Update the comments for the new functionality
  Use RequestStoreWrap for Commit#author
  Skip dead jobs queue for web hooks and project services
  Add RequestStoreWrap to cache via RequestStore
  Don't track cached queries in Gitlab::PerformanceBar::PeekQueryTracker
  Add changelog entry
  ...
2017-07-18 20:16:43 +08:00
Lin Jen-Shin 7426e616e8 Make sure it checks against the tag only when it's a tag 2017-07-18 16:42:13 +08: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
Lin Jen-Shin c82a642b51 Protect manual actions against protected tag too 2017-07-17 16:49:54 +08:00
Kamil Trzcinski f108153cef Remove update|admin_pipeline_schedule from Project, and grant it in PipelineSchedule 2017-07-07 12:11:48 +02:00
Shinya Maeda 8a9d08af07 Fix policy by new guild line 2017-07-05 18:38:34 +09:00
Shinya Maeda 5c91e10b9e zh nich catches 2 2017-07-05 18:38:28 +09:00
Shinya Maeda 08ed07cf96 Improve PipelineSchedulePolicy 2017-07-05 18:38:25 +09:00
Shinya Maeda 6e8ea52be6 Add functionality and security. 2017-07-05 18:38:25 +09:00
Shinya Maeda c023bbbb50 Fix policy by new guild line 2017-07-05 18:36:19 +09:00
Shinya Maeda e1ba005811 zh nich catches 2 2017-07-05 18:36:19 +09:00
Shinya Maeda c3635dd1cb Improve PipelineSchedulePolicy 2017-07-05 18:36:18 +09:00
Shinya Maeda 1247ae0de9 Add functionality and security. 2017-07-05 18:36:18 +09:00
Lin Jen-Shin 005870d5ce Fix bad conflict resolution 2017-07-04 16:02:30 +08:00
Lin Jen-Shin 39573c6dde Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline
* upstream/master: (119 commits)
  Speed up operations performed by gitlab-shell
  Change the force flag to a keyword argument
  add image - issue boards - moving card
  copyedit == ee !2296
  Reset @full_path to nil when cache expires
  Replace existing runner links with icons and tooltips, move into btn-group.
  add margin between captcha and register button
  Eagerly create a milestone that is used in a feature spec
  Adjust readme repo width
  Resolve "Issue Board -> "Remove from board" button when viewing an issue gives js error and fails"
  Set force_remove_source_branch default to false.
  Fix rubocop offenses
  Make entrypoint and command keys to be array of strings
  Add issuable-list class to shared mr/issue lists to fix new responsive layout
  New navigation breadcrumbs
  Restore timeago translations in renderTimeago.
  Fix curl example paths (missing the 'files' segment)
  Automatically hide sidebar on smaller screens
  Fix typo in IssuesFinder comment
  Make Project#ensure_repository force create a repo
  ...
2017-07-04 05:15:27 +08:00
Lin Jen-Shin 23bfd8c13c Consistently check permission for creating pipelines,
updating builds and updating pipelines. We check against
being able to merge or push if the ref is protected.
2017-07-04 05:01:05 +08:00
http://jneen.net/ 37c401433b convert all the policies to DeclarativePolicy 2017-06-27 12:44:37 -07:00
Grzegorz Bizon 16368e6551 Check only a merge ability for protected actions 2017-05-31 10:20:22 +02:00
Zeger-Jan van de Weg 8df3997a92 Add Pipeline Schedules that supersedes experimental Trigger Schedule 2017-05-07 22:35:56 +00:00
Grzegorz Bizon 9363675380 Use update build policy instead of new play policy 2017-05-05 12:25:24 +02:00
Grzegorz Bizon a8231ea1be Merge branch 'master' into feature/gb/manual-actions-protected-branches-permissions
* master: (641 commits)
  Revert "Fix registry for projects with uppercases in path"
  Fix registry for projects with uppercases in path
  Move event icons into events_helper
  Reset New branch button when issue state changes
  Add link to environments on kubernetes.md
  Indent system notes on desktop screens
  Improve webpack-dev-server compatibility with non-localhost setups.
  Add changelog entry
  Fix recent searches icon alignment in Safari
  Use preload to avoid Rails using JOIN
  Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error
  Prepare for zero downtime migrations
  Fix filtered search input width for IE
  Fix the `gitlab:gitlab_shell:check` task
  Fixed random failures with Poll spec
  Include CONTRIBUTING.md file when importing .gitlab-ci.yml templates
  Let uses hide verbose output by default
  Separate examples for each other
  Collapse similar sibling scenarios
  Use empty_project for resources that are independent of the repo
  ...

Conflicts:
	app/views/projects/ci/builds/_build.html.haml
2017-04-13 15:08:52 +02:00
Grzegorz Bizon 7fc6b5b6ff Do not inherit build policy in pipeline policy 2017-04-12 12:57:13 +02:00
Grzegorz Bizon 6c6bc400d1 Move code for playing an action to separate service 2017-04-12 11:46:24 +02:00
Grzegorz Bizon b09465f38d Implement new rule for manual actions in policies 2017-04-12 11:26:18 +02:00
blackst0ne 11aff97d88 Remove the User#is_admin? method 2017-04-09 13:20:57 +11:00
Kamil Trzciński 32dee03b2f Improve pipeline triggers UI 2017-03-07 13:02:56 +00:00
Grzegorz Bizon 5e3f8db707 Fix build access policies when pipelines are public 2017-01-23 14:49:13 +01:00
Z.J. van de Weg 617f43c74b Guests can read builds if those are public
Fixes #18448
2016-12-04 15:48:50 +01:00
Lin Jen-Shin 6061c9fa3d Send only to users have :read_build access, feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342#note_17193335
2016-10-21 18:18:03 +08:00
http://jneen.net/ 5019185edd port runners, namespaces, group/project_members 2016-08-30 11:39:22 -07:00
http://jneen.net/ 16fe6dc7b1 port CommitStatus/Build 2016-08-30 11:39:22 -07:00