Commit Graph

41 Commits

Author SHA1 Message Date
GitLab Bot 2ac4833015 Add latest changes from gitlab-org/gitlab@master 2020-10-08 18:08:32 +00:00
GitLab Bot 47579e24f3 Add latest changes from gitlab-org/gitlab@master 2020-05-27 21:08:05 +00:00
GitLab Bot aca82d5ba4 Add latest changes from gitlab-org/gitlab@master 2020-04-24 18:09:46 +00:00
GitLab Bot b375c6c05f Add latest changes from gitlab-org/gitlab@master 2020-03-02 15:08:01 +00:00
GitLab Bot b7e6df1abd Add latest changes from gitlab-org/gitlab@master 2019-10-17 00:07:27 +00:00
Martin Wortschack 5660690787 Externalize strings in projects controllers
- concerns
- dashboard
- groups
- import
2019-03-27 16:52:52 +00:00
Rémy Coutable fa7ed15df6
Make Projects::DeployKeysController EE-ready
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-12-19 18:02:01 +01:00
Stan Hu 7be7f570dc Fix enabling project deploy key for admins
Admins would be prevented from adding a project deploy key since the
accessible keys would be restricted to the user's keys.

Also backports a spec for DeployKeysController from
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8432.
2018-11-16 23:18:06 -08: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
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
Mike Greiling c90cfbd4ea
ensure all project repository settings panels remain open after form submission 2018-08-08 01:17:43 -05:00
Lin Jen-Shin 4ee08b77bc Updates from `rubocop -a` 2018-07-09 21:13:08 +08:00
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
🙈 jacopo beschi 🙉 729f05f0e3 Adds Rubocop rule for line break around conditionals 2018-01-11 16:34:01 +00:00
haseeb cc2daa74d8 created services for keys 2017-09-15 15:35:24 +00:00
Alexander Randa c7bcebd56e Fix edit button for deploy keys available from other projects 2017-06-20 11:23:13 +00:00
Alexander Randa 3d70eeb5bb Implement ability to update deploy keys 2017-06-02 19:44:36 +03:00
Phil Hughes e11a702afc Re-wrote to match our docs - still not 100% sure but closer than it was 2017-04-28 17:06:19 +01:00
Jarka Kadlecova e0dc73527a Project deploy keys json end point 2017-03-24 11:53:47 +01:00
Adam Niedzielski e0d2f249b4 Return 404 if deploy key cannot be found in Projects::DeployKeysController#disable
Closes #29633
2017-03-23 15:49:24 +01:00
Jose Ivan Vargas 55b07533a9 Renamed the redirect_request concern to repository_settings_redirect
Also fixed naming of a test in the deploy_keys_presenter
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 2ee8644115 Fixed tests, changed dispatcher routing to the 'repository:show'
Also modified the render calls to the deploy_keys and protected_branches
partials
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
Ali Ibrahim c3508851bf Set current user as deploy key user 2016-09-03 02:12:02 +05:00
Ali Ibrahim 2b73aaa15a Allow to add deploy keys with write-access 2016-08-17 11:11:08 -04:00
Z.J. van de Weg 7e47a82899 Namespace EnableDeployKeyService under Projects 2016-08-08 20:59:51 +02:00
Z.J. van de Weg 554e18ab02 Create service for enabling deploy keys 2016-08-05 11:38:17 +02:00
Phil Hughes 756185533c Project deploy keys updated UI
Closes #13992
2016-04-25 16:26:41 +01:00
Stan Hu 9bfc531ec6 Redirect to a default path if HTTP_REFERER is not set
Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode,
and it's possible load balancers/proxies strip the HTTP_REFERER from
the request header. In these cases, default to some default path.

Closes #3122

Closes https://github.com/gitlabhq/gitlabhq/issues/9731
2015-10-20 07:45:48 -07:00
Robert Speicher 6e5473f930 Remove show actions from Admin and Project DeployKeys 2015-06-03 18:03:04 -04:00
Jeroen van Baarsen 5a4ebfb47a Fixed the Rails/ActionFilter cop
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-04-20 15:39:37 +02:00
Douwe Maan ed097df627 Clean up code. 2015-04-03 12:28:47 +02:00
Douwe Maan edc4a56d26 Allow admin to create public deploy keys that are accessible to any project. 2015-04-03 12:23:20 +02:00
Douwe Maan 7d2b34bd61 Satisfy Rubocop. 2015-03-17 16:00:32 +01:00
Douwe Maan 9c7fffb655 Delete deploy key when last connection to a project is destroyed. 2015-03-17 14:55:43 +01:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
2015-02-14 11:09:23 -07:00
Ciro Santilli 9e1b97ad99 Use @project on controllers, don't call method
Also memoize the method to ensure that other methods in
ApplicationController that rely on it can call it efficiently.
2014-10-19 23:36:23 +02:00
Dmitriy Zaporozhets 8fee5a0572
Make app works with strong params
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-26 23:24:17 +03:00
skv d89527839e fix most of warnings 2013-12-15 00:05:10 +04:00
Dmitriy Zaporozhets 2ed7cbfba4 Move projects controllers/views in Projects module 2013-06-23 19:47:22 +03:00