Commit Graph

28 Commits

Author SHA1 Message Date
Zeger-Jan van de Weg 3155f5a272 Accept default branch param on notifaction services 2017-04-28 14:06:03 +00:00
Kushal Pandya 18506d4b8b Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'
# Conflicts:
#   app/assets/javascripts/dispatcher.js
#   app/assets/stylesheets/pages/projects.scss
2017-04-06 09:46:50 +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
Dmitriy Zaporozhets e8942846c6 Hide ancestor groups in the share group dropdown list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-03-21 11:00:06 +02:00
Dmitriy Zaporozhets 26f28f9654 Show members of parent groups on project members page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-03-09 10:23:57 +02: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
Jose Ivan Vargas 6004519546 Fixed tests, renamed files and methods 2017-02-06 14:51:18 -06:00
Jose Ivan Vargas 8ffe586b77 Changed the controller/route name to 'ci/cd' and renamed the corresponding files
Added tests to verify the access policy to the new controller
2017-02-06 14:51:18 -06:00
Jose Ivan Vargas 085d5eae8a Added private methods to initialize variables in the ci_cd_pipelines_controller 2017-02-06 14:51:18 -06:00
Jose Ivan Vargas 08ecab6013 changed pipelines controller name to ci_cd_pipelines 2017-02-06 14:51:18 -06:00
Jose Ivan Vargas 58110293d4 Converted the views to partials that compose the menu item "pipelines" 2017-02-06 14:51:18 -06:00
Jose Ivan Vargas 373411d18d Corrected code style and titles 2017-01-18 15:19:35 -06:00
Jose Ivan Vargas 9f0d794513 Moved the webhooks and services gear options to a single one called integrations 2017-01-18 15:19:35 -06:00
Jose Ivan Vargas 57b5612aaa Removed the "Groups" option from the settings gear
Fixed more tests
2017-01-03 10:52:14 -06:00
Jose Ivan Vargas ad58dec2e1 Added groups to members section, added a members finder 2017-01-03 10:52:14 -06:00
Jose Ivan Vargas 4cd139e948 Moved the members (project_members)option to a single controller called members
This controller is going to contain both the project members and groups options
for the settings gear.

Generated the route and modified the routing to point to the new members setting path
2017-01-03 10:52:14 -06:00