summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* 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 '58065-uniform-html-txt-email' into 'master'Sean McGivern2019-06-216-54/+43
|\ | | | | | | | | | | | | Make HTML and text emails for new issues uniform and add the mail to mailer previews Closes #58065 See merge request gitlab-org/gitlab-ce!29886
| * Uniform html and text emails58065-uniform-html-txt-emailFrank van Rest2019-06-216-54/+43
| | | | | | | | | | | | Uniform new_issue_email html and text emails Uniform note_email html and text emails Uniform new_merge_request_email html and text emails
* | Merge branch '38105-pre-release-tag' into 'master'Kushal Pandya2019-06-211-8/+18
|\ \ | | | | | | | | | | | | Renders pre-release tag for pre-releases See merge request gitlab-org/gitlab-ce!29797
| * | Renders pre-release tag for pre-releases38105-pre-release-tagFilipa Lacerda2019-06-211-8/+18
| | | | | | | | | | | | | | | When a release is a pre release, we render an orange badge with `pre-release` label
* | | Merge branch 'bw-issue-reorder' into 'master'Kamil Trzciński2019-06-214-3/+68
|\ \ \ | | | | | | | | | | | | | | | | Add ability to reorder issues See merge request gitlab-org/gitlab-ce!29012
| * | | Add reorder action to Project IssuesControllerbw-issue-reorderBrett Walker2019-06-214-3/+68
| | | | | | | | | | | | | | | | to support manual sorting on the frontend
* | | | Merge branch 'dz-group-packages-page-ce' into 'master'Filipa Lacerda2019-06-211-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add packages nav to group sidebar [CE backport] See merge request gitlab-org/gitlab-ce!29592
| * | | | Add packages nav to group sidebardz-group-packages-page-ceDmitriy Zaporozhets2019-06-191-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Don't show private keys for letsencrypt certsVladimir Shushlin2019-06-215-43/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge branch 'paginate-license-management' into 'master'Filipa Lacerda2019-06-211-0/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport and Docs for Paginate license management and add license search See merge request gitlab-org/gitlab-ce!27602
| * | | | | Paginate license management and add license searchpaginate-license-managementFernando2019-06-201-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First pass at license pagination * Paginate license management client side * Refactor license list into seperate component Add string filtering to license names * Add search input to query on license name Add add license button * Refactor add license button to be a slot Clean up styles and button state logic * Clean up alignment * Disable button when dorpdown is open Remove client side alphabetical sorting * Let the databse return order by date Refactor list to use row slot Further abstract pagination list compnent Finish refactor of paginated list * Refactor component into generic paginated list component * Add additional style tweaks + responsive classes Run prettier Update license_management_spec Run Prettier Add unit tests for paginated list component * Refactor template to be valid html (li in ul) * Add jest unit tests Add additional unit tests * Add unit tests around pagination and search states Add unit tests for filter props Pretty print, lint, and add changelog Update po files Regernate pot file Backport EE changes * Update paginated list component * Update specs and snapshot Add POT file Update default copy for pagianted list * update copy for empty and empty search result states Update pot file Backport changes from EE merge request * Paginaed list component and specs Backport EE changes Update paginated list snapshot Update license management docs and images Backport paginated-list component from EE Link to gitlab-ui artifacts job Match gitlab ui build to EE Update pot file Backport Paginated list changes Set gitlab-ui to temp artifact Add changelog
* | | | | | Add back trimChar method to remove trailing +/-Samantha Ming2019-06-211-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Add test for checking output
* | | | | | Merge branch '63507-fix-race-condition-fetching-token' into 'master'Douwe Maan2019-06-211-3/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Race condition in fetching Kubernetes token causes missing `$KUBECONFIG`" Closes #63507 See merge request gitlab-org/gitlab-ce!29922
| * | | | | | Retry fetching Kubernetes Secret tokenDylan Griffith2019-06-211-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Kubernetes is creating the Secret and token asynchronously it is necessary that we implement some delay or retrying logic to avoid a race condition where we fetch a Secret before the token is even set. There does not appear to be any way for us to force it to be set with any synchronous API call so retrying seems to be the only option.
* | | | | | | Merge branch 'bug/63162-duplicate_path_in_links' into 'master'Sean McGivern2019-06-211-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not rewrite relative links for system notes Closes #63162 See merge request gitlab-org/gitlab-ce!29825
| * | | | | | | Do not rewrite relative links for system notesbug/63162-duplicate_path_in_linksMario de la Ossa2019-06-201-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'remove-kubernetes-service-deployment-platform' into 'master'Thong Kuah2019-06-212-45/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Kubernetes service from deployment platform See merge request gitlab-org/gitlab-ce!29786
| * | | | | | | Update KubernetesService deprecation warningremove-kubernetes-service-deployment-platformTiger2019-06-211-7/+2
| | | | | | | |
| * | | | | | | Remove Kubernetes service from deployment platformTiger2019-06-211-38/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This will no longer be used for deployments, as all service templates have been migrated to clusters.
* | | | | | | Remove project-level cluster credential fallbackTiger Watson2019-06-211-13/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project-level clusters that made use of this legacy behaviour have been migrated to unmanaged clusters, so we are now free to remove this fallback.
* | | | | | Omit issues links in merge request entity API responseStan Hu2019-06-203-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The merge request widget has a section that includes which issues may be closed or mentioned based on the merge request description. The problem is that rendering and redacting Markdown can be expensive, especially since the browser polls for the data every 10 seconds. Since these links don't change much and are just nice to have, we only load them on first page load. The frontend will use the existing data if the data doesn't appear on subsequent requests. This saves about 30% of the rendering time of this endpoint, which adds up to significant savings considering that `MergeRequestsController#show.json` is called over a million times a day on GitLab.com. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63546
* | | | | | Merge branch '57973-errors-in-application-settings-panel-shows-wrong-panel' ↵Sean McGivern2019-06-2024-67/+62
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Errors in application settings panel shows wrong panel See merge request gitlab-org/gitlab-ce!25434
| * | | | | | Update application settings using correct actionBrett Walker2019-06-1924-67/+62
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating multiple application settings panels through a single action causes the incorrect action to be shown when there are errors. Instead, make each panel action handle both updating and display.
* | | | | | Merge branch 'fix-failing-master-graphql-import' into 'master'Sean McGivern2019-06-201-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed failing GraphQL file import Closes #63527 See merge request gitlab-org/gitlab-ce!29900
| * | | | | | Fixed failing GraphQL file importPhil Hughes2019-06-201-1/+1
| | | | | | |
* | | | | | | 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.
* | | | | | Merge branch 'last-commit-repo-widget' into 'master'Filipa Lacerda2019-06-203-0/+193
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render last commit widget with Vue Closes #62766 See merge request gitlab-org/gitlab-ce!29419
| * | | | | Render tree last commit widget with VuePhil Hughes2019-06-193-0/+193
| | |_|_|/ | |/| | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62766
* | | | | 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