Commit Graph

45 Commits

Author SHA1 Message Date
GitLab Bot 889bf7a0ee Add latest changes from gitlab-org/gitlab@master 2021-03-16 18:11:53 +00:00
GitLab Bot a57cec4bb8 Add latest changes from gitlab-org/gitlab@master 2021-02-16 09:09:36 +00:00
GitLab Bot 62baa95f25 Add latest changes from gitlab-org/gitlab@master 2020-11-03 18:09:22 +00:00
GitLab Bot 2ac4833015 Add latest changes from gitlab-org/gitlab@master 2020-10-08 18:08:32 +00:00
GitLab Bot 1086ac5177 Add latest changes from gitlab-org/gitlab@master 2020-09-22 09:09:43 +00:00
GitLab Bot 5e99b288a0 Add latest changes from gitlab-org/gitlab@master 2020-05-14 03:07:52 +00:00
GitLab Bot aca82d5ba4 Add latest changes from gitlab-org/gitlab@master 2020-04-24 18:09:46 +00:00
GitLab Bot b158645575 Add latest changes from gitlab-org/gitlab@master 2020-04-23 00:09:41 +00:00
GitLab Bot b375c6c05f Add latest changes from gitlab-org/gitlab@master 2020-03-02 15:08:01 +00:00
GitLab Bot 1c8fa70f9d Add latest changes from gitlab-org/gitlab@master 2020-02-28 18:09:07 +00:00
GitLab Bot 866ca4e49f Add latest changes from gitlab-org/gitlab@master 2020-02-14 21:09:08 +00:00
GitLab Bot b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
Krasimir Angelov d745ff0431 Add username to deploy tokens
This new attribute is optional and used when set instead of the default
format `gitlab+deploy-token-#{id}`.

Empty usernames will be saved as null in the database.

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/50228.
2019-07-02 18:56:48 +00:00
Nick Thomas e8a675d35f
Remove the project_cleanup feature flag 2018-12-15 13:50:59 +00:00
Nick Thomas 9395d198f9
Use BFG object maps to clean projects 2018-12-06 18:58:00 +00:00
Stan Hu 3142eec0ff Revert "Merge branch 'deploy-tokens' into 'master'"
This reverts commit 3df32ac129, reversing
changes made to dd1295a30f.
2018-10-05 07:01:04 -07:00
gfyoung 12ee2753c1 Enable even more frozen string in app/controllers
Enables frozen string for some vestigial files as
well as the following:

* app/controllers/projects/**/*.rb
* app/controllers/sherlock/**/*.rb
* app/controllers/snippets/**/*.rb
* app/controllers/users/**/*.rb

Partially addresses #47424.
2018-09-25 22:43:49 -07:00
Rémy Coutable 3df32ac129 Merge branch 'deploy-tokens' into 'master'
use redirect instead of render to avoid creating keys when refresh - resolves #47942

Closes #47942

See merge request gitlab-org/gitlab-ce!20363
2018-09-25 09:37:08 +00:00
Yorick Peterse 2039c8280d
Disable existing offenses for the CodeReuse cops
This whitelists all existing offenses for the various CodeReuse cops, of
which most are triggered by the CodeReuse/ActiveRecord cop.
2018-09-11 17:32:00 +02:00
Muhammad Nuzaihan 725b5bc1de
use redirect instead of render to avoid creating keys when refresh - resolves #47942 2018-07-04 17:48:31 +08:00
Tiago Botelho 961255b107 Adds remote mirror table migration 2018-05-07 12:00:13 +02:00
Tiago Botelho 9a13059332 Backports every CE related change from ee-5484 to CE 2018-05-07 11:59:51 +02:00
Mayra Cabrera 8c27658043 Removes deploy tokens presenter 2018-04-06 21:20:17 -05:00
Mayra Cabrera 2991381630 Addresses database comments
- Adds a default on expires_at datetime
- Modifies deploy tokens views to handle default expires at value
- Use datetime_with_timezone where possible
- Remove unused scopes
2018-04-06 21:20:17 -05:00
Mayra Cabrera a475411f43 Fixes broken schema and minor changes 2018-04-06 21:20:16 -05:00
Kamil Trzciński 2c6c61815e Get rid of Redis when dealing with deploy tokens
We use controller actions to pass a newly created token and errors
2018-04-06 21:20:16 -05:00
Mayra Cabrera 8315861c9a Include ProjectDeployTokens
Also:
- Changes scopes from serializer to use boolean columns
- Fixes broken specs
2018-04-06 21:20:16 -05:00
Mayra Cabrera 345ac03b7a Address UX review
- Keep 'Deploy Section' open upon save, otherwise the token might get
  lost
- When an error appears, display the error inside the form and also keep
  the Deploy Section open
- Changue copy of revoke modal
2018-04-06 21:20:16 -05:00
Mayra Cabrera db18993f65 Create barebones for Deploytoken
Includes:
- Model, factories, create service and controller actions
- As usual, includes specs for everything
- Builds UI (copy from PAT)
- Add revoke action

Closes #31591
2018-04-06 21:20:16 -05:00
Jan c2823a4bda Resolve "Protected branches count is wrong when a wildcard includes several protected branches" 2018-04-04 10:37:44 +00:00
James Edwards-Jones 96106287db Deduplicate protected ref human_access_levels
Previously these were duplicated so they could be different for push/merge,
but this was no longer necessary after
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11232
2017-11-24 13:47:03 +00:00
James Edwards-Jones 07d7d8e659 Renamed ProtectedTag push_access_levels to create_access_levels 2017-04-04 03:38:58 +01:00
James Edwards-Jones f9e849c076 Cleaned up duplication with ProtectedRefAccess concern 2017-04-04 02:59:37 +01:00
James Edwards-Jones ff2713a570 Fix typos in ProtectedRef concern and whitespace detected by rubocop 2017-04-03 22:04:37 +01:00
James Edwards-Jones 9f4b8dba80 Clean up non TODO rubocop errors 2017-04-03 20:06:06 +01:00
James Edwards-Jones b8c7bef5c0 Extracted ProtectableDropdown to clean up Project#open_branches
Makes it clear this is only used in dropdowns, instead of cluttering up Project class. Since we only care about branch names, it is also possible to refactor out a lot of the set/reject logic.

A benchmark on Array/Set subtraction favoured using Arrays. This was with 5000 ‘branches’ and 2000 ‘protections’ to ensure a similar comparison to the commit which introduced using Set for intersection.

Comparison:
   array subtraction:      485.8 i/s
     set subtraction:      128.7 i/s - 3.78x slower
2017-04-03 17:19:53 +01:00
James Edwards-Jones f51eac1df9 Settings::RepositoryController includes protected tags in JS 2017-03-31 19:37:15 +01:00
Phil Hughes 12fe94c388 Merge branch 'master' into 26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages 2017-03-07 11:40:27 +00:00
Jose Ivan Vargas bd9887e617 Fixed repository_controller_spec
also added an #open_branches private method
2017-03-06 09:47:44 -06:00
Jose Ivan Vargas 43958926c5 Added delegations to comply with the new rubocop rules
Also fixed the deploy_keys view and moved the code from the repository_helper
to the repository_controller
2017-03-06 09:47:44 -06:00
Jose Ivan Vargas a29517dd0c Added tests for the repository_controller and repository_helper
Added specs for the deploy_keys_presenter and added a new method in the presenter
called #key_available?

Fixed some minor UX inconsistencies and added a concern to handle
redirection
2017-03-06 09:47:44 -06:00
Jose Ivan Vargas 336b818bcb Added access spec tests
Also created changelog and removed redundant code
2017-03-06 09:47:44 -06:00
Grzegorz Bizon 5967c17e80 Introduced the deploy keys presenter 2017-03-06 09:47:44 -06:00
Jose Ivan Vargas 0b74ae849d Created the gear settings entry and created a way to initialize both sections with one controller
Changed views to partials, created the repository view,
created a repository_helper to further aid the creation of variables
across different controllers
2017-03-06 09:47:43 -06:00
Jose Ivan Vargas c51d720366 Added repository controller and route for the settings namespace 2017-03-06 09:47:43 -06:00