summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Document all the available DAST variablesdocs/dast-analyzersAchilleas Pipinellis2019-07-161-0/+22
|
* Merge branch '35757-add-result-to-request' into 'master'Dmitriy Zaporozhets2019-07-164-15/+51
|\ | | | | | | | | Add response to move multiple issues request See merge request gitlab-org/gitlab-ce!30400
| * Modified spec so a second call to json_response is avoided35757-add-result-to-requestPatrick Derichs2019-07-161-2/+7
| |
| * Use match_array instead of includePatrick Derichs2019-07-161-1/+1
| |
| * Add result to MoveService#execute_multiplePatrick Derichs2019-07-164-16/+47
| | | | | | | | | | | | | | | | It adds a hash response which includes the count, success state and the moved issues itself so the caller has additional information about the result of the process.
* | Merge branch 'vue-file-list-breadcrumb-dropdown' into 'master'Filipa Lacerda2019-07-168-15/+296
|\ \ | | | | | | | | | | | | | | | | | | Added add to tree dropdown to Vue files breadcrumb Closes #62865 See merge request gitlab-org/gitlab-ce!30177
| * | Added add to tree dropdown to Vue files breadcrumbPhil Hughes2019-07-158-15/+296
| | |
* | | Merge branch 'fix-create-mr-enabling-button' into 'master'Filipa Lacerda2019-07-162-1/+35
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed create merge request button not enabling Closes #64454 See merge request gitlab-org/gitlab-ce!30776
| * | | Fixed create merge request button not enablingPhil Hughes2019-07-162-1/+35
| | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64454
* | | | Merge branch 'bjk/fix_prom_example' into 'master'Achilleas Pipinellis2019-07-162-7/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | docs: Update example Prometheus scrape config See merge request gitlab-org/gitlab-ce!30739
| * | | | Update example Prometheus scrape configbjk/fix_prom_exampleBen Kochie2019-07-152-7/+52
| | | | | | | | | | | | | | | | | | | | | | | | | Use a full real-world example that is compatible with the omnibus dashboards and follows Prometheus best practices.
* | | | | Merge branch 'rake-db-migrate-status-fix-docs' into 'master'Achilleas Pipinellis2019-07-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rake db:migrate:status typo in docs Closes #63908 See merge request gitlab-org/gitlab-ce!30785
| * | | | | Fix rake db:migrate:status typo in docsGreg Myers2019-07-161-1/+1
|/ / / / /
* | | | | Merge branch 'auto-devops-group-level' into 'master'Achilleas Pipinellis2019-07-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Note in the docs about possibility of disabling Auto DevOps at group-level for self-managed instances See merge request gitlab-org/gitlab-ce!30781
| * | | | | Note in the docs about possibility of disabling Auto DevOps at group-level ↵Muhamed Huseinbašić2019-07-161-1/+1
|/ / / / / | | | | | | | | | | | | | | | for self-managed instances
* | | | | Merge branch 'fj-refactor-web-ide-commits-counter' into 'master'James Lopez2019-07-168-39/+89
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor WebIdeCommitsCount class See merge request gitlab-org/gitlab-ce!30726
| * | | | | Refactored WebIdeCommitsCount classFrancisco Javier López2019-07-168-39/+89
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | We're adding more redis base counters to the web ide and other classes. We're refactoring this class in other to use the logic in other places.
* | | | | Merge branch 'docs-10078-dependencies-api' into 'master'Achilleas Pipinellis2019-07-162-0/+51
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Docs Dependencies API See merge request gitlab-org/gitlab-ce!30623
| * | | | Docs Dependencies APITetiana Chupryna2019-07-162-0/+51
|/ / / /
* | | | Merge branch 'telemetry-37-bug-with-snowplow-structured-events' into 'master'Fatih Acet2019-07-1611-16/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE backport: Removed non-decimal event values See merge request gitlab-org/gitlab-ce!30684
| * | | | CE backport: Removed non-decimal event valuesDonald Cook2019-07-1611-16/+16
|/ / / / | | | | | | | | | | | | | | | | Snowplow only accepts decimals for value This MR removes sending of value implicitly with the value attribute
* | | | Merge branch 'remove-support-for-legacy-pipeline-triggers' into 'master'Kamil Trzciński2019-07-1614-73/+240
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove support for legacy pipeline triggers Closes #30231 See merge request gitlab-org/gitlab-ce!30133
| * | | | Do not import legacy triggers from project JSONremove-support-for-legacy-pipeline-triggersFabio Pitino2019-07-153-3/+22
| | | | |
| * | | | Ensure ImportExport maintains trigger ownershipFabio Pitino2019-07-152-1/+2
| | | | |
| * | | | Allow use of legacy triggers with feature flagFabio Pitino2019-07-1511-69/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep feature flag disabled by default and turn off all functionality related to legacy triggers. * Block legacy triggers from creating pipeline * Highlight legacy triggers to be invalid via the UI * Make legacy triggers invalid in the model
* | | | | Merge branch 'issue-64070-asciidoctor-section-anchors' into 'master'Bob Van Landuyt2019-07-164-2/+103
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable section anchors Closes #64070 See merge request gitlab-org/gitlab-ce!30666
| * | | | | Enable section anchorsGuillaume Grossetie2019-07-164-2/+103
| | | | | |
* | | | | | Merge branch 'update-release-api-documentation' into 'master'Marcia Ramos2019-07-163-2/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Release API Documentation Closes #38105 See merge request gitlab-org/gitlab-ce!30697
| * | | | | | Update Release API docsJason Goodman2019-07-163-2/+18
|/ / / / / / | | | | | | | | | | | | | | | | | | Include released_at parameter
* | | | | | Merge branch 'jc-remove-catfile-flag' into 'master'Bob Van Landuyt2019-07-164-18/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove catfile cache feature flag See merge request gitlab-org/gitlab-ce!30750
| * | | | | | Remove catfile cache feature flagjc-remove-catfile-flagJohn Cai2019-07-154-18/+7
| | | | | | |
* | | | | | | Merge branch '63082-specs-changes' into 'master'Jan Provaznik2019-07-167-38/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify factories for services See merge request gitlab-org/gitlab-ce!30611
| * | | | | | | Fix message for successful jira testJarka Košanová2019-07-161-1/+1
| | | | | | | |
| * | | | | | | Simplify factories for servicesJarka Košanová2019-07-166-37/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use predefined factories when creating projects with services - remove unnecessary arguments
* | | | | | | | Merge branch 'zj-update-proto' into 'master'Douwe Maan2019-07-163-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Gitaly-Proto to 1.37.0 See merge request gitlab-org/gitlab-ce!30774
| * | | | | | | | Upgrade Gitaly-Proto to 1.37.0Zeger-Jan van de Weg2019-07-163-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done to perform some local testing, but while the change was already made it made sense to commit the change.
* | | | | | | | | Merge branch 'remove-complex-expressions-feature-flag' into 'master'Kamil Trzciński2019-07-166-172/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing ci_variables_complex_expressions feature flag and deprecated code branches See merge request gitlab-org/gitlab-ce!30717
| * | | | | | | | | Removing ci_variables_complex_expressions feature flag and deprecated code ↵remove-complex-expressions-feature-flagdrew cimino2019-07-126-172/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | branches
* | | | | | | | | | Merge branch '61342-commit-search-result-doesn-t-pass-wcag-color-audit' into ↵Paul Slaughter2019-07-162-1/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Commit search result doesn't pass WCAG color audit" Closes #61342 See merge request gitlab-org/gitlab-ce!30312
| * | | | | | | | | | Change color for project namespace to light grayMarcel van Remmerden2019-07-162-1/+6
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'bw-enhance-rake-seed' into 'master'James Lopez2019-07-161-2/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow parameters for rake gitlab:seed:issues See merge request gitlab-org/gitlab-ce!30689
| * | | | | | | | | Allow parameters for rake gitlab:seed:issuesbw-enhance-rake-seedBrett Walker2019-07-151-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to specify backfill_weeks and average_issues_per_week
* | | | | | | | | | Merge branch 'pl-json_response-ce' into 'master'Grzegorz Bizon2019-07-1633-111/+63
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport "Cleanup usages of `JSON.parse` in specs" See merge request gitlab-org/gitlab-ce!30712
| * | | | | | | | | Cleanup usages of `JSON.parse` in specsPeter Leitzen2019-07-1633-111/+63
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefer `json_response` where applicable.
* | | | | | | | | Merge branch '59875-stylelint-panels' into 'master'Phil Hughes2019-07-163-3/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed style-lint errors for `panels.scss` Closes #59875 See merge request gitlab-org/gitlab-ce!30748
| * | | | | | | | | Fixed style-lint errors for `panels.scss`59875-stylelint-panelsDenys Mishunov2019-07-153-3/+2
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed @extend from SCSS file in favor of directly assigning CSS class in corresponding HTML snippets.
* | | | | | | | | Merge branch 'docs/avoid-using-square-brackets' into 'master'Achilleas Pipinellis2019-07-161-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite to avoid square brackets, minimizing Kramdown warnings See merge request gitlab-org/gitlab-ce!30773
| * | | | | | | | | Rewrite to avoid square brackets, minimizing Kramdown warningsEvan Read2019-07-161-3/+3
|/ / / / / / / / /
* | | | | | | | | Merge branch 'rake-db-migrate-status-docs' into 'master'Achilleas Pipinellis2019-07-161-0/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document db:migrate:status rake task Closes #63908 See merge request gitlab-org/gitlab-ce!30202
| * | | | | | | | | Document db:migrate:status rake taskGreg Myers2019-07-161-0/+19
|/ / / / / / / / /