summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* WIPdm-commit-diff-discussions-in-mr-contextDouwe Maan2017-07-0423-103/+166
|
* Allow commenting on individual commits inside an MRDouwe Maan2017-07-048-20/+76
|
* Merge branch 'mk-workaround-intermittent-failure' into 'master'Douwe Maan2017-07-041-14/+24
|\ | | | | | | | | | | | | Hopefully reduce the rate of this intermittent failure in CI Closes #31128 See merge request !12567
| * Reduce 28 test runs to 4mk-workaround-intermittent-failureMichael Kozono2017-06-301-16/+20
| | | | | | | | 14 to 2, but these shared examples are used twice. This was already done in another context further down the file.
| * Rspec/AroundBlock doesn’t know about rspec-retryMichael Kozono2017-06-291-1/+1
| |
| * Increase CI retries to 4 for these examplesMichael Kozono2017-06-291-0/+6
| | | | | | | | By default it is 2 tries in CI.
* | Merge branch 'zj-i18n-pipeline-charts' into 'master'Douwe Maan2017-07-046-26/+166
|\ \ | | | | | | | | | | | | Strings ready for translation; Pipeline charts See merge request !12480
| * | Strings ready for translation; Pipeline chartszj-i18n-pipeline-chartsZ.J. van de Weg2017-07-036-26/+166
| | | | | | | | | | | | | | | Earlier, this was part of another MR, but that got split. Didn't pick that commit, as there were many merge conflicts. Vim macros seemed faster.
* | | Merge branch 'tc-namespace-license-checks--multiple-assignees' into 'master'Douwe Maan2017-07-0413-49/+145
|\ \ \ | | | | | | | | | | | | | | | | CE counterpart of: Namespace license checks for multiple assignees See merge request !11825
| * | | Ensure /reassign does not assign multiple usersToon Claes2017-06-201-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the assignee to last user in the array if multiple assignees aren't allowed. Also, use `parse_params` where possible.
| * | | Make MergeRequest respond to assignee_ids & assignee_ids=Toon Claes2017-06-205-32/+47
| | | | | | | | | | | | | | | | | | | | To make it simpler to assign users to an Issuable, make MergeRequest support the attribute `assignee_ids`.
| * | | Backport /reassign quick commandToon Claes2017-06-202-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | The /reassign quick command works even when no multiple assignees are allowed of there isn't any assignee yet. So for consistency, it's also be backported to CE. But it functions the same as the /assign quick action.
| * | | Backport issuable for assignee slash commands from EEToon Claes2017-06-202-8/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid conflicts when merge CE to EE by backporting code from EE. Instead of checking in `SlashCommands::InterpretService` what the issuable the type of the issuable is, ask the issuable if it is capable to do those thing and implement it in the issuable itself. The issuable will check if it's possible and if the licensed feature is available. This should also make it easier to ever add multiple assignees to MergeRequests.
| * | | Use helper method to set filtered search input attributesToon Claes2017-06-202-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The list of attributes for the filtered search input was getting long, so use a helper method to fill that hash. Also, for multiple issue assignees, a helper is more convenient because it would allow EE to override the behavior if MIA is supported.
| * | | Use FormHelper#issue_assignees_dropdown_options for Issue sidebarToon Claes2017-06-202-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | Avoid code duplication and limit the number of CE -> EE merge conflict by reusing `FormHelper#issue_assignees_dropdown_options` to set some assignee dropdown attributes.
| * | | [noop] Remove unused codeToon Claes2017-06-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | To make the code back in line with EE. [ci skip]
| * | | FormHelper#issue_assignees_dropdown_options never has multiple assigneesToon Claes2017-06-203-15/+7
| | | | | | | | | | | | | | | | | | | | | | | | Only EE supports multiple issue assignees, so this CE code should not contain code to have multiple assignees. EE will override the multiple issue assignees feature by overriding this method.
* | | | Merge branch '34141-allow-unauthenticated-access-to-the-users-api' into 'master'Rémy Coutable2017-07-048-22/+129
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow unauthenticated access to the `/api/v4/users` API Closes #34141 See merge request !12445
| * | | | Simplify authentication logic in the v4 users API for !12445.Timothy Andrew2017-07-043-10/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | | | Implement review comments for !12445 from @jneen.34141-allow-unauthenticated-access-to-the-users-apiTimothy Andrew2017-07-032-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | - Fix duplicate `prevent` declaration - Add spec for `GlobalPolicy`
| * | | | Merge remote-tracking branch 'origin/master' into ↵Timothy Andrew2017-06-30844-7962/+20533
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 34141-allow-unauthenticated-access-to-the-users-api - Modify policy code to work with the `DeclarativePolicy` refactor in 37c401433b76170f0150d70865f1f4584db01fa8.
| * | | | | Implement review comments for !12445 from @godfat and @rymai.Timothy Andrew2017-06-307-32/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use `GlobalPolicy` to authorize the users that a non-authenticated user can fetch from `/api/v4/users`. We allow access if the `Gitlab::VisibilityLevel::PUBLIC` visibility level is not restricted. - Further, as before, `/api/v4/users` is only accessible to unauthenticated users if the `username` parameter is passed. - Turn off `authenticate!` for the `/api/v4/users` endpoint by matching on the actual route + method, rather than the description. - Change the type of `current_user` check in `UsersFinder` to be more compatible with EE.
| * | | | | Add CHANGELOG entry for CE MR 12445Timothy Andrew2017-06-261-0/+4
| | | | | |
| * | | | | Allow unauthenticated access to the `/api/v4/users` API.Timothy Andrew2017-06-264-10/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The issue filtering frontend code needs access to this API for non-logged-in users + public projects. It uses the API to fetch information for a user by username. - We don't authenticate this API anymore, but instead - if the `current_user` is not present: - Verify that the `username` parameter has been passed. This disallows an unauthenticated user from grabbing a list of all users on the instance. The `UsersFinder` class performs an exact match on the `username`, so we are guaranteed to get 0 or 1 users. - Verify that the resulting user (if any) is accessible to be viewed publicly by calling `can?(current_user, :read_user, user)`
* | | | | | Merge branch '34647-fix-move_spec' into 'master'Sean McGivern2017-07-041-4/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wait_for_requests is not needed when AJAX is not in play Closes #34647 See merge request !12626
| * | | | | | wait_for_requests is not needed when AJAX is not in playRémy Coutable2017-07-041-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | Merge branch 'fix-pending-delete-forks' into 'master'Sean McGivern2017-07-042-29/+51
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't resolve fork relationships for projects pending delete See merge request !12603
| * | | | | | | Don't resolve fork relationships for projects pending deleteNick Thomas2017-07-042-2/+18
| | | | | | | |
| * | | | | | | Clean up the ForkedProjectLink specsNick Thomas2017-07-041-29/+35
| | | | | | | |
* | | | | | | | Merge branch 'gitaly-clean-up-tests' into 'master'Sean McGivern2017-07-048-144/+95
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Clean up Gitaly tests See merge request !12526
| * | | | | | | Remove unnecessary clear_stubs callsJacob Vosmaer2017-07-042-12/+0
| | | | | | | |
| * | | | | | | Add test for GitalyClient::Ref#find_ref_nameJacob Vosmaer2017-07-042-1/+10
| | | | | | | |
| * | | | | | | Add a UTF-8 encoding matcherJacob Vosmaer2017-06-305-8/+19
| | | | | | | |
| * | | | | | | Remove unnecessary contextsJacob Vosmaer2017-06-303-131/+74
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'tc-no-delete-protected-merged-branches' into 'master'Rémy Coutable2017-07-043-0/+14
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DeleteMergedBranchesService should not delete protected branches Closes #34553 See merge request !12624
| * | | | | | DeleteMergedBranchesService should not delete protected branchesToon Claes2017-07-043-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When deleting all the branches that are merged, the protected branches should not be deleted.
* | | | | | | Merge branch 'sh-optimize-project-commit-api' into 'master'Rémy Coutable2017-07-042-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize creation of commit API by using Repository#commit instead of Repository#commits See merge request !12623
| * | | | | | | Optimize creation of commit API by using Repository#commit instead of ↵sh-optimize-project-commit-apiStan Hu2017-07-032-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repository#commits Repository#commits is expensive because it has to use Rugged to walk the Git tree as opposed to doing a direct ref lookup. Improves performance in #34533
* | | | | | | | Merge branch 'hb-hide-archived-labels-from-group-issue-tracker' into 'master'Sean McGivern2017-07-043-4/+13
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide archived project labels from the group issue tracker Closes #26389 See merge request !12547
| * | | | | | | Hide archived project labels from group issue trackerHoracio Bertorello2017-06-303-4/+13
| | | | | | | |
* | | | | | | | Merge branch 'monitoring-dashboard-fix-y-label' into 'master'bjk/pipeline_metricPhil Hughes2017-07-044-3/+18
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the y_label not setting correctly for each graph on the monitoring dashboard Closes #34599 See merge request !12613
| * | | | | | | Fixed the y_label not setting correctly for each graph on the monitoring ↵monitoring-dashboard-fix-y-labelJose Ivan Vargas2017-07-034-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dashboard
* | | | | | | | Update CHANGELOG.md for 9.3.4James Edwards-Jones2017-07-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'jej-update-gitlab-shell-to-5-1-1' into 'master'James Edwards-Jones2017-07-031-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GITLAB_SHELL_VERSION to 5.1.1 See merge request !12615
| * | | | | | | | Update GITLAB_SHELL_VERSION to 5.1.1jej-update-gitlab-shell-to-5-1-1James Edwards-Jones2017-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update to >= 5.1.0 needed for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2240 on EE. Updated here to keep CE and EE on the same version. 5.1.1 includes https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/142 to revert changes which were causing problems with Post Receive hooks.
* | | | | | | | | Merge branch 'autosize-js-perf' into 'master'Clement Ho2017-07-031-19/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make autosize fields more performant and remove broken autosize handle See merge request !12532
| * | | | | | | | | Make autosize fields more performant and remove broken autosize handleBryce Johnson2017-07-031-19/+4
|/ / / / / / / / /
* | | | | | | | | Merge branch 'sh-allow-force-repo-create' into 'master'Sean McGivern2017-07-033-11/+28
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Project#ensure_repository force create a repo Closes gitlab-ee#2800 See merge request !12580
| * | | | | | | | | Change the force flag to a keyword argumentsh-allow-force-repo-createDouglas Barbosa Alexandre2017-07-032-3/+3
| | | | | | | | | |
| * | | | | | | | | Make Project#ensure_repository force create a repoStan Hu2017-06-303-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Geo, Project#ensure_repository is used to make sure that a Git repo is available to be fetched on a secondary. If a project were a fork, this directory would never be created. Closes gitlab-org/gitlab-ee#2800