summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Getting on par with EETomislav Nikic2019-07-244-6/+7
| | | | | | This commit covers all the files that where changed in the identically named branch on EE that is creating an elasticsearch test case.
* Merge branch 'ce-port-315-log-impersonation-actions-in-audit-log' into 'master'Ash McKenzie2019-07-232-4/+14
|\ | | | | | | | | CE Port: Log impersonation actions in audit log See merge request gitlab-org/gitlab-ce!31039
| * CE Port: Log impersonation actions in audit logce-port-315-log-impersonation-actions-in-audit-logmanojmj2019-07-232-4/+14
| | | | | | | | | | | | This change adds audit logs for user impersonation when an admin starts/stops impersonating another user.
* | Merge branch 'if-64257-active_session_lookup_key_cleanup' into 'master'Bob Van Landuyt2019-07-231-4/+4
|\ \ | | | | | | | | | | | | Rake task to cleanup expired ActiveSession lookup keys See merge request gitlab-org/gitlab-ce!30668
| * | Rake task to cleanup expired ActiveSession lookup keysif-64257-active_session_lookup_key_cleanupImre Farkas2019-07-221-4/+4
| | | | | | | | | | | | | | | | | | | | | In some cases ActiveSession.cleanup was not called after authentication, so for some user ActiveSession lookup keys grew without ever cleaning up. This Rake task manually iterates over the lookup keys and removes ones without existing ActiveSession.
* | | Merge branch 'gsemet/gitlab-ce-gsemet-master-patch-33258' into 'master'Sean McGivern2019-07-231-2/+10
|\ \ \ | | | | | | | | | | | | | | | | Multiple pipeline support for Build status See merge request gitlab-org/gitlab-ce!30828
| * | | Add specs for specifying pipeline behaviorMatija Čupić2019-07-231-2/+10
| | | | | | | | | | | | | | | | | | | | Adds specs for testing the new behavior of specifying a pipeline when POSTing a status.
* | | | Merge branch 'rm-src-branch' into 'master'Grzegorz Bizon2019-07-231-19/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Support remove source branch on merge w/ push options See merge request gitlab-org/gitlab-ce!30728
| * | | | Refactor create_params and update_paramsrm-src-branchChristian Couder2019-07-171-23/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's move shared code between create_params and update_params into a new base_params. update_params becomes very thin, but it still may be clearer that the params are being shared if we have a method called base_params, rather than have create_params merge in update_params.
| * | | | Support rm src branch on merge w/ push optionChristian Couder2019-07-171-0/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeRequests::PushOptionsHandlerService has been updated to allow creating and updating merge requests with the `remove_source_branch` set using git push options. To create a new merge request and set it to remove the source branch when it is merged: git push -u origin -o merge_request.create \ -o merge_request.remove_source_branch To update an existing merge request and set it to remove the source branch when it is merged: git push -u origin -o merge_request.remove_source_branch Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/64320
* | | | Bring backward compatibility for request profilesKamil Trzciński2019-07-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that we missed the backward compatibility support for profiles in the existing folder. This commit also fixes some specs to be idempotent and work in a temporary directory which not always seems to be the case. This commit also brings the profile_spec.rb which seems to be missing.
* | | | Merge branch '6544-remove-scss-diff-ce' into 'master'Phil Hughes2019-07-232-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Resolve difference in app/assets/stylesheets/application.scss See merge request gitlab-org/gitlab-ce!31007
| * | | | Resolve difference in app/assets/stylesheets/application.scss6544-remove-scss-diff-ceLukas Eipert2019-07-222-0/+9
| | | | |
* | | | | Merge branch 'leipert-resolve-ee-diff' into 'master'Phil Hughes2019-07-231-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Port common class only used in EE See merge request gitlab-org/gitlab-ce!31008
| * | | | | Port common class only used in EEleipert-resolve-ee-diffLukas Eipert2019-07-221-0/+1
| | | | | |
* | | | | | hoverable area on collapsed sidebar iconsMichel Engelen2019-07-232-20/+32
| | | | | |
* | | | | | Merge branch 'update-gitlab-runner-helm-chart-to-0-7-0' into 'master'Grzegorz Bizon2019-07-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Runner Helm Chart to 0.7.0/12.1.0 See merge request gitlab-org/gitlab-ce!30950
| * | | | | | Update GitLab Runner Helm Chart to 0.7.0update-gitlab-runner-helm-chart-to-0-7-0Steve Azzopardi2019-07-191-1/+1
| | | | | | |
* | | | | | | Add review remarksGosia Ksionek2019-07-221-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cr remarks Add cr remarks
* | | | | | | Merge branch 'fix-i18n-updated-projects' into 'master'Clement Ho2019-07-221-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix translation of 'Updated' term in projects list See merge request gitlab-org/gitlab-ce!30958
| * | | | | | | Fix translation of 'Updated' term in projects listPaul Gascou-Vaillancourt2019-07-221-1/+1
| | | | | | | |
* | | | | | | | Validate certificate chain only if it's changedVladimir Shushlin2019-07-221-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This validation prevents the domain from being saved from the UI e.g. when user tries to enable Let's Encrypt integration
* | | | | | | Merge branch 'maintainers-can-create-subgroup' into 'master'Sean McGivern2019-07-227-2/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a group setting to allow Maintainers to create sub-groups See merge request gitlab-org/gitlab-ce!29718
| * | | | | | | Make Group#subgroup_creation_level return Owner if it is nil in DBFabio Papa2019-07-191-1/+1
| | | | | | | |
| * | | | | | | Apply changes recomended by merge request coachFabio Papa2019-07-191-0/+4
| | | | | | | |
| * | | | | | | Remove AR hook to set the default subgroup_creation_levelFabio Papa2019-07-191-6/+0
| | | | | | | |
| * | | | | | | Make maintainers the default setting for creating subgroupsFabio Papa2019-07-191-4/+6
| | | | | | | |
| * | | | | | | Make the group model return maintainer level when it is not setFabio Papa2019-07-191-0/+4
| | | | | | | |
| * | | | | | | Remove AR hook to set the default subgroup_creation_levelFabio Papa2019-07-191-6/+0
| | | | | | | |
| * | | | | | | Make maintainers the default setting for creating subgroupsFabio Papa2019-07-191-4/+6
| | | | | | | |
| * | | | | | | Apply changes recomended by merge request coachFabio Papa2019-07-191-0/+4
| | | | | | | |
| * | | | | | | Remove AR hook to set the default subgroup_creation_levelFabio Papa2019-07-191-6/+0
| | | | | | | |
| * | | | | | | Make maintainers the default setting for creating subgroupsFabio Papa2019-07-191-4/+6
| | | | | | | |
| * | | | | | | Apply changes recomended by merge request coachFabio Papa2019-07-192-0/+10
| | | | | | | |
| * | | | | | | Remove AR hook to set the default subgroup_creation_levelFabio Papa2019-07-191-6/+0
| | | | | | | |
| * | | | | | | Make maintainers the default setting for creating subgroupsFabio Papa2019-07-191-4/+6
| | | | | | | |
| * | | | | | | Add policy to allow maintainers to create subgroups when enabledFabio Papa2019-07-191-0/+5
| | | | | | | |
| * | | | | | | Make the group model return maintainer level when it is not setFabio Papa2019-07-191-0/+4
| | | | | | | |
| * | | | | | | Add "allowed to create subgroups" dropdown to group settings formFabio Papa2019-07-192-0/+4
| | | | | | | |
| * | | | | | | Add subgroup_creation_level to the list of allowed group paramsFabio Papa2019-07-192-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For both groups_controller and admin/groups_controller
| * | | | | | | Reset group policy to only allow >= owners to create subgroupsFabio Papa2019-07-191-1/+1
| | | | | | | |
| * | | | | | | Update the group policy to allow >= maintainer to create subgroupsFabio Papa2019-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All specs passing
* | | | | | | | Merge branch 'ce-9688-add-remove-blocking-mrs' into 'master'Sean McGivern2019-07-221-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport of "Add or remove blocking merge requests" See merge request gitlab-org/gitlab-ce!30908
| * | | | | | | | Backport CE parts of "Allow blocking merge requests to be configured"Nick Thomas2019-07-221-0/+2
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'dm-submodule-helper-routing' into 'master'Nick Thomas2019-07-221-4/+8
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure SubmoduleHelper works outside view context Closes #64833 See merge request gitlab-org/gitlab-ce!31005
| * | | | | | | Ensure SubmoduleHelper works outside view contextdm-submodule-helper-routingDouwe Maan2019-07-221-4/+8
| | | | | | | |
* | | | | | | | Display group id on group admin pageZsolt Kovari2019-07-221-0/+5
| | | | | | | |
* | | | | | | | Display project id on project admin pageZsolt Kovari2019-07-221-0/+5
| | | | | | | |
* | | | | | | | Merge branch '55564-remove-if-in-before-after-action' into 'master'Lin Jen-Shin2019-07-226-12/+15
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove `if:` argument in before_action and alike when `only:` is also used Closes #55564 See merge request gitlab-org/gitlab-ce!24412
| * | | | | | | Rewrite `if:` argument in before_action and alike when `only:` is also usedGeorge Thomas2019-07-186-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #55564 This is first discovered in #54739 (comment 122609857) that if both if: and only: are used in a before_action or after_action or alike, if: is completely ignored.
View Lorry Controller Status