summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Build correct basenames for title search resultssearch-blob-basenamesMarkus Koller2019-06-201-1/+1
| | | | | | | | | The "basename" here needs to be the full path without the trailing extension, instead of stripping the leading path as well. This was previously fixed in 2f36efa0871 inside the view, but the problematic code was still present in FoundBlob, and the corresponding spec didn't actually use a child wiki page to properly verify the fix.
* Merge branch 'graphql-file-renames' into 'master'Kushal Pandya2019-06-2011-6/+6
|\ | | | | | | | | Rename graphql files to match frontend docs See merge request gitlab-org/gitlab-ce!29856
| * Rename graphql files to match frontend docsPhil Hughes2019-06-1911-6/+6
| |
* | Merge branch 'sh-remove-import-columns-from-projects' into 'master'Douwe Maan2019-06-201-2/+0
|\ \ | | | | | | | | | | | | Remove import columns from projects table See merge request gitlab-org/gitlab-ce!29863
| * | Remove import columns from projects tablesh-remove-import-columns-from-projectsStan Hu2019-06-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21497, we migrated all project import data into a separate table, `project_import_data`. In addition, we also added: ``` ignore_column :import_status, :import_jid, :import_error ``` In https://gitlab.com/gitlab-com/gl-infra/production/issues/908, we observed some of these `import_error` columns consumed megabytes of error backtraces and caused slow loading of projects whenever a `SELECT * from projects` query loaded the row into memory. Since we have long migrated away from these columns, we can now drop these columns entirely.
* | | Render GFM html in GraphQLBob Van Landuyt2019-06-208-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a `markdown_field` to our types. Using this helper will render a model's markdown field using the existing `MarkupHelper` with the context of the GraphQL query available to the helper. Having the context available to the helper is needed for redacting links to resources that the current user is not allowed to see. Because rendering the HTML can cause queries, the complexity of a these fields is raised by 5 above the default. The markdown field helper can be used as follows: ``` markdown_field :note_html, null: false ``` This would generate a field that will render the markdown field `note` of the model. This could be overridden by adding the `method:` argument. Passing a symbol for the method name: ``` markdown_field :body_html, null: false, method: :note ``` It will have this description by default: > The GitLab Flavored Markdown rendering of `note` This could be overridden by passing a `description:` argument. The type of a `markdown_field` is always `GraphQL::STRING_TYPE`.
* | | Updating CE repo to include new EE users API changesMichael Leopard2019-06-192-7/+20
|/ / | | | | | | | | Updated users API documentation Moved API level changes to the service level
* | Merge branch 'fix-jobs-controller-index-n-1' into 'master'Stan Hu2019-06-191-1/+5
|\ \ | | | | | | | | | | | | Fix N+1 problem in `JobsController#index` See merge request gitlab-org/gitlab-ce!29839
| * | 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.
* | | CE backport for changes in EE MR 14017Luke Duncalfe2019-06-191-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports to CE changes to allow the EE model DesignManagement::Repository to override the #attributes_at method to provide its own git attributes. The #attributes_at method was freely available, as it's never called by anything in the app. It looks like the code that called it got refactored out of existence in ca66a04f. It was still being called in a spec https://gitlab.com/gitlab-org/gitlab-ce/blob/85b29c1c2fa3b94d7371cf454c485457a0756cb1/spec/services/files/create_service_spec.rb#L40 which I've left because with the change in Lfs::FileTransformer in fact is now again the perfect test! See EE MR https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14017 And these comment threads https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13894#note_178002089 https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13894#note_178049984
* | | Fix double border in profile pageYoginth2019-06-192-2/+1
| | |
* | | Remove unnecessary margin in markdown nested listsKuba Kopeć2019-06-191-0/+5
| | |
* | | Merge branch 'pderichs-52123' into 'master'Robert Speicher2019-06-191-2/+14
|\ \ \ | | | | | | | | | | | | | | | | Use NotesFinder to get Noteable See merge request gitlab-org/gitlab-ce!28205
| * | | Remove unneeded parenthesesPatrick Derichs2019-06-191-1/+1
| | | |
| * | | Separate conditions to increase readabilityPatrick Derichs2019-06-191-1/+2
| | | |
| * | | Use NotesFinder to fetch notes on API and ControllersPatrick Derichs2019-06-191-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing iid query on NotesFinder Changed parameters of find_noteable, so changes across a few files were needed. MergeRequest also requires iid instead of id query Make NotesFinder fail with RecordNotFound again Add specs for target_iid Using RSpec tablesyntax for target_iid specs Revert "Using RSpec tablesyntax for target_iid specs" This reverts commit ba45c7f569a. Allow find_by! here Fix variable name Add readable check Revert "Add readable check" This reverts commit 9e3a1a7aa39. Remove unnecessary assignment Add required changes for EE Fix parameter count Reduce code duplication by extracting a noteable module method The call to find_noteable was redundant so multiple files and lines have changed in that commit to use the newly introduced module method `noteable`. Replace casecmp with include check Add parent_type parameter Revert "Reduce code duplication by extracting a noteable module method" This reverts commit 8c0923babff16. Method is no longer needed Check whether noteable can be read by user
* | | | Merge branch 'api-js-forked-projects' into 'master'Filipa Lacerda2019-06-191-0/+16
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Added forked projects API call function See merge request gitlab-org/gitlab-ce!29841
| * | | Added forked projects API call functionPhil Hughes2019-06-191-0/+16
| | |/ | |/| | | | | | | Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/58583
* | | Resolve "Username availability checker breaks inline validation"Jiaan2019-06-193-106/+52
| | |
* | | Knative version bump 0.5 -> 0.6Chris Baumbauer2019-06-191-1/+1
| | |
* | | Merge branch 'ce-12014-incremental-es-wiki-updates' into 'master'Nick Thomas2019-06-192-8/+24
|\ \ \ | |/ / |/| | | | | | | | Backport of 12014-incremental-es-wiki-updates See merge request gitlab-org/gitlab-ce!29531
| * | Backport of 12014-incremental-es-wiki-updatesce-12014-incremental-es-wiki-updatesMario de la Ossa2019-06-182-8/+24
| |/ | | | | | | Bringing in the DB migration and some light changes for CE classes
* | Add documentation and testsManoj MJ2019-06-195-10/+8
| | | | | | | | | | | | | | | | This commit adds - feature specs - to test the ability of a user with "developer" permission to delete tags in repositories. - documentation
* | Add 2nd response for container api bulk deleteSteve Abrams2019-06-181-26/+3
|/ | | | | | | The bulk delete api endpoint for container registries can only be called once per hour. If a user calls the endpoint more than once per hour, they will now receive a 400 error with a descriptive message.
* Merge branch 'revert-concurrent-pipeline-schedule-creation' into 'master'Kamil Trzciński2019-06-181-1/+12
|\ | | | | | | | | Revert concurrent pipeline creation for pipeline schedules See merge request gitlab-org/gitlab-ce!29794
| * Revert concurrent pipeline schedule creationrevert-concurrent-pipeline-schedule-creationShinya Maeda2019-06-181-1/+12
| | | | | | | | | | | | This commit reverts the previously introduced concurrent pipeline schedule creation which was a viable solution for mitigating inconsistent pipeline schedule by Sidekiq Memory Killer.
* | #57815 Password authentication disabled for UltraAuth usersKartikey Tanna2019-06-182-3/+12
| | | | | | | | | | Disabled password authentication for the users registered using omniauth-ultraauth strategy
* | Merge branch '59257-find-new-branches-harder' into 'master'Rémy Coutable2019-06-181-1/+7
|\ \ | | | | | | | | | | | | | | | | | | Look for new branches more carefully Closes #59257 See merge request gitlab-org/gitlab-ce!29761
| * | Look for new branches more carefullyNick Thomas2019-06-181-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In certain cases, GitLab can miss a PostReceive invocation the first time a branch is pushed. When this happens, the "branch created" hooks are not run, which means various features don't work until the branch is deleted and pushed again. This MR changes the `Git::BranchPushService` so it checks the cache of existing branches in addition to the `oldrev` reported for the branch. If the branch name isn't in the cache, chances are we haven't run the service yet (it's what refreshes the cache), so we can go ahead and run it, even through `oldrev` is set. If the cache has been cleared by some other means in the meantime, then we'll still fail to run the hooks when we should. Fixing that in the general case is a larger problem, and we'd need to devote significant engineering effort to it. There's a chance that we'll run the relevant hooks *multiple times* with this change, if there's a race between the branch being created, and the `PostReceive` worker being run multiple times, but this can already happen, since Sidekiq is "at-least-once" execution of jobs. So, this should be safe.
* | | Merge branch 'chore/rename-variable-ce' into 'master'Mike Greiling2019-06-182-3/+3
|\ \ \ | |_|/ |/| | | | | | | | Rename TOKEN_TYPES to USER_TOKEN_TYPES See merge request gitlab-org/gitlab-ce!29785
| * | Rename TOKEN_TYPES to USER_TOKEN_TYPESArun Kumar Mohan2019-06-182-3/+3
| | |
* | | Merge branch '63231-wiki-nav' into 'master'Phil Hughes2019-06-184-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix header alignment on wiki and kubernetes pages Closes #63231 See merge request gitlab-org/gitlab-ce!29698
| * | | Fix header alignment on wiki and kubernetes pages63231-wiki-navAnnabel Dunstone Gray2019-06-144-3/+3
| | | |
* | | | Merge branch 'bootstrap-to-glui' into 'master'Filipa Lacerda2019-06-183-42/+5
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Import bootstrap styles from gitlab-ui See merge request gitlab-org/gitlab-ce!26165
| * | | Import bootstrap styles from gitlab-uiSimon Knox2019-06-173-42/+5
| | | | | | | | | | | | | | | | | | | | Use gitlab_ui.scss instead of all the bootstrap imports Allow the ../node_modules path from gitlab_ui.scss to resolve
* | | | Remove support for creating non-RBAC kubernetes clustersHordur Freyr Yngvason2019-06-181-9/+0
| | | |
* | | | Merge branch '59023-fix-web-ide-creating-branches-off-new-commits' into 'master'Phil Hughes2019-06-183-3/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix IDE commit to use start_ref See merge request gitlab-org/gitlab-ce!29769
| * | | | Fix IDE commit to use start_ref59023-fix-web-ide-creating-branches-off-new-commitsPaul Slaughter2019-06-173-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** The branch HEAD could be changed since the IDE was opened. This leads to user's unintentionally creating commits that overwrite other changes. https://gitlab.com/gitlab-org/gitlab-ce/issues/59023
* | | | | Merge branch ↵Phil Hughes2019-06-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '63261-the-graphql-query-for-the-mr-popover-failes-on-the-frontend' into 'master' Resolve "The GraphQL query for the MR popover failes on the frontend" Closes #63261 See merge request gitlab-org/gitlab-ce!29712
| * | | | | Make IID string instead of ID in mr popover query63261-the-graphql-query-for-the-mr-popover-failes-on-the-frontendSam Bigelow2019-06-141-1/+1
| | | | | |
* | | | | | Search issuables by iidsRiccardo Padovani2019-06-181-0/+6
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'qa-create-merge-request-tests' into 'master'Mark Lapierre2019-06-181-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing an old quarantined test Closes gitlab-org/quality/staging#50 See merge request gitlab-org/gitlab-ce!28643
| * | | | | Created a refreshed create merge request suiteTomislav Nikic2019-06-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created a refreshed test suite using api to improve speed. This was done by adding qa tags to the merge request view.
* | | | | | Merge branch ↵Thong Kuah2019-06-183-3/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '60617-allow-switching-from-gitlab-managed-to-unmanaged-clusters' into 'master' Allow switching clusters between managed/unmanaged Closes #60617 See merge request gitlab-org/gitlab-ce!29322
| * | | | | | Allow switching clusters between managed/unmanagedTiger2019-06-183-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any resources created while the cluster was managed will be untouched, allowing users to set/unset this flag as they please.
* | | | | | | Make KubernetesService readonlyJames Fargher2019-06-188-60/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are deprecating this service in favor of instance wide clusters. Therefore we removed some code that is not anymore needed for a readonly cluster and also we added some flags to allow for this deprecation. These flags are to be removed in the next release when we finally completelly remove KubernetesService.
* | | | | | | Merge branch 'migrate_k8s_service_integration' into 'master'Thong Kuah2019-06-171-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Migrate Kubernetes service integration templates to clusters See merge request gitlab-org/gitlab-ce!28534
| * | | | | | Allow a user defined namespace on non-gitlab managed clustersJames Fargher2019-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since they are not GitLab managed we wont make assumptions about the namespaces used
* | | | | | | Merge branch '63079-exclude-k8s-namespaces-with-no-service-account-token' ↵Thong Kuah2019-06-171-3/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Don't use Kubernetes namespaces with no token See merge request gitlab-org/gitlab-ce!29643
| * | | | | | | Don't use Kubernetes namespaces with no token63079-exclude-k8s-namespaces-with-no-service-account-tokenTiger2019-06-171-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever we are selecting a namespace to use for a deployment or to query a cluster we want to exclude Kubernetes namespace records that don't have a token set as they will not have the required permissions. However when configuring clusters, we want to use the original namespace record even if it has no token, as a namespace has to be unique on a cluster.
View Lorry Controller Status