Commit graph

11 commits

Author SHA1 Message Date
Douwe Maan
536a47b4b7 Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'security-10-3'
[10.3] Migrate `can_push` column from `keys` to `deploy_keys_project`

See merge request gitlab/gitlabhq!2276

(cherry picked from commit f6ca52d31bac350a23938e0aebf717c767b4710c)

1f2bd3c0 Backport to 10.3
2018-01-16 17:04:51 -08:00
Phil Hughes
ff0f74ac6e
Tidy up main JS file 2018-01-10 11:07:42 +00:00
Filipa Lacerda
3c19c971df
Merge branch 'master' into 38869-datetime
* master: (112 commits)
  small change to make less conflict with EE version
  Add cop for use of remove_column
  Resolve merge conflicts with dev.gitlab.org/master after security release
  add index for doc/administration/operations/
  Remove RubySampler#sample_objects for performance as well
  Bugfix: User can't change the access level of an access requester
  Add spec for removing issues.assignee_id
  updated imports
  Keep track of storage check timings
  Remove a header level in the new 'Automatic CE->EE merge' doc
  Improve down step of removing issues.assignee_id column
  Fix specs after removing assignee_id field
  Remove issues.assignee_id column
  Resolve conflicts in app/models/user.rb
  Fix image view mode
  Do not raise when downstream pipeline is created
  Remove the need for destroy and add a comment in the spec
  Use build instead of create in importer spec
  Simplify normalizing of paths
  Remove allocation tracking code from InfluxDB sampler for performance
  ...
2017-12-11 19:42:58 +00:00
Phil Hughes
307e024c12
Fixed remove deploy key loading icon not being removed after canceling
Closes #37595
2017-12-07 12:57:36 +00:00
Filipa Lacerda
139ce1c445
Export date utility functions as ES6 modules 2017-12-07 11:09:17 +00:00
Winnie Hellmann
2955e95604 Clean up Vue warnings in tests 2017-06-20 08:05:55 +00:00
Alexander Randa
3d70eeb5bb Implement ability to update deploy keys 2017-06-02 19:44:36 +03:00
Phil Hughes
136baeda50 Fixed Karma spec 2017-05-04 17:31:59 +01:00
Phil Hughes
5c91113c5b Fixed karma specs 2017-05-03 17:13:02 +01:00
Phil Hughes
4134d70062 Component specs 2017-05-02 12:03:58 +01:00
Phil Hughes
96ea22208f Started specs [ci skip] 2017-05-02 08:29:39 +01:00