summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Save board lists collapsed settingFelipe Artur2019-08-285-13/+133
| | | | Persists if a board list is collapsed for each user.
* Fix top-nav search bar dropdown on xl displaysKemais Ehlers2019-08-282-6/+6
|
* Merge branch 'csslab-removal' into 'master'Clement Ho2019-08-288-8/+6
|\ | | | | | | | | | | | | Remove csslab Closes #66661 See merge request gitlab-org/gitlab-ce!32330
| * Remove csslabArun Kumar Mohan2019-08-288-8/+6
| |
* | Merge branch 'update-gitlab-runner-helm-chart-to-0-8-0' into 'master'Kamil Trzciński2019-08-281-1/+1
|\ \ | | | | | | | | | | | | Update GitLab Runner Helm Chart to 0.8.0/12.2.0 See merge request gitlab-org/gitlab-ce!32289
| * | Update GitLab Runner Helm Chart to 0.8.0update-gitlab-runner-helm-chart-to-0-8-0Tomasz Maczukin2019-08-271-1/+1
| | |
* | | Update CE files for GSD projects filterVictor Zagorodny2019-08-283-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | A new param with_security_reports was added to GET /groups/:id/projects API and the code to support this logic in GroupProjectsFinder and Project model. Also, a DB index was added to ci_job_artifacts table to speed up the search of security reports artifacts for projects
* | | Merge branch 'sh-lfs-object-batches' into 'master'Rémy Coutable2019-08-282-5/+25
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Makes LFS object link process OIDs in batches Closes #66274 See merge request gitlab-org/gitlab-ce!32268
| * | Makes LFS object linker process OIDs in batchessh-lfs-object-batchesStan Hu2019-08-272-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During a project import, `LfsLinkService` attempts to link `LfsObjects` that have not already been associated with a project. It's possible for a large repo to have thousands of OIDs, which can cause long database query and parsing times. By processing a batch of 1000 at a time, we can reduce that time at the expense of a few more SQL queries. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66274
* | | Remove token field from runners edit formPayton Burdette2019-08-281-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog entry Remove unnecessary test checking for form value Translations updated for gitlab.pot Use proper format on changelog entry
* | | Merge branch 'id-change-total-notes-calculation' into 'master'Ash McKenzie2019-08-283-3/+9
|\ \ \ | | | | | | | | | | | | | | | | Change the way totalNotes is calculated See merge request gitlab-org/gitlab-ce!32191
| * | | Change the way totalNotes is calculatedid-change-total-notes-calculationIgor Drozdov2019-08-283-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | totalNotes is only used to prerender a number of skeleton containers until real notes are loaded issuable.discussions makes multiple requests, so too expensive for this This commit uses mere notes for this and sends actual totalNotes number if it's less than 10; otherwise it sends 10 - it allows us to avoid bunch of skeleton prerenderings, which are not necessary since they doesn't fit into the whole screen and disappear quite fast
* | | | Merge branch 'sh-fix-issue-move-api' into 'master'Grzegorz Bizon2019-08-281-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix moving issues API failing when text includes commit URLs Closes #66666 See merge request gitlab-org/gitlab-ce!32317
| * | | | Fix moving issues API failing when text includes commit URLssh-fix-issue-move-apiStan Hu2019-08-281-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a issue is moved from one project to another, all associated Markdown text is rewritten in the context of the new project. If the note contained a link to a commit URL, `CommitRewriter#rewrite` would fail because `Commit#link_reference_pattern` would match `nil` `commit` values in the HTML generated from the Markdown. These `nil` values were passed along to `Project#commits_by` because `Commit#reference_valid?` was always returning `true`. To prevent this issue from happening, we tighten up the check for `Commit#reference_valid?` to look for valid SHA values. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66666
* | | | | Changes snowplow to use cookies for sessionsJeremy Jackson2019-08-283-20/+31
| | | | | | | | | | | | | | | | | | | | | | | | | This also restructures how and where the configuration for Snowplow lives.
* | | | | Merge branch 'todos/include-issue-mr-titles' into 'master'Stan Hu2019-08-284-25/+47
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Add Issue and Merge Request titles to Todo items Closes #63488 See merge request gitlab-org/gitlab-ce!30435
| * | | | Add Issue and Merge Request titles to Todo itemsArun Kumar Mohan2019-08-274-25/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only displays the todo body if the todo has a note. This is to avoid redundant Issue or Merge Request titles displayed both in the Todo title and body.
* | | | | Merge branch 'qa-restric-access-by-ip-address-spec-ce' into 'master'Sanad Liaquat2019-08-283-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE Backport of EE changes See merge request gitlab-org/gitlab-ce!32203
| * | | | | CE Backport of EE changesqa-restric-access-by-ip-address-spec-ceSanad Liaquat2019-08-273-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Add qa selector elements and files from the EE branch
* | | | | | Ss/add board name to page titleScott Stern2019-08-281-1/+1
| | | | | |
* | | | | | Merge branch 'sh-rate-limits-qa' into 'master'Mark Lapierre2019-08-273-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add QA specs for using IP rate limits See merge request gitlab-org/gitlab-ce!32177
| * | | | | | Add QA specs for using IP rate limitssh-rate-limits-qaStan Hu2019-08-263-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will help prevent issues such as https://gitlab.com/gitlab-org/gitlab-ce/issues/66449.
* | | | | | | CE-specific changes for designs `user_notes_count`Luke Duncalfe2019-08-271-1/+1
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes call `#after_note_created` and `#after_note_destroyed` on their noteable in callbacks, so the noteable can perform tasks particular to them, like cache expiry. This is in preparation of the EE-specific class `DesignManagement::Design` clearing its `user_notes_count` cache when its note are created or destroyed. Refactoring Rspec behaviour testing of a counter caching service into a shared example. https://gitlab.com/gitlab-org/gitlab-ee/issues/13353
* | | | | | Round the file title; Add top border to conflict diffsThomas Randolph2019-08-271-0/+28
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file title sometimes overflows its container, which has the same border-radius. By always rounding the file title, the overflow never happens, so the corners always look correct. Everywhere else there are file diffs, there is a top border to complete the full border around the file.
* | | | | Merge branch 'qa/issue-boards-navigation' into 'master'Sanad Liaquat2019-08-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update view for testability and update page object See merge request gitlab-org/gitlab-ce!32224
| * | | | | Update view to add testabilityWalmyr Lima2019-08-261-1/+1
| | | | | |
* | | | | | Move gke_cluster_dropdowns to create_cluster dirEnrique Alcantara2019-08-2715-3/+3
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit creates a create_cluster directory to collect all Vue applications related to creating kubernetes applications using gitlab. It also moves the gke_cluster_dropdowns collection of apps to the create_cluster directory. gke_cluster_dropdowns contains dropdown components used to select configuration options to create a Kubernetes cluster in Google Cloud.
* | | | | Merge branch 'sh-project-feature-nplus-one' into 'master'Jan Provaznik2019-08-271-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Remove N+1 SQL query loading project feature in dashboard Closes #66482 See merge request gitlab-org/gitlab-ce!32169
| * | | | Remove N+1 SQL query loading project feature in dashboardsh-project-feature-nplus-oneStan Hu2019-08-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Projects that have a pipeline may need to check whether the user has permission to read the build (`can?(current_user, :read_build, project)`), which requires checking the `project_features` table. This would cause an N+1 SQL query for each project. This change also has a beneficial side effect that may avoid a race condition. When a user deletes a project, the project is queued for deletion and the user is redirected back to the dashboard page. However, the following may happen: 1. The dashboard page may load this deleted project in the list of 20 projects. 2. The view will load the project pipeline status from the cache and attempt to show each project. 3. When the view encounters the deleted project, it calls `can?(current_user, :read_build, project)` to determine whether to display the pipeline status. 4. Sidekiq deletes the project from the database. 5. However, since the deleted project is still loaded in memory, it will attempt to call `project.project_feature.access_level`. 6. Since `project_feature` was not eager loaded, a lazy `SELECT` call is made to the database. 7. This `SELECT` call returns nothing, and the user sees a 500 error. By eager loading `project_feature`, we can ensure that we have a consistent view and avoid records from being deleted later. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66482
* | | | | Add encrypted optional option to DeployToken authentication fieldEtienne Baqué2019-08-261-1/+1
| | | | |
* | | | | Merge branch 'sh-fix-piwik-template' into 'master'Ash McKenzie2019-08-271-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Piwik not working Closes #66627 See merge request gitlab-org/gitlab-ce!32234
| * | | | | Fix Piwik not workingsh-fix-piwik-templateStan Hu2019-08-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to indentation, the changes in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31402 broke the templating of Piwik script header. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66627
* | | | | | Merge branch 'sh-guard-against-orphaned-project-feature' into 'master'Michael Kozono2019-08-261-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guard against deleted project feature entry Closes #66482 See merge request gitlab-org/gitlab-ce!32187
| * | | | | | Guard against deleted project feature entryStan Hu2019-08-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/issues/66482, we see that a project's `project_feature` association may be lazily loaded and hence return `nil` if the entry is deleted if the `Project` is already loaded in memory. To ensure we don't fail hard when this happens, assume all features are disabled. We can fix this issue by eager loading the `project_feature` in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32169, but we shouldn't have to depend on that. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66482
* | | | | | | Revert "Merge branch 'user-tracking-settings' into 'master'"Jeremy Jackson2019-08-263-31/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !31826
* | | | | | | Merge branch 'setting_mirror_repos_too_big' into 'master'Tim Zallmann2019-08-261-2/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apps: remove the too big "Mirror a repository" header Closes #66445 See merge request gitlab-org/gitlab-ce!32097
| * | | | | | | apps: remove the too big "Mirror a repository" headerNeroBurner2019-08-221-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/66445
* | | | | | | | Merge branch 'patch-74' into 'master'Mike Greiling2019-08-261-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | fix: remove double % See merge request gitlab-org/gitlab-ce!32178
| * | | | | | | fix: remove double % from layout width descriptionВладислав Поляков2019-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update show.html.haml
* | | | | | | | Using before_save method instead of setterAishwarya Subramanian2019-08-261-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unused method for name setter method
* | | | | | | | Changes snowplow to use cookies for sessionsJeremy Jackson2019-08-263-20/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also restructures how and where the configuration for Snowplow lives.
* | | | | | | | Replace echo function with a resolverBrett Walker2019-08-264-22/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `GraphQL::Function` has been deprecated in favor of resolvers.
* | | | | | | | Add usage pings for merge request creatingIgor2019-08-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code Review Usage Ping for Create SMAU
* | | | | | | | Merge branch 'zj-remove-object-pools-feature-flag' into 'master'Nick Thomas2019-08-261-2/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Remove the object pools feature flag See merge request gitlab-org/gitlab-ce!32204
| * | | | | | | Remove the object pools feature flagZeger-Jan van de Weg2019-08-261-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flag defaulted to true, so there's no change unless users turned it off. Given there's a lack of issues regarding object pools, this should be OK.
* | | | | | | | Merge branch ↵Nick Thomas2019-08-261-1/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '66443-unrecoverable-configuration-loop-in-external-auth-control' into 'master' Resolve "Unrecoverable configuration loop in external auth control" Closes #66443 See merge request gitlab-org/gitlab-ce!32102
| * | | | | | | Add test, reduce complexityRobert Schilling2019-08-221-2/+5
| | | | | | | |
| * | | | | | | Don't check external authorization when disabling the serviceRobert Schilling2019-08-221-1/+2
| | | | | | | |
* | | | | | | | Add edit_note and spec for editing quick actionsPatrick Derichs2019-08-266-29/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call QuickActionsService on Note update Add support for notes which just contain commands after editing Return http status gone (410) if note was deleted Temporary frontend addition so it is not failing when a note is deleted Move specs to shared examples Fix rubocop style issue Deleting note on frontend when status is 410 Use guard clause for note which got deleted Simplified condition for nil note This method should no longer be called with nil note Refactoring of execute method to reduce complexity Move errors update to delete_note method Note is now deleted visually when it only contains commands after update Add expectation Fix style issues Changing action to fix tests Add tests for removeNote and update deleteNote expectations
* | | | | | | | Update gitlab_schema.rb to fix typoLucy Fox2019-08-261-1/+1
| |_|_|/ / / / |/| | | | | |