Commit Graph

22 Commits

Author SHA1 Message Date
Phil Hughes 79f40f27fd Merge branch 'master' into deploy-keys-load-async 2017-05-04 15:54:16 +01:00
Rémy Coutable ef71bf6278 Merge branch '30529-remove-pages-tab-if-pages-isn-t-enabled' into 'master'
Disable navigation to Pages config if Pages is disabled

Closes #30529

See merge request !11008
2017-05-04 09:27:52 +00:00
Mark Fletcher 3ce95e7c16 Disable navigation to Pages config if Pages is disabled
* Regards project-level pages config
- Nav link is now shown only if Pages is enabled for instance
- Navigation to following controllers denied if Pages disabled:
  * projects/pages_controller
  * projects/pages_domains_controller
- 'disabled' partial removed
+ Test for pages_controller introduced
2017-05-04 14:11:40 +08:00
Phil Hughes f29e5d4d93 Merge branch 'master' into deploy-keys-load-async 2017-05-03 17:04:47 +01: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
Alexander Randa c504b88f07 Implement ability to update hooks 2017-04-28 11:49:57 +00:00
Kushal Pandya 03534bb2b8 Add sub-nav for Project Integration Services edit page 2017-04-25 16:02:39 +00:00
Kushal Pandya d20c5427af Render protected tags within Project Settings > Repository 2017-03-21 15:00:03 +05:30
Jose Ivan Vargas 4739e4a7f0 Fixed some typos inside the _project.html.haml partial 2017-03-07 23:26:57 -06:00
Jose Ivan Vargas 3225fd3688 Removed the settings gear button inside the Project to a tab 2017-03-07 23:26:57 -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 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 d00e00ad66 Corrected titles on the triggers and pipelines sections 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 8f391fd373 Renamed a file to make the transition to EE easier 2017-01-19 16:11:48 -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