- 05 Jul, 2017 2 commits
-
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
* upstream/master: (67 commits) Revert "Merge branch 'revert-12499' into 'master'" Prevent accidental deletion of protected MR source branch by repeating checks before actual deletion Document that GitLab 9.3 requires the TRIGGER permission on MySQL Instrument Unicorn with Ruby exporter Remove group modal like remove project modal. Closes #33130 Update prometheus client gem Enables the option in user preferences to turn on the new navigation Simplify authentication logic in the v4 users API for !12445. wait_for_requests is not needed when AJAX is not in play Don't resolve fork relationships for projects pending delete Clean up the ForkedProjectLink specs Remove unnecessary clear_stubs calls Add test for GitalyClient::Ref#find_ref_name DeleteMergedBranchesService should not delete protected branches Optimize creation of commit API by using Repository#commit instead of Repository#commits Update CHANGELOG.md for 9.3.4 Make autosize fields more performant and remove broken autosize handle Update GITLAB_SHELL_VERSION to 5.1.1 Fixed the y_label not setting correctly for each graph on the monitoring dashboard Refactor and copyedit "Using Docker images" docs ...
-
- 04 Jul, 2017 38 commits
-
-
Douwe Maan authored
Add Italian translation of Cycle Analytics Page & Project Page & Repository Page Closes #34544 See merge request !12578
-
Sean McGivern authored
Prevent accidental deletion of protected MR source branch by repeating checks before actual deletion Closes #34456 See merge request !12574
-
Sean McGivern authored
Revert "Merge branch 'revert-12499' into 'master'" See merge request !12633
-
Grzegorz Bizon authored
Update prometheus client gem See merge request !12632
-
Sean McGivern authored
Document that GitLab 9.3 requires the TRIGGER permission on MySQL Closes #34358 See merge request !12573
-
Rémy Coutable authored
no trailing / leading hyphens in CI_COMMIT_REF_SLUG. Closes #32035 See merge request !11218
-
Filipa Lacerda authored
Enables the option in user preferences to turn on the new navigation See merge request !12630
-
Douwe Maan authored
This reverts merge request !12557
-
Paweł Chojnacki authored
# Conflicts: # Gemfile.lock
-
Douwe Maan authored
Prevent accidental deletion of protected MR source branch by repeating checks before actual deletion
-
Douwe Maan authored
-
Rémy Coutable authored
Instrument Unicorn with Ruby exporter Closes #33410 See merge request !12115
-
Paweł Chojnacki authored
-
Lin Jen-Shin authored
-
Achilleas Pipinellis authored
Add documentation for extended docker configuration options for CI See merge request !12164
-
Rémy Coutable authored
Remove group modal like remove project modal. Closes #33130 Closes #33130 See merge request !12569
-
Diego Souza authored
-
Douwe Maan authored
Hopefully reduce the rate of this intermittent failure in CI Closes #31128 See merge request !12567
-
Douwe Maan authored
Strings ready for translation; Pipeline charts See merge request !12480
-
Douwe Maan authored
CE counterpart of: Namespace license checks for multiple assignees See merge request !11825
-
Rémy Coutable authored
Allow unauthenticated access to the `/api/v4/users` API Closes #34141 See merge request !12445
-
Lin Jen-Shin authored
-
Pawel Chojnacki authored
-
Phil Hughes authored
-
Sean McGivern authored
wait_for_requests is not needed when AJAX is not in play Closes #34647 See merge request !12626
-
Sean McGivern authored
Don't resolve fork relationships for projects pending delete See merge request !12603
-
Sean McGivern authored
Clean up Gitaly tests See merge request !12526
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
So that we cache the result of UserAccess#can_push_or_merge_to_branch? in RequestStore, avoiding querying ProtectedBranch over and over for the list of pipelines (i.e. in PipelineSerializer) I don't think this is ideal because I don't like the idea of RequestStore in general, but this is the easiest way to cache it without changing the architecture. In the future we should cache more explicitly rather than this kind of global store.
-
Lin Jen-Shin authored
-
Timothy Andrew authored
- Rather than using an explicit check to turn off authentication for the `/users` endpoint, simply call `authenticate_non_get!`. - All `GET` endpoints we wish to restrict already call `authenticated_as_admin!`, and so remain inacessible to anonymous users. - This _does_ open up the `/users/:id` endpoint to anonymous access. It contains the same access check that `/users` users, and so is safe for use here. - More context: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12445#note_34031323
-
Rémy Coutable authored
Also, using page.current_path instead of current_url and move the URL expectation after the page content expectations. Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
DeleteMergedBranchesService should not delete protected branches Closes #34553 See merge request !12624
-
Nick Thomas authored
-
Nick Thomas authored
-
Jacob Vosmaer authored
-
Jacob Vosmaer authored
-
Rémy Coutable authored
Optimize creation of commit API by using Repository#commit instead of Repository#commits See merge request !12623
-