summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Add can_merge option to autocomplete responseIgor2019-08-011-1/+1
| | | | It's used only if merge_request_iid param is provided
* Merge branch '52123-issuable-actions-notesfinder-pderichs' into 'master'Stan Hu2019-08-014-10/+20
|\ | | | | | | | | | | | | Use NotesFinder to fetch notes on API and Controllers Closes #52123 See merge request gitlab-org/gitlab-ce!31300
| * Change block parameter name to params52123-issuable-actions-notesfinder-pderichsPatrick Derichs2019-08-012-3/+3
| |
| * Use NotesFinder in IssuableActions modulePatrick Derichs2019-08-014-10/+20
| | | | | | | | | | | | | | | | | | | | Remove project from NotesFinder constructor Add project parameter to specs Also look for methods in private scope Fix specs to match new NotesFinder constructor
* | Merge branch 'rename-relative-position-move-to-end' into 'master'Bob Van Landuyt2019-08-011-1/+1
|\ \ | | | | | | | | | | | | Fix bug when moving batches of items to the end See merge request gitlab-org/gitlab-ce!31351
| * | Fix bug when moving batches of items to the endrename-relative-position-move-to-endHeinrich Lee Yu2019-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | Starts from START_POSITION when there are no existing positions. Also improves the test to actually test the behavior
* | | Remove backend use of manual_sorting feature flagBrett Walker2019-07-312-8/+0
|/ /
* | Propagate argument errors as execution errorsajk-handle-gql-errorsAlex Kalderimis2019-07-301-0/+4
|/
* Remove line profiler from performance barSean McGivern2019-07-301-4/+0
| | | | | | | | | 1. The output isn't great. It can be hard to find hotspots and, even when you do find them, to find why those are hotspots. 2. It uses some jQuery-specific frontend code which we can remove now that we don't have this any more. 3. It's only possible to profile the initial request, not any subsequent AJAX requests.
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-07-295-15/+7
|\
| * Merge branch 'security-fix-badges-leaked-to-unauthorized-users' into 'master'GitLab Release Tools Bot2019-07-261-1/+2
| |\ | | | | | | | | | | | | | | | | | | Don't display badges when builds are restricted Closes #2864 See merge request gitlab/gitlabhq!3175
| | * Don't display badges when builds are restrictedFabio Pitino2019-07-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Badges were leaked to unauthorized users even when Public Builds project setting is disabled. Added guard clause to the controller to check if user can read build.
| * | Merge branch 'security-remove-take-trigger-ownership-feature' into 'master'GitLab Release Tools Bot2019-07-261-11/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Drop feature to take ownership of a trigger token Closes #2868 See merge request gitlab/gitlabhq!3198
| | * | Drop feature to take ownership of a trigger tokenFabio Pitino2019-07-101-11/+1
| | |/ | | | | | | | | | | | | | | | | | | Removing API and frontend interactions that allowed users to take ownership of a trigger token. Removed mentions from the documentation.
| * | Merge branch 'security-mr-pipeline-permissions' into 'master'GitLab Release Tools Bot2019-07-262-2/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | MR pipeline permissions Closes #2871 See merge request gitlab/gitlabhq!3204
| | * | Use MergeRequest#source_project as permissions reference for ↵drew cimino2019-07-052-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeRequest#all_pipelines MergeRequest#all_pipelines fetches Ci::Pipeline records from the source project, so we should specifically check that project for permissions. This was already happening for intra-project merge requests, but in the event that the target and source projects both have private builds, we should ensure that the project permissions are respected.
| * | | Merge branch 'security-60551-fix-upload-scope' into 'master'GitLab Release Tools Bot2019-07-261-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Queries for Upload should be scoped by model See merge request gitlab/gitlabhq!3229
| | * | | Queries for Upload should be scoped by modelAdam Hegyi2019-07-111-1/+1
| | | |/ | | |/|
* | | | Added navbar searches usage ping counterFrancisco Javier López2019-07-291-0/+8
| | | | | | | | | | | | | | | | | | | | Added usage ping counter when the user makes a search through the navbar search component.
* | | | Merge branch 'projects-controller-private' into 'master'Lin Jen-Shin2019-07-291-10/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Separate private methods under the keyword on projects controller See merge request gitlab-org/gitlab-ce!31223
| * | | | Separate private methods under the keyword on projects controllerFurkan Ayhan2019-07-281-10/+12
| | | | |
* | | | | Add Job specific variablesMatija Čupić2019-07-291-1/+5
|/ / / / | | | | | | | | | | | | | | | | Adds Job specific variables to facilitate specifying variables when running manual jobs.
* | | | Revert "Merge branch '52123-issuable-actions-notesfinder-pderichs' into ↵Stan Hu2019-07-271-15/+7
| | | | | | | | | | | | | | | | | | | | 'master'" This reverts merge request !29733
* | | | Merge branch '52123-issuable-actions-notesfinder-pderichs' into 'master'Stan Hu2019-07-261-7/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use NotesFinder to fetch notes in module IssuableActions Closes #52123 See merge request gitlab-org/gitlab-ce!29733
| * | | | Use NotesFinder in module IssuableActionsPatrick Derichs2019-07-261-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add spec for concern IssuableActions Add shared samples for discussions endpoint Add schema validations for discussions Fix rubocop style issue Make target assignable Use new possibility to provide target
* | | | | Merge branch 'remove-nested-groups-checks' into 'master'Lin Jen-Shin2019-07-262-13/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove code related to object hierarchy and MySQL Closes #65056 and #65055 See merge request gitlab-org/gitlab-ce!31095
| * | | | | Remove code related to object hierarchy in MySQLremove-nested-groups-checksHeinrich Lee Yu2019-07-252-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are not required because MySQL is not supported anymore
* | | | | | Merge branch 'mc/feature/find-all-artifacts-for-sha' into 'master'Robert Speicher2019-07-262-2/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Find build by sha from ref Closes #64534 and #45697 See merge request gitlab-org/gitlab-ce!30843
| * | | | | | Rename latest_successful to be more explicitMatija Čupić2019-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Reword Project#latest_successful_build_for to Project#latest_successful_build_for_ref * Reword Ci::Pipeline#latest_successful_for to Ci::Pipeline#latest_successful_build_for_ref
| * | | | | | Find build by sha from refMatija Čupić2019-07-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds ability to find builds by sha when only specifying a ref.
* | | | | | | Ensure Warden triggers after_authentication callbackImre Farkas2019-07-263-3/+14
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | By not triggering the callback: - ActiveSession lookup keys are not cleaned - Devise also misses its hook related to session cleanup
* | | | | | Merge branch 'add-caching-to-archive-endpoint' into 'master'Grzegorz Bizon2019-07-251-7/+53
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Return an ETag header for the archive endpoint See merge request gitlab-org/gitlab-ce!30581
| * | | | | Return an ETag headers for the archive endpointadd-caching-to-archive-endpointAhmad Sherif2019-07-231-7/+53
| | |_|/ / | |/| | | | | | | | | | | | | We use the relative path of the archive to check for archive staleness.
* | | | | Merge branch 'sh-enable-rubocop-hash-search' into 'master'Mayra Cabrera2019-07-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Rubocop Performance/InefficientHashSearch Closes #64975 See merge request gitlab-org/gitlab-ce!31117
| * | | | | Enable Rubocop Performance/InefficientHashSearchsh-enable-rubocop-hash-searchStan Hu2019-07-241-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When used with a Hash, `.keys.include?` is bad because: 1. It performs a O(n) search instead of the efficient `.has_key?` 2. It clones all keys into separate array. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64975
* | | | | Add RateLimiter to RawControllerMayra Cabrera2019-07-242-0/+21
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Limits raw requests to 300 per minute and per raw path. * Add a new attribute to ApplicationSettings so user can change this value on their instance. * Uses Gitlab::ActionRateLimiter to limit the raw requests. * Add a new method into ActionRateLimiter to log the event into auth.log Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/48717
* | | | Merge branch 'mc/feature/use-only-pat-cicd-projects' into 'master'Grzegorz Bizon2019-07-241-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove OAuth GitHub CI/CD project code paths See merge request gitlab-org/gitlab-ce!30716
| * | | | Do not authorize with OAuth for CICD only projectsmc/feature/use-only-pat-cicd-projectsMatija Čupić2019-07-231-2/+6
| | | | |
* | | | | Merge branch 'bw-enable-default-manual-sorting' into 'master'Sean McGivern2019-07-242-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Default manual_sorting feature flag to on See merge request gitlab-org/gitlab-ce!30788
| * | | | | Default manual_sorting feature flag to onbw-enable-default-manual-sortingBrett Walker2019-07-162-2/+2
| |/ / / /
* | | | | Allowing all users to view historyAlex Kalderimis2019-07-231-1/+1
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the create_wiki permission check from the history controller, allowing show and history to have the same level of permissions. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29528
* | | | 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.
* | | | | 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.
* | | | | Add review remarksGosia Ksionek2019-07-221-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cr remarks Add cr remarks
* | | | | Merge branch 'maintainers-can-create-subgroup' into 'master'Sean McGivern2019-07-222-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add a group setting to allow Maintainers to create sub-groups See merge request gitlab-org/gitlab-ce!29718
| * | | | | Add subgroup_creation_level to the list of allowed group paramsFabio Papa2019-07-192-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | For both groups_controller and admin/groups_controller
* | | | | | 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.
* | | | | | Added Usage Data for some Web IDE actionsFrancisco Javier López2019-07-192-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The actions tracked in the web IDE are: - creation of commits - creation of merge requests - projects loaded