summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update description of Snippets API, create and update methodsnik-api-snippets-fixNikolay Samokhvalov2019-05-221-5/+5
| | | | Currently, the field used to fill the contents is called "code". Also "visibility" is now required.
* Merge branch 'dz-scope-project-routes' into 'master'Stan Hu2019-05-228-39/+84
|\ | | | | | | | | Move some project routes under /-/ scope See merge request gitlab-org/gitlab-ce!28435
| * Add network and graphs to legacy routes toodz-scope-project-routesDmitriy Zaporozhets2019-05-212-1/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add legacy routes for modified project pathDmitriy Zaporozhets2019-05-213-0/+34
| | | | | | | | | | | | For settings, branches and tags Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix specs to match route changesDmitriy Zaporozhets2019-05-204-24/+25
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Move project settings under /-/ scopeDmitriy Zaporozhets2019-05-201-14/+17
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Move some project routes under /-/ scopeDmitriy Zaporozhets2019-05-202-1/+6
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'qa-quarantine-object-storage-test' into 'master'Mark Lapierre2019-05-211-1/+2
|\ \ | | | | | | | | | | | | Quarantine failing test See merge request gitlab-org/gitlab-ce!28517
| * | Quarantine failing testqa-quarantine-object-storage-testMark Lapierre2019-05-211-1/+2
| | |
* | | Merge branch 'dd-qa-api-delegation-project-cicd-vars' into 'master'Sanad Liaquat2019-05-213-2/+40
|\ \ \ | | | | | | | | | | | | | | | | Delegate CiVariable fabrication to API See merge request gitlab-org/gitlab-ce!27924
| * | | Don't fabricate a default project for the CI/CD testdd-qa-api-delegation-project-cicd-varsddavison2019-05-071-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert 'user adds a CI variable' to a :smoke test Adjust support for API and UI fabrication Signed-off-by: ddavison <ddavison@gitlab.com>
| * | | Delegate CiVariable delegation to APIddavison2019-05-062-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of Resource::CiVariable fabricating via the browser_ui, let's delegate to the API instead. (will shave off roughly 3-4s every use) Override resource_web_url to catch ResourceURLMissingError as there is no "show" action for a CI/CD var Signed-off-by: ddavison <ddavison@gitlab.com>
* | | | Merge branch '58538-discussion-top-radius' into 'master'Fatih Acet2019-05-213-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix top border radius of discussions Closes #58538 See merge request gitlab-org/gitlab-ce!28490
| * | | | Fix border radius of discussionsAnnabel Dunstone Gray2019-05-213-0/+7
| | | | |
* | | | | Merge branch 'docs/clarify-repo-size-report-behaviour' into 'master'Achilleas Pipinellis2019-05-212-10/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add timing of repo size reporting Closes #61395 See merge request gitlab-org/gitlab-ce!28516
| * | | | | Add timing of repo size reportingEvan Read2019-05-212-10/+30
|/ / / / /
* | | | | Merge branch 'winh-jest-differences-docs' into 'master'Evan Read2019-05-211-4/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the differences between Karma and Jest setup Closes #59976 See merge request gitlab-org/gitlab-ce!28216
| * | | | | Document the differences between Karma and Jest setupWinnie Hellmann2019-05-211-4/+13
|/ / / / /
* | | | | Merge branch 'mc/bug/pipeline-cache-invalid' into 'master'Kamil Trzciński2019-05-212-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expire pipeline cache on job update Closes #48024 See merge request gitlab-org/gitlab-ce!28432
| * | | | | Expire pipeline cache on finishmc/bug/pipeline-cache-invalidMatija Čupić2019-05-212-0/+2
| | | | | |
* | | | | | Merge branch '39304-broadcast-message-buttons' into 'master'Annabel Dunstone Gray2019-05-212-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update broadcast message icons Closes #39304 See merge request gitlab-org/gitlab-ce!28496
| * | | | | | Update broadcast message icons39304-broadcast-message-buttonsJarek Ostrowski2019-05-212-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add icons from gitlab-svgs Remove btn-sm class for better sizing Add changelog Update mr number changelog Change to sprite_icon
* | | | | | | Merge branch 'update-gitlab-runner-helm-chart-to-0-5-0' into 'master'Nick Thomas2019-05-212-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Runner Helm Chart to 0.5.0/11.11.0 See merge request gitlab-org/gitlab-ce!28497
| * | | | | | | Update GitLab Runner Helm Chart to 0.5.0update-gitlab-runner-helm-chart-to-0-5-0Steve Azzopardi2019-05-202-1/+6
| | | | | | | |
* | | | | | | | Merge branch 'bw-remove-constant-warnings' into 'master'Mayra Cabrera2019-05-211-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove 'already initialized constant' warnings See merge request gitlab-org/gitlab-ce!28518
| * | | | | | | | Remove 'already initialized constant' warningsbw-remove-constant-warningsBrett Walker2019-05-201-1/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'devise-4.6' into 'master'Stan Hu2019-05-2110-18/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump devise to 4.6 See merge request gitlab-org/gitlab-ce!28438
| * | | | | | | | Bump devise to 4.6Utkarsh Gupta2019-05-2110-18/+14
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Utkarsh Gupta <guptautkarsh2102@gmail.com>
* | | | | | | | Merge branch 'docs/elastic' into 'master'Evan Read2019-05-211-2/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port elasticsearch.md changes to EE See merge request gitlab-org/gitlab-ce!28549
| * | | | | | | | Port elasticsearch.md changes to EEAchilleas Pipinellis2019-05-211-2/+22
| | | | | | | | |
* | | | | | | | | Merge branch 'tokiuji-master-patch-07403' into 'master'Rémy Coutable2019-05-211-1/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | delete japanese proofreader See merge request gitlab-org/gitlab-ce!28530
| * | | | | | | | delete japanese proofreaderYamana Tokiuji2019-05-211-1/+0
| | | | | | | | |
* | | | | | | | | Merge branch 'docs-ci-variable-types-usage-example' into 'master'Achilleas Pipinellis2019-05-213-2/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Update documentation with CI variable types usage example See merge request gitlab-org/gitlab-ce!28515
| * | | | | | | | | Add CI variable types usage exampleKrasimir Angelov2019-05-213-2/+23
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update documentation with example how to use CI variable types. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/46806.
* | | | | | | | | Merge branch 'docs-improve-insights-documentation' into 'master'Achilleas Pipinellis2019-05-214-7/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document how to access the Insights page See merge request gitlab-org/gitlab-ce!28488
| * | | | | | | | | Document how to access the Insights pagedocs-improve-insights-documentationRémy Coutable2019-05-214-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'docs-update-deploy-chat-notifications' into 'master'Achilleas Pipinellis2019-05-213-0/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Docs for Chat Notifications Closes #61867 See merge request gitlab-org/gitlab-ce!28510
| * | | | | | | | | | Update documentation for chat notifications on deployment eventsJason Goodman2019-05-213-0/+2
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update configuration screenshots for Slack and Mattermost Update list of events for Mattermost
* | | | | | | | | | Merge branch 'patch-59' into 'master'Douwe Maan2019-05-211-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify case for feature flags See merge request gitlab-org/gitlab-ce!28424
| * | | | | | | | | | Move the line up in the listpatch-59Sarah Groff Hennigh-Palermo2019-05-201-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Clarify case for feature flagsSarah Groff Hennigh-Palermo2019-05-171-0/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '61928-remove-throttle-from-dirty-submit' into 'master'Kushal Pandya2019-05-213-31/+97
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make throttling in the dirty_submit form check smarter Closes #61928 See merge request gitlab-org/gitlab-ce!28377
| * | | | | | | | | | Fix throttling issue in form dirty checking61928-remove-throttle-from-dirty-submitNathan Friend2019-05-173-31/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes an issue that was causing the "Save changes" button to be incorrectly enabled or disabled when changes were made to a form. (Specifically, some of the subsections in the project settings pages.)
* | | | | | | | | | | Merge branch 'js-i18n-l' into 'master'Kushal Pandya2019-05-213-8/+23
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n JS files starting with l See merge request gitlab-org/gitlab-ce!28065
| * | | | | | | | | | | I18N of files starting with ljs-i18n-lBrandon Labuschagne2019-05-183-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. This commit only targets Vanilla JS files. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | | | | | | | Merge branch 'patch-55' into 'master'Kamil Trzciński2019-05-212-9/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jobs should be better isolated to avoid interference with other `image` or... See merge request gitlab-org/gitlab-ce!28213
| * | | | | | | | | | | | Jobs should be better isolated to avoid interference with other `image` or ↵Luca Orlandi2019-05-212-9/+17
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `before_script` statements.
* | | | | | | | | | | | Merge branch 'haml-lint-no-plain-nodes' into 'master'Jan Provaznik2019-05-214-0/+666
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add HamlLint::Linter::NoPlainNodes linter See merge request gitlab-org/gitlab-ce!28265
| * | | | | | | | | | | | Add HamlLint::Linter::NoPlainNodes linterhaml-lint-no-plain-nodesLuke Bennett2019-05-204-0/+666
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a simple haml_lint linter to report all plain nodes. "Plain nodes" in HAML are scritpless plaintext leaf nodes. Add haml-lint_todo to onboard new haml linters. Excludes existing NoPlainNodes lints.
* | | | | | | | | | | | | Merge branch '62066-use-batchmodelloader-for-grouptype' into 'master'Sean McGivern2019-05-212-2/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `BatchModelLoader` for GroupType Closes #62066 See merge request gitlab-org/gitlab-ce!28504