Commit graph

12 commits

Author SHA1 Message Date
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
c82a642b51 Protect manual actions against protected tag too 2017-07-17 16:49:54 +08: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/
963b374dc7 update the specs to not require a set to be returned 2017-06-27 12:41:54 -07:00
Robert Speicher
a6ec5121f0 Correct RSpec/SingleLineHook cop offenses 2017-06-14 13:18:56 -05:00
Grzegorz Bizon
9363675380 Use update build policy instead of new play policy 2017-05-05 12:25:24 +02:00
Grzegorz Bizon
b09465f38d Implement new rule for manual actions in policies 2017-04-12 11:26:18 +02: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