summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Add review remarksGosia Ksionek2019-07-221-5/+5
| | | | | | Add cr remarks Add cr remarks
* Merge branch '55564-remove-if-in-before-after-action' into 'master'Lin Jen-Shin2019-07-222-2/+4
|\ | | | | | | | | | | | | 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-182-2/+4
| | | | | | | | | | | | 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-191-0/+8
|/ | | | | | | The actions tracked in the web IDE are: - creation of commits - creation of merge requests - projects loaded
* Refactor EnvironmentsController#metrics_dashboard endpointSarah Yasonik2019-07-161-7/+9
|
* Add support for additional panel typesJose Ivan Vargas2019-07-101-0/+1
| | | | | This introduces the single stat chart component aside from the area chart component
* Merge branch 'prepare-cycle-analytics-for-group-level' into 'master'Douglas Barbosa Alexandre2019-07-102-2/+2
|\ | | | | | | | | Prepare cycle analytics for group level See merge request gitlab-org/gitlab-ce!30356
| * Add cr remarksMałgorzata Ksionek2019-07-092-2/+2
| |
| * Update controllers method callsMałgorzata Ksionek2019-07-092-2/+2
| |
* | Remove `:graphql` feature flagcharlie ablett2019-07-091-6/+0
|/ | | | | | | | - Remove `FeatureConstrainer` call wrapping api endpoint - Remove `Feature.enabled?(:graphql)` conditionals in back and frontend - Modify graphql test to be graphql flag agnostic - Remove api routing spec - Remove frontend feature flag via `gon`
* Extract deployment_metrics into own objectThong Kuah2019-07-081-6/+8
| | | | | | | We can now share project so that we don't have to load project twice. Also, this extracts non-relevant logic out of Deployment. Update DeploymentsController accordingly
* Merge branch 'fetch-forked-projects-create-mr' into 'master'Filipa Lacerda2019-07-052-2/+2
|\ | | | | | | | | | | | | Create private merge requests in forks Closes #58583 See merge request gitlab-org/gitlab-ce!29984
| * Create private merge requests in forksPhil Hughes2019-07-052-2/+2
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/58583
* | Allow asynchronous rebase operations to be monitoredNick Thomas2019-07-041-1/+1
|/ | | | | | | | | This MR introduces tracking of the `rebase_jid` for merge requests. As with `merge_ongoing?`, `rebase_in_progress?` will now return true if a rebase is proceeding in sidekiq. After one release, we should remove the Gitaly-based lookup of rebases. It is much better to track this kind of thing via the database.
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2019-07-037-18/+60
|\
| * Add username to deploy tokensKrasimir Angelov2019-07-021-1/+1
| | | | | | | | | | | | | | | | | | This new attribute is optional and used when set instead of the default format `gitlab+deploy-token-#{id}`. Empty usernames will be saved as null in the database. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/50228.
| * Registry component now includes error messagesNick Kipling2019-07-021-0/+2
| | | | | | | | | | | | | | | | | | Includes changes to the Vue container registry component to support the display of an empty message and error message when invalid characters are found in the group, project or branch name. repositories/index.html.haml has been changed to remove the content and place into Vue component.
| * Merge branch '58583-confidential-mr-branch-backend' into 'master'Rémy Coutable2019-07-012-2/+15
| |\ | | | | | | | | | | | | Support creating an MR/branch on a fork from an issue See merge request gitlab-org/gitlab-ce!29831
| | * Check if user can `update_issue` on projectPatrick Bajao2019-07-011-1/+1
| | | | | | | | | | | | | | | If user can update an issue under the specified confidential issue project, should be able to find the project.
| | * Fix issues when creating system notes58583-confidential-mr-branch-backendPatrick Bajao2019-06-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `confidential_issue_project_id` is set and the issue is under that project, create the a note about branch creation in that project. If not, do nothing. When creating `new_merge_request` system note, set the project where the MR will be referenced from so it'll be linked to when the MR is created in another project.
| | * Support branch creation from confidential issuePatrick Bajao2019-06-291-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | Accept a `confidential_issue_project_id` param which will be used for the system note target. This also includes some refactoring on the spec to use shared examples.
| | * Support creating an MR on a fork from an issuePatrick Bajao2019-06-291-0/+1
| | |
| * | Merge branch 'id-stale-branches' into 'master'Grzegorz Bizon2019-07-011-9/+13
| |\ \ | | |/ | |/| | | | | | | Add endpoint for fetching diverging commit counts See merge request gitlab-org/gitlab-ce!29802
| | * Add endpoint for fetching diverging commit countsid-stale-branchesIgor Drozdov2019-06-281-9/+13
| | | | | | | | | | | | Extract diverging_commit_counts into a service class
| * | Merge branch 'id-extract-widget-into-different-request' into 'master'Ash McKenzie2019-06-283-6/+29
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Extract MR's widget into a separate request Closes #62723 See merge request gitlab-org/gitlab-ce!29979
| | * | Extract MR's widget into a separate endpointid-extract-widget-into-different-requestIgor Drozdov2019-06-283-6/+29
| | |/ | | | | | | | | | | | | | | | This commits extracts /merge_requests/1.json?serializer=widget Into a separate /merge_requests/1/widget.json endpoint This will allow to use caching for this request
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2019-07-032-2/+20
|\ \ \ | |/ / |/| |
| * | Merge branch 'security-prevent-detection-of-merge-request-template-name' ↵Marin Jankovski2019-07-022-2/+20
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Guests can know whether merge request template name exists or not See merge request gitlab/gitlabhq!3117
| | * | Authorize access before serving project templateLuke Duncalfe2019-06-112-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if a user was a guest member of a private project, they could access the merge request template as we were not checking permission-levels of the user. When a issue template is asked for, the user must have :read_issue for the project; or :read_merge_request when a merge request template is asked for. We also now rescue_from FileNotFoundError and handle as 404. This is because RepoTemplateFinder can raise a FileNotFoundError exception, which Rails previously handled as a 500. Handling these in a way that is consistent with ActiveRecord::RecordNotFound exceptions, within controllers that inherit from Projects::ApplicationController at least, and returning a 404. https://gitlab.com/gitlab-org/gitlab-ce/issues/54943
* | | | Merge branch 'sh-add-gitaly-ref-caching-search-controller' into 'master'Kamil Trzciński2019-06-271-6/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Enable Gitaly ref caching for SearchController See merge request gitlab-org/gitlab-ce!30105
| * | | | Enable Gitaly ref caching for SearchControllersh-add-gitaly-ref-caching-search-controllerStan Hu2019-06-261-6/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | As we noticed in https://gitlab.com/gitlab-org/gitlab-ce/issues/56627#note_185828742, clicking on the "Issues" tab often requests the same reference in rendering Markdown.
* | | | Merge branch '53811-issue-boards-to-core-projects-backend-ce' into 'master'Stan Hu2019-06-271-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Move Multiple Issue Boards for Projects to Core See merge request gitlab-org/gitlab-ce!29757
| * | | Move Multiple Issue Boards for Projects to Core53811-issue-boards-to-core-projects-backend-ceAlexandru Croitor2019-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | Refactor code to allow multiple issue boards management for projects in CE
* | | | Merge branch 'vue-tree-logs-tree-request' into 'master'Filipa Lacerda2019-06-261-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fetch commit message with logs_tree endpoint See merge request gitlab-org/gitlab-ce!29796
| * | | | Fetch commit message with log_tree endpointPhil Hughes2019-06-251-0/+1
| | |_|/ | |/| |
* | | | Merge branch '51952-forking-via-webide' into 'master'Nick Thomas2019-06-263-18/+10
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Resolve "500 error when forking via the web IDE button" See merge request gitlab-org/gitlab-ce!29909
| * | | Make checks for continue_params more robustMarkus Koller2019-06-253-18/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for continue_params&.key?(:to) in Projects::ImportsController caused an exception in redirect_to if this key contained a nil value. Since url_for won't add any params for an empty hash, we can just return that in continue_params if params[:continue] isn't present, and simplify the code in the controllers to check for the values we actually want to use.
* | | Bring Manual Ordering on Issue ListRajat Jain2019-06-261-0/+4
|/ / | | | | | | | | | | | | | | | | On all the issue lists -- Group, Project and Dashboard -- this change adds a new option for managing the lists. "Manual Ordering" option is added which when flipped on will allow an user to drag and drop issues around to create a relative ordering among them.
* | Merge branch 'sync-merge-ref-upon-mergeability-check' into 'master'Douwe Maan2019-06-241-5/+1
|\ \ | | | | | | | | | | | | Automatically update MR merge-ref along merge status See merge request gitlab-org/gitlab-ce!29569
| * | Automatically update MR merge-ref along merge statusOswaldo Ferreira2019-06-201-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This couples the code that transitions the `MergeRequest#merge_status` and refs/merge-requests/:iid/merge ref update. In general, instead of directly telling `MergeToRefService` to update the merge ref, we should rely on `MergeabilityCheckService` to keep both the merge status and merge ref synced. Now, if the merge_status is `can_be_merged` it means the merge-ref is also updated to the latest. We've also updated the logic to be more systematic and less user-based.
* | | Enable Gitaly ref name caching for discussions.jsonsh-enable-ref-name-caching-discussionsStan Hu2019-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | This eliminates many potential duplicate FindCommit RPCs for the same ref, which often occurs in the RelativeLinkFilter#current_commit call. On the GitLab 12.0 release post, for example, this would save close to 400 RPC calls.
* | | Merge branch 'bw-issue-reorder' into 'master'Kamil Trzciński2019-06-211-1/+15
|\ \ \ | | | | | | | | | | | | | | | | Add ability to reorder issues See merge request gitlab-org/gitlab-ce!29012
| * | | Add reorder action to Project IssuesControllerbw-issue-reorderBrett Walker2019-06-211-1/+15
| | | | | | | | | | | | | | | | to support manual sorting on the frontend
* | | | Don't show private keys for letsencrypt certsVladimir Shushlin2019-06-211-5/+3
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds enum certificate_source to pages_domains table with default manually_uploaded Mark certificates as 'gitlab_provided' if the were obtained through Let's Encrypt Mark certificates as 'user_provided' if they were uploaded through controller or api Only show private key in domain edit form if it is 'user_provided' Only show LetsEncrypt option if is enabled by application settings (and feature flag) Refactor and fix some specs to match new logic Don't show Let's Encrypt certificates as well
* | | Add embedding flag and filter to CPU/MemSarah Yasonik2019-06-201-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commits adds support for metrics dashboards for embedding. If the flag 'embedded' is provided to the environments/id/metrics_dashboard endpoint, the response will be suitable for embedding in issues or other content. This is a precursor for support for embedding metrics in GFM.
* | | Fix N+1 problem in `JobsController#index`fix-jobs-controller-index-n-1Kamil Trzciński2019-06-191-1/+5
| | | | | | | | | | | | | | | | | | This adds missing preloads, and introduces additional n+1 matcher to look for duplicates.
* | | Add documentation and testsManoj MJ2019-06-191-2/+1
|/ / | | | | | | | | | | | | | | This commit adds - feature specs - to test the ability of a user with "developer" permission to delete tags in repositories. - documentation
* | Allow Developer role to delete tags via container registry apiJason Goodman2019-06-171-1/+1
| | | | | | | | This brings the API permissions in line with the UI permissions
* | Refactor for cleaner caching in dashboardsSarah Yasonik2019-06-131-1/+1
| | | | | | | | | | | | | | | | Opts to cache a full list of cached dashboards to better manage removing items from the cache. This also allows dashboards to be stored in the cache that don't necessarily correspond to a single dashboard yml.