summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Add CSP nonce to graphiql-rails JavaScriptsh-revert-graphiql-versionStan Hu2019-09-111-2/+2
|
* Revert "Update to graphiql-rails v1.7.10"Stan Hu2019-09-111-9/+90
| | | | This reverts commit f222e74d455ec9fc10efb783ffe4684836cc1c3b.
* Refactor DiffFileHeader testsIllya Klymov2019-09-121-42/+16
| | | | | | * Switched from Karma to Jest * Reorganized tests to have correct semantics * Removed unused computed properties from component
* Merge branch 'qa-wiki-ssh-spec' into 'master'Mark Lapierre2019-09-122-2/+2
|\ | | | | | | | | CE backport of E2E Test wiki SSH push to Geo primary node See merge request gitlab-org/gitlab-ce!32885
| * Update qa resources and pages for Geo wiki specqa-wiki-ssh-specJennie Louie2019-09-102-2/+2
| | | | | | | | | | Add qa selectors to wiki show and ssh keys page Add method to wiki push resource to find ssh_uri
* | Merge branch 'sh-fix-removed-support-bot-column' into 'master'Mayra Cabrera2019-09-121-0/+3
|\ \ | | | | | | | | | | | | | | | | | | Ignore support_bot column in users table Closes #67295 See merge request gitlab-org/gitlab-ce!32933
| * | Ignore support_bot column in users tablesh-fix-removed-support-bot-columnStan Hu2019-09-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32554 removed the support_bot column, but nodes were not told to ignore this column. As a result, after the post-deploy migration ran, nodes attempted to use this column, causing 500 errors. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/67295
* | | Merge branch 'static-objects-external-storage' into 'master'Thong Kuah2019-09-1113-3/+131
|\ \ \ | | | | | | | | | | | | | | | | Enable serving static objects from an external storage See merge request gitlab-org/gitlab-ce!31025
| * | | Enable serving static objects from an external storagestatic-objects-external-storageAhmad Sherif2019-09-1013-3/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It consists of two parts: 1. Redirecting users to the configured external storage 1. Allowing the external storage to request the static object(s) on behalf of the user by means of specific tokens Part of https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/6829
* | | | Merge branch 'ce-indicator-for-pipeline-for-merge-train' into 'master'Thong Kuah2019-09-112-46/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE backport for gitlab-org/gitlab-ee!14664: Show indicator to Pipelines for merge train See merge request gitlab-org/gitlab-ce!32025
| * | | | Make MR pipeline widget text more descriptive (CE)ce-indicator-for-pipeline-for-merge-trainNathan Friend2019-09-112-46/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change updates the text of the pipeline widget that appears on the merge request page. The text has been made more consistent between different types of pipelines; this makes the front-end implementation simpler and more maintainable. In addition, the type of pipeline is (i.e. regular pipeline, merge request pipeline, detached pipeline) included in the text, making this type more obvious to the end user. Some information has been removed from the widget as part of this change; however, any information that was removed already appears elsewhere on the merge request page.
* | | | | Add bottom margin to snippet titleMarcel van Remmerden2019-09-111-1/+1
| |_|/ / |/| | |
* | | | Add missing `render_gfm` import to filesIllya Klymov2019-09-113-2/+3
| | | |
* | | | Replacing vue-resource with axios in Markdown fieldWinnie Hellmann2019-09-111-3/+3
| | | |
* | | | Backport changes for 16252 in EE add current_user to report comparison servicesCan Eldem2019-09-112-4/+5
| | | |
* | | | Disable "transfer group" button when no parent group is selectedJan Beckmann2019-09-115-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | Refactor project_edit.js to be reusable for this purpose Closes #64799
* | | | Merge branch '61927-pages-custom-domain-virtual-domain' into 'master'Kamil Trzciński2019-09-115-5/+83
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add support for custom domains to the Pages internal API See merge request gitlab-org/gitlab-ce!32735
| * | | | Add support for custom domains to the internal Pages APIKrasimir Angelov2019-09-105-5/+83
| | |_|/ | |/| | | | | | | | | | | | | | Update the `/internal/pages` endpoint to return virtual domain configuration for custom domains.
* | | | Add 30 and 60 minute bucketsElliot Rushton2019-09-111-1/+1
| |/ / |/| |
* | | Merge branch 'dz-fix-add-cluster-doc-links' into 'master'Kushal Pandya2019-09-112-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Fix doc links for adding a cluster to a project See merge request gitlab-org/gitlab-ce!32890
| * | | Fix doc links for adding a cluster to a projectdz-fix-add-cluster-doc-linksdocs/dz-fix-cluster-doc-linksDmitriy Zaporozhets2019-09-102-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Enables Run Pipeline button to be renderedFilipa Lacerda2019-09-119-10/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Merge Request view, under pipelines tab the user can see a run pipeline button Adds axios post request to button click Adds the logic to handle the user click, refresh the table and disable the button while thee request is being made Updates UI for desktop and mobile Adds specs Regenerates potfile Follow-up after review Uses .finally to avoid code repetition
* | | | Merge branch 'sh-fix-oauth-application-page' into 'master'Rémy Coutable2019-09-113-2/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize /admin/applications so that it does not timeout Closes #67228 See merge request gitlab-org/gitlab-ce!32852
| * | | | Optimize /admin/applications so that it does not timeoutsh-fix-oauth-application-pageStan Hu2019-09-093-2/+7
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On our dev instance, /admin/applications as not loading because: 1. There was an unindexed query by `application_id`. 2. There was an expensive query that attempted to load 1 million unique entries via ActiveRecord just to find the unique count. We fix the first issue by adding an index for that column. We fix the second issue with a simple SELECT COUNT(DISTINCT resource_owner_id) SQL query. In addition, we add pagination to avoid loading more than 20 applications at once. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/67228
* | | | Merge branch '65988-optimize-snippet-listings' into 'master'Thong Kuah2019-09-1112-71/+97
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Optimize queries for snippet listings See merge request gitlab-org/gitlab-ce!32576
| * | | | Add controller concern for paginated collections65988-optimize-snippet-listingsMarkus Koller2019-09-107-44/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had similar code in a few places to redirect to the last page if the given page number is out of range. This unifies the handling in a new controller concern and adds usage of it in all snippet listings.
| * | | | Optimize queries for snippet listingsMarkus Koller2019-09-109-28/+49
| | | | | | | | | | | | | | | | | | | | | | | | | - Avoid N+1 queries for authors and comment counts - Avoid an additional snippet existence query
* | | | | Fix CSP failure patching graphiql viewAlessio Caiazza2019-09-111-0/+18
| | | | | | | | | | | | | | | | | | | | Backporting https://github.com/rmosolgo/graphiql-rails/pull/71
* | | | | Merge branch '66023-public-private-fork-counts' into 'master'Stan Hu2019-09-113-13/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Forks count do not match after searching" Closes #66023 See merge request gitlab-org/gitlab-ce!31930
| * | | | | Fix N+1s queriesDouglas Barbosa Alexandre2019-09-102-2/+7
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into ↵Douglas Barbosa Alexandre2019-09-1031-92/+208
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | camilstaps/gitlab-ce-new-66023-public-private-fork-counts
| * | | | | | Apply suggestion to app/views/projects/forks/index.html.hamlStan Hu2019-09-101-1/+1
| | | | | | |
| * | | | | | Make Rubocop happyDouglas Barbosa Alexandre2019-09-092-1/+2
| | | | | | |
| * | | | | | Remove N+1 queriesDouglas Barbosa Alexandre2019-09-091-1/+1
| | | | | | |
| * | | | | | Merge remote-tracking branch 'origin/master' into ↵Douglas Barbosa Alexandre2019-09-0968-321/+795
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | camilstaps/gitlab-ce-new-66023-public-private-fork-counts
| * | | | | | | Remove "n private forks you have no access to"Camil Staps2019-09-061-6/+0
| | | | | | | |
| * | | | | | | Fix public/private/internal fork countsCamil Staps2019-09-062-10/+7
| | | | | | | |
* | | | | | | | Prevent archived projects from showing up in global searchDavid Palubin2019-09-101-1/+1
| | | | | | | |
* | | | | | | | Add global toast moduleFernando Arias2019-09-101-0/+8
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15015#note_210891978
* | | | | | | Remove vue resource from sidebar serviceWinnie Hellmann2019-09-104-42/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32400
* | | | | | | Merge branch '34338-details-element' into 'master'Annabel Dunstone Gray2019-09-101-0/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add padding to details element in markdown Closes #34338 See merge request gitlab-org/gitlab-ce!32716
| * | | | | | | Add padding to details element in markdown34338-details-elementJarek Ostrowski2019-09-091-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add MR to changelog entry Adjust to give margin bottom to details instead of last-child Remove trailing whitespace
* | | | | | | | Merge branch 'remove-old-ignore-column' into 'master'Peter Leitzen2019-09-104-19/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove some old `ignore_column` in AR models [CE] See merge request gitlab-org/gitlab-ce!31001
| * | | | | | | | Remove ignore_column occurence in CE coderemove-old-ignore-columnDmitriy Zaporozhets2019-09-104-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Merge branch '64251-redis-set-cache-mark-2' into 'master'Stan Hu2019-09-101-0/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Re-introduce the Redis set cache for branch and tag names - but don't enable it yet See merge request gitlab-org/gitlab-ce!32412
| * | | | | | | | Don't use the redis set cache yetNick Thomas2019-09-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For zero-downtime deployed in a mixed code environment between 12.2 and 12.3, the branch and tag name cache is incorrectly invalidated - a push to an old machine will not clear the redis set version of the cache on the new machine. This commit ensures that, in 12.3, both set and non-set versions of the cache are invalidated, but does not write or consult the set version of the cache. . In 12.4, it will be safe to switch branch and tag names to the redis set cache both it and the legacy cache will be invalidated appropriately in such a mixed code environment. This delays the full implementation of the feature by one release, but in the absence of a credible feature-flagging strategy, and amidst an abundance of caution about the effects of too-eager cache expiration, I believe this is the best approach available to us.
| * | | | | | | | Revert "Revert "Cache branch and tag names as Redis sets""Nick Thomas2019-09-101-4/+8
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | This reverts commit c6ccc07f48c7c1f9da43ecd82015500a4340544d.
* | | | | | | | Async import custom stage form componentsEzekiel Kigbo2019-09-105-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Imports the files needed for the custom stage form and adds the EE specific css. Added stub addStageMixin
* | | | | | | | Merge branch 'fj-62807-not-prefill-target-branch' into 'master'Lin Jen-Shin2019-09-102-5/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid filling target branch when unknown and source is default branch Closes #62807 See merge request gitlab-org/gitlab-ce!32701
| * | | | | | | Avoid setting merge request target branch when source if default branchfj-62807-not-prefill-target-branchFrancisco Javier López2019-09-102-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case the source and the target project are the same, the source branch is the default branch, and the target branch is not present, we will avoid prefilling the target branch with the repository default branch. Letting the user decide.
View Lorry Controller Status