summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '63231-wiki-nav' into 'master'Phil Hughes2019-06-184-3/+3
|\ | | | | | | | | | | | | 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-144-3/+3
| |
* | Merge branch 'move-all-configs-to-global' into 'master'Grzegorz Bizon2019-06-1821-316/+825
|\ \ | | | | | | | | | | | | | | | | | | Introduce default: for gitlab-ci.yml Closes #62732 See merge request gitlab-org/gitlab-ce!24627
| * | Introduce default: for gitlab-ci.ymlKamil Trzciński2019-06-1821-316/+825
|/ / | | | | | | | | | | | | | | | | | | | | This moves all existing `image/services/before_script/variables` into `default:`. This allows us to easily add a default and top-level entries. `default`: is keep backward compatible: to be considered to be job if `default:script:` is specified. This behavior should be removed. All existing `image/services/before_script/variables` are properly handled in root context.
* | Merge branch 'asciidoctor-upgrade' into 'master'Douwe Maan2019-06-184-13/+15
|\ \ | | | | | | | | | | | | | | | | | | Upgrade asciidoctor version to 2.0.10 and change method names in html5_converter Closes #63304 See merge request gitlab-org/gitlab-ce!29741
| * | Add author to changelograju2492019-06-171-1/+1
| | |
| * | Merge branch 'asciidoctor-upgrade' of https://gitlab.com/raju249/gitlab-ce ↵raju2492019-06-170-0/+0
| |\ \ | | | | | | | | | | | | into asciidoctor-upgrade
| | * | Remove extra white lineraju2492019-06-171-1/+0
| | | |
| * | | Add changelog for the upgraderaju2492019-06-172-1/+5
| |/ /
| * | Revert to old name as its not needed to change and keep same in both filesraju2492019-06-172-2/+2
| | |
| * | Change asciidoc.rb to refer new backend nameraju2492019-06-171-1/+1
| | |
| * | Use same backend name, and remove reduntant use of requireraju2492019-06-171-2/+1
| | |
| * | Add gemfile lock file for new ascii doctor versionsraju2492019-06-171-5/+5
| | |
| * | Upgrade asciidoctor version to 2.0.10 and change menthod names in ↵raju2492019-06-172-6/+5
| | | | | | | | | | | | html5_converter
* | | Merge branch 'bootstrap-to-glui' into 'master'Filipa Lacerda2019-06-186-47/+12
|\ \ \ | | | | | | | | | | | | | | | | Import bootstrap styles from gitlab-ui See merge request gitlab-org/gitlab-ce!26165
| * | | Upgrade gitlab-ui 4.2.0Enrique Alcantara2019-06-172-5/+6
| | | |
| * | | Import bootstrap styles from gitlab-uiSimon Knox2019-06-174-42/+6
| | | | | | | | | | | | | | | | | | | | Use gitlab_ui.scss instead of all the bootstrap imports Allow the ../node_modules path from gitlab_ui.scss to resolve
* | | | Merge branch 'qa-perf-mr-with-many-commits' into 'master'Ramya Authappan2019-06-182-58/+132
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add script for creating an MR with many commits See merge request gitlab-org/gitlab-ce!29762
| * | | | Add script for MR with many commitsqa-perf-mr-with-many-commitsSanad Liaquat2019-06-182-58/+132
| | | | | | | | | | | | | | | | | | | | Also does a lot of cleanup and refactoring
* | | | | Merge branch 'docs-review-reduce-repo-size' into 'master'Nick Thomas2019-06-181-11/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fixes all the alert boxes in "reduce repo size" Closes #61472 See merge request gitlab-org/gitlab-ce!29680
| * | | | | Docs: Fixes all the alert boxes in "reduce repo size"Marcia Ramos2019-06-181-11/+12
|/ / / / /
* | | | | Merge branch '62760-unquarantine-spec' into 'master'Lin Jen-Shin2019-06-181-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix flaky time related failure in spec/models/ci/pipeline_schedule_spec.rb Closes #62760 See merge request gitlab-org/gitlab-ce!29778
| * | | | | Fix flaky time related spec62760-unquarantine-specHeinrich Lee Yu2019-06-181-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Also removes test from quarantine
* | | | | | Merge branch '55902-disable-creation-of-non-rbac-kubernetes-clusters' into ↵Phil Hughes2019-06-184-14/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove support for creating non-RBAC kubernetes clusters Closes #55902 See merge request gitlab-org/gitlab-ce!29614
| * | | | | | Remove support for creating non-RBAC kubernetes clustersHordur Freyr Yngvason2019-06-184-14/+8
|/ / / / / /
* | | | | | Merge branch '59023-fix-web-ide-creating-branches-off-new-commits' into 'master'Phil Hughes2019-06-187-10/+92
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix IDE commit to use start_ref See merge request gitlab-org/gitlab-ce!29769
| * | | | | | Fix IDE commit to use start_ref59023-fix-web-ide-creating-branches-off-new-commitsPaul Slaughter2019-06-177-10/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** The branch HEAD could be changed since the IDE was opened. This leads to user's unintentionally creating commits that overwrite other changes. https://gitlab.com/gitlab-org/gitlab-ce/issues/59023
* | | | | | | Merge branch ↵Phil Hughes2019-06-182-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '63261-the-graphql-query-for-the-mr-popover-failes-on-the-frontend' into 'master' Resolve "The GraphQL query for the MR popover failes on the frontend" Closes #63261 See merge request gitlab-org/gitlab-ce!29712
| * | | | | | | Make IID string instead of ID in mr popover query63261-the-graphql-query-for-the-mr-popover-failes-on-the-frontendSam Bigelow2019-06-142-1/+7
| | | | | | | |
* | | | | | | | Merge branch 'mc/feature/required-template-inclusion-single-commit-ce' into ↵Grzegorz Bizon2019-06-183-3/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Enforce template inclusion in pipelines - CE See merge request gitlab-org/gitlab-ce!29296
| * | | | | | | | Backport CE changesmc/feature/required-template-inclusion-single-commit-ceMatija Čupić2019-06-173-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backports CE changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14011/
* | | | | | | | | Merge branch '#30974-issue-search-by-number' into 'master'Sean McGivern2019-06-183-0/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search issuables by iids Closes #39908 and #30974 See merge request gitlab-org/gitlab-ce!28302
| * | | | | | | | | Search issuables by iidsRiccardo Padovani2019-06-183-0/+22
|/ / / / / / / / /
* | | | | | | | | Merge branch 'remove-node-modules-from-artifacts' into 'master'Rémy Coutable2019-06-182-6/+40
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only push to assets-compile-cache when in master See merge request gitlab-org/gitlab-ce!28854
| * | | | | | | | | Only push to assets-compile-cache in masterremove-node-modules-from-artifactsHeinrich Lee Yu2019-06-172-5/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update dependencies to match updated job names
| * | | | | | | | | Bump assets-compile-cache to cleanup old filesHeinrich Lee Yu2019-06-171-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'config-application-differences' into 'master'Lin Jen-Shin2019-06-181-0/+30
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport EE changes to config/application.rb See merge request gitlab-org/gitlab-ce!29557
| * | | | | | | | | | Backport EE changes to config/application.rbconfig-application-differencesYorick Peterse2019-06-171-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports the EE changes made to this config file to CE. EE specific bits do not need an `if Gitlab.ee?`, as everything will work transparently when using CE.
* | | | | | | | | | | Merge branch 'ashmckenzie/add-created-at-index-to-events' into 'master'Thong Kuah2019-06-182-0/+27
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add index to events and audit_events tables Closes gitlab-com/Product#309 See merge request gitlab-org/gitlab-ce!29194
| * | | | | | | | | | | Add index to events and audit_events tablesashmckenzie/add-created-at-index-to-eventsAsh McKenzie2019-06-182-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Index on created_at, author_id
* | | | | | | | | | | | Merge branch 'bw-update-graphql-docs' into 'master'Evan Read2019-06-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GraphQL document to mention that epics are supported See merge request gitlab-org/gitlab-ce!29777
| * | | | | | | | | | | | Mention that epics are supported in GraphqlQLbw-update-graphql-docsBrett Walker2019-06-171-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'docs/add-note-git-clone-path' into 'master'Evan Read2019-06-181-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note about nested variables for GIT_CLONE_PATH See merge request gitlab-org/gitlab-ce!29590
| * | | | | | | | | | | | | Add note about nested variables for GIT_CLONE_PATHSteve Azzopardi2019-06-181-0/+18
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variable $GIT_CLONE_PATH does not support nested variables, it will only expand the variables once, not more. reference https://gitlab.com/gitlab-org/gitlab-runner/issues/4319
* | | | | | | | | | | | | Merge branch 'qa-ml-push-test-requires-admin' into 'master'Mark Lapierre2019-06-184-61/+95
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [QA] Test push limit with admin user Closes gitlab-org/quality/staging#37 See merge request gitlab-org/gitlab-ce!29036
| * | | | | | | | | | | | | Test push limit with admin userMark Lapierre2019-06-184-61/+95
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses `:requires_admin` metadata to specify that a test needs an admin user. Sets the push file size limit test to require an admin user. With an admin access token set as the env var GITLAB_QA_ADMIN_ACCESS_TOKEN, the push size limit test now only uses the API and CLI
* | | | | | | | | | | | | Merge branch 'qa-create-merge-request-tests' into 'master'Mark Lapierre2019-06-185-48/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing an old quarantined test Closes gitlab-org/quality/staging#50 See merge request gitlab-org/gitlab-ce!28643
| * | | | | | | | | | | | | Fixing trailing whitespace and other linter errorsqa-create-merge-request-testsTomislav Nikic2019-06-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing a single trailing whitespace issue. Fixing no new line at the end of the file.
| * | | | | | | | | | | | | Created a refreshed create merge request suiteTomislav Nikic2019-06-175-49/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1810-11/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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