summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Application Statistics APIManoj MJ2019-09-0913-38/+180
| | | | | This change implements Application Statistics API
* Merge branch 'remove-unnecessary-freeze-in-app-helpers' into 'master'Stan Hu2019-09-081-3/+3
|\ | | | | | | | | Avoid calling freeze on already frozen strings in app/helpers See merge request gitlab-org/gitlab-ce!32789
| * Avoid calling freeze on already frozen strings in app/helpersdineshpanda2019-09-041-3/+3
| |
* | Add method to authorize reading from prometheus proxyRyan Cobb2019-09-072-0/+5
| |
* | Allow to load ECDSA certificates for pages domainsVladimir Shushlin2019-09-073-4/+38
| | | | | | | | Just replace RSA.new with PKey.read
* | Update keyboard shortcuts modal and docMarcel Amirault2019-09-067-213/+159
| | | | | | | | | | Add missing shortcuts, remove shortcuts that don't exist, and reorder as needed
* | Merge branch 'qa/e2e-tests-for-multiple-boards-on-group-level' into 'master'Walmyr Lima e Silva Filho2019-09-062-3/+4
|\ \ | | | | | | | | | | | | Update view for testability See merge request gitlab-org/gitlab-ce!32644
| * | Update views for testabilityqa/e2e-tests-for-multiple-boards-on-group-levelWalmyr Lima2019-09-052-3/+4
| | |
* | | Back porting changes to trigger user create event on Trial sign upAishwarya Subramanian2019-09-061-0/+1
| | |
* | | Fix sharing localStorage with all MRsIgor2019-09-061-1/+1
| | | | | | | | | | | | | | | | | | Expose id field in the serializer in order to store comments content in the localStorage under the correct key
* | | Quote branch names in how to merge instructionsLee Tickett2019-09-061-8/+9
| | |
* | | Merge branch 'sh-add-sidekiq-logging-for-bad-ci' into 'master'Grzegorz Bizon2019-09-061-1/+27
|\ \ \ | | | | | | | | | | | | | | | | Log errors for failed pipeline creation in PostReceive See merge request gitlab-org/gitlab-ce!32633
| * | | Log errors for failed pipeline creation in PostReceivesh-add-sidekiq-logging-for-bad-ciStan Hu2019-09-051-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a pipeline fails to create in `PostReceive`, the error is silently discarded, making it difficult to understand why a pipeline was not created. We now add a Sidekiq warning message for this. Adding a Sentry exception when this happens would generate a lot of noise for invalid CI files. Relates to https://gitlab.com/gitlab-org/gitlab-ee/issues/14720
* | | | Merge branch '67032-add-projects-param-to-issuable-finder' into 'master'Kamil Trzciński2019-09-061-4/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add projects parameter to IssuableFinder Closes #67032 and gitlab-ee#10904 See merge request gitlab-org/gitlab-ce!32694
| * | | | Add projects parameter to IssuableFinderLin Jen-Shin2019-09-061-4/+19
| |/ / /
* | | | Merge branch 'instance-group-level-knative' into 'master'Grzegorz Bizon2019-09-062-3/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Knative installation on group and instance level clusters Closes #62667 and #62666 See merge request gitlab-org/gitlab-ce!32128
| * | | | Enable Knative installation on group and instance level clustersAlishan Ladhani2019-09-052-3/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Show Knative install button on group/instance cluster pages - Allow Knative to be installed on group/instance clusters - Add feature specs for installing applications on group/instance clusters - Add changelog entry - Update docs to reflect that Knative can now be installed on group-level and instance-level clusters
* | | | Show weight on new board issue (CE-backport)Winnie Hellmann2019-09-061-1/+5
| | | |
* | | | Merge branch 'sh-add-margin-member-list' into 'master'Annabel Dunstone Gray2019-09-061-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add padding to left of "Sort by" in members dropdown See merge request gitlab-org/gitlab-ce!32602
| * | | | Add padding to left of "Sort by" in members dropdownsh-add-margin-member-listStan Hu2019-09-051-1/+1
| | | | |
* | | | | Merge branch 'ce-detect-github-pull-requests' into 'master'Kamil Trzciński2019-09-068-2/+169
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Port CreateGithubPullRequestEvents migration from EE See merge request gitlab-org/gitlab-ce!31802
| * | | | | CE port for pipelines for external pull requestsce-detect-github-pull-requestsFabio Pitino2019-09-058-2/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect if pipeline runs for a GitHub pull request When using a mirror for CI/CD only we register a pull_request webhook. When a pull_request webhook is received, if the source branch SHA matches the actual head of the branch in the repository we create immediately a new pipeline for the external pull request. Otherwise we store the pull request info for when the push webhook is received. When using "only/except: external_pull_requests" we can detect if the pipeline has a open pull request on GitHub and create or not the job based on that.
* | | | | | Merge branch 'fix-style-lint-errors-pipeline-ce' into 'master'Filipa Lacerda2019-09-064-4/+16
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Adds backport change for pipeline.scss See merge request gitlab-org/gitlab-ce!32670
| * | | | | Adds backport change for pipeline.scssfix-style-lint-errors-pipeline-cepburdette2019-09-044-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the necessary backport changes for pipeline.scss. This commit is neccessary from the changes made in MR 16135 Revert schema.rb which was automatically added will investigate
* | | | | | Merge branch 'add-label-push-opts' into 'master'Ash McKenzie2019-09-065-14/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support adding and removing labels w/ push opts Closes #5942 See merge request gitlab-org/gitlab-ce!31831
| * | | | | | Simplify filter_labels method in IssuableBaseServiceadd-label-push-optsChristian Couder2019-09-041-15/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IssuableBaseService::filter_labels() has been refactored to call a new `label_ids_to_filter` method.
| * | | | | | Avoid creating labels when removing themChristian Couder2019-09-043-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IssuableBaseService has been updated so that labels are not created when push options to remove them are received.
| * | | | | | Support adding and removing labels w/ push optsChristian Couder2019-09-044-6/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeRequests::PushOptionsHandlerService has been updated to allow adding and removing labels to a merge request using git push options. To create a new merge request and add 2 labels to it: git push -u origin -o merge_request.create \ -o merge_request.label="My label 1" \ -o merge_request.label="My label 2" To update an existing merge request and remove a label while adding a different label: git push -u origin -o merge_request.label="My added label" \ -o merge_request.unlabel="My removed label" Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/64320
* | | | | | | Fixes pot failureMayra Cabrera2019-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes duplicated entry
* | | | | | | If user can't activate error tracking display a learn more button pointingManeschi Romain2019-09-057-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to doc
* | | | | | | Update text on project import and mirroring formsAdam Hegyi2019-09-052-0/+2
| | | | | | |
* | | | | | | Merge branch 'group_level_jupyterhub' into 'master'Robert Speicher2019-09-053-8/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Group level JupyterHub See merge request gitlab-org/gitlab-ce!32512
| * | | | | | Allow group install of JupyterHubgroup_level_jupyterhubJames Fargher2019-09-052-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes limitations on cluster types that can install JupyterHub
| * | | | | | Allow JupyterHub in group level UIJames Fargher2019-09-051-1/+0
| | | | | | |
* | | | | | | Extend License Compliance entity for Pipelines and MR viewCan Eldem2019-09-051-2/+2
| | | | | | |
* | | | | | | New interruptible attribute supported in YAML parsing.Cédric Tabin2019-09-055-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since it is not possible to dynamically detect if a job is automatically cancellable or not, a this new attribute is necessary. Moreover, it let the maintainer of the repo to adjust the behaviour of the auto cancellation feature to match exactly what he needs.
* | | | | | | Add structure to support EE feature of COARKerri Miller2019-09-053-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are the structural changes for supporting the EE feature of moving "code_owner_approval_required" state from existing on a project to being on the protected branches individually, allowing for CODEOWNER validation on push events.
* | | | | | | Add helpers to wait for axios requestsMartin Hanzel2019-09-051-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add two methods to the axios_utils Jest mock: - `waitFor(url)`, which returns a Promise that resolves when the next request to `url` finishes. - `waitForAll()`, which returns a Promise that resolves when all pending requests finish.
* | | | | | | Merge branch '66067-pages-domain-doesnt-set-target-blank' into 'master'Dmitriy Zaporozhets2019-09-054-8/+15
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes custom Pages domain open as external link in new tab Closes #66067 See merge request gitlab-org/gitlab-ce!32130
| * | | | | | Allow for the passing of options to external_link66067-pages-domain-doesnt-set-target-blankjakeburden2019-09-031-2/+2
| | | | | | |
| * | | | | | Create and use external_link helperjakeburden2019-09-034-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a helper method that takes body text and a url. The output is a external link with icon. It contains the noopenner noreferrer attributes for security. Usage: external_link(domain.title, domain.url) Add rspec test for ExternalLinkHelper Add changelog for MR 32130
| * | | | | | Use “_blank” instead of :_blankjakeburden2019-09-022-3/+3
| | | | | | |
| * | | | | | Add attributes to open deployed pages in new tabjakeburden2019-09-021-2/+8
| | | | | | |
| * | | | | | Add attributes to securely open external linksjakeburden2019-09-021-1/+1
| | | | | | |
| * | | | | | Makes Page domain open as external link in new tabjakeburden2019-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally adds noopener noreferrer as addtional security
* | | | | | | Merge branch 'bjk/routable_counter' into 'master'Andreas Brandl2019-09-051-8/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust routable metric See merge request gitlab-org/gitlab-ce!32591
| * | | | | | | Adjust routable metricbjk/routable_counterBen Kochie2019-09-051-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Define the counter once. * Make metric name follow Prometheus naming conventions. * Add label for call method.
* | | | | | | | Avoid checking dns rebind protection in validationFrancisco Javier López2019-09-051-1/+7
| | | | | | | |
* | | | | | | | Bring method back that was mistakenly removedJoão Cunha2019-09-042-1/+9
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | - We're also improving specs to avoid this could happen again
* | | | | | | Update Pipelines Minutes expire banner (CE)Ammar Alakkad2019-09-045-14/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove hiding the alert functionality - use `danger` class instead of `warning` https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14786
View Lorry Controller Status