summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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-211-21/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Omit issues links in merge request entity API responseStan Hu2019-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2023-23/+23
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 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-1923-23/+23
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Fix double border in profile pageYoginth2019-06-191-1/+1
|/ /
* | Resolve "Username availability checker breaks inline validation"Jiaan2019-06-191-4/+4
|/
* Add documentation and testsManoj MJ2019-06-193-8/+6
| | | | | | | | This commit adds - feature specs - to test the ability of a user with "developer" permission to delete tags in repositories. - documentation
* Merge branch '63231-wiki-nav' into 'master'Phil Hughes2019-06-182-2/+2
|\ | | | | | | | | | | | | 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-142-2/+2
| |
* | Remove support for creating non-RBAC kubernetes clustersHordur Freyr Yngvason2019-06-181-9/+0
| |
* | 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-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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-183-2/+9
|/ / / | | | | | | | | | | | | | | | | | | | | | 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 'qa-ml-validate-after-visit-in-block' into 'master'Dan Davison2019-06-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | [CE] Validate page after visit in block See merge request gitlab-org/gitlab-ce!29524
| * | | Allow the Projects Dashboard to be validatedqa-ml-validate-after-visit-in-blockMark Lapierre2019-06-121-1/+1
| | | |
* | | | CE port of IP address restriction for groupsImre Farkas2019-06-171-0/+1
| | | |
* | | | Merge branch '8429-enforce-template-inclusion-in-pipelines-fe-backport' into ↵Filipa Lacerda2019-06-171-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Backporting required template form on admin CI/CD See merge request gitlab-org/gitlab-ce!29154
| * | | | Backporting an EE admin form8429-enforce-template-inclusion-in-pipelines-fe-backportScott Hampton2019-06-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | EE added a required template form on the CI/CD page. This is a backport for that change.
* | | | | Merge branch 'revert-3a50fc5d' into 'master'Filipa Lacerda2019-06-172-4/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Revert "Merge branch '57414-show-pipeline-iid-in-pipelines-page' into 'master'" See merge request gitlab-org/gitlab-ce!29684
| * | | | Revert "Merge branch '57414-show-pipeline-iid-in-pipelines-page' into 'master'"revert-3a50fc5dKamil Trzciński2019-06-142-4/+3
| | | | | | | | | | | | | | | This reverts merge request !26853
* | | | | Backport: Pendo POC snippetDonald Cook2019-06-151-0/+1
| |_|_|/ |/| | |
* | | | Added diff suggestion popoverPhil Hughes2019-06-141-1/+3
|/ / / | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56523
* | | Merge branch 'fix-flyout-navs' into 'master'Phil Hughes2019-06-142-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Fix sidebar flyout navigation See merge request gitlab-org/gitlab-ce!29571
| * | | Fix sidebar flyout navigationfix-flyout-navsLuke Bennett2019-06-132-2/+2
| | | | | | | | | | | | | | | | Show flyout nav for active item when collapsed.
* | | | Backport of EE changes from MR 13763Walmyr2019-06-141-2/+2
| | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13763
* | | | Restore some unrelated changes from d9cb907cNick Thomas2019-06-133-3/+3
| | | |
* | | | Revert "Avoid loading objects from DB in ES results"Nick Thomas2019-06-134-4/+4
| | | | | | | | | | | | | | | | This reverts commit d9cb907c3e987363065136bafb2156e86bc5de26.
* | | | Add trackEvent when accessing the Register tabAsh McKenzie2019-06-131-1/+1
| | | | | | | | | | | | | | | | This is a no-op for CE.
* | | | Adding break-word css to home-panel-description class to correctly word wrap ↵Erik van der Gaag2019-06-121-1/+1
| | | | | | | | | | | | | | | | long words
* | | | Merge branch 'ealcantara-popover-styling' into 'master'Annabel Dunstone Gray2019-06-121-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Style popovers according to the design specs See merge request gitlab-org/gitlab-ce!28375
| * | | Cleanup deprecation message popoverEnrique Alcantara2019-06-071-0/+1
| | | |
* | | | Merge branch 'fix-diverged-branch-locals' into 'master'Stan Hu2019-06-121-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix diverged branch locals See merge request gitlab-org/gitlab-ce!29508
| * | | | Fix diverged branch localsfix-diverged-branch-localsLuke Bennett2019-06-121-1/+1
| | |_|/ | |/| |
* | | | Add EE backport for the admin viewMałgorzata Ksionek2019-06-111-0/+1
|/ / /
* | | List ssh-ed25519 exampleBen Bodenmiller2019-06-101-2/+2
| | |
* | | Merge branch 'patch-56' into 'master'Sean McGivern2019-06-102-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Clarify that performance bar is not always on See merge request gitlab-org/gitlab-ce!28287
| * \ \ Merge remote-tracking branch 'origin/master' into patch-56Sean McGivern2019-06-10184-684/+997
| |\ \ \
| * | | | Clarify that performance bar is not always onBen Bodenmiller2019-06-092-2/+2
| | | | |
* | | | | Externalize strings of email page in user profileantony liu2019-06-102-24/+24
| | | | |
* | | | | Make option dropdown button to match adjacent buttonSamantha Ming2019-06-101-1/+1
| |/ / / |/| | |
* | | | Merge branch '11396-dependency-list-connect-frontend-to-backend-ce' into ↵Thong Kuah2019-06-101-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add project Dependency List sidebar entry See merge request gitlab-org/gitlab-ce!29189
| * | | | Add project Dependency List sidebar entry11396-dependency-list-connect-frontend-to-backend-ceMark Florian2019-06-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | This is a CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13968.
* | | | | Merge branch 'gt-externalize-profiles-preferences' into 'master'Phil Hughes2019-06-071-10/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize profiles preferences Closes #53349 See merge request gitlab-org/gitlab-ce!28470
| * | | | | Externalize profiles preferencesGeorge Tsiolis2019-06-071-10/+11
| | | | | |