summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix stylelint warnings in related_items_list.scss59831-related-items-scss-cleanup-ceAnnabel Dunstone Gray2019-04-163-235/+211
| | | | | | This commit rearranges the styles in related_items_list to adhere to stylelint's warnings. It also adds some utility classes where applicable
* Merge branch 'docs-cicd-workflow-illustration' into 'master'Achilleas Pipinellis2019-04-162-16/+45
|\ | | | | | | | | Docs: CI/CD intro - add new illustration + description See merge request gitlab-org/gitlab-ce!27278
| * Docs: CI/CD intro - add new illustration + descriptionMarcia Ramos2019-04-162-16/+45
|/
* Merge branch 'resource-label-events-api-link' into 'master'Achilleas Pipinellis2019-04-162-0/+4
|\ | | | | | | | | Link to resource label events API See merge request gitlab-org/gitlab-ce!27412
| * Link to resource label events APIVictor Wu2019-04-162-0/+4
|/
* Merge branch 'winh-frontend-faq-docs' into 'master'Marcia Ramos2019-04-162-0/+31
|\ | | | | | | | | Create frontend FAQ (documentation) See merge request gitlab-org/gitlab-ce!26372
| * Create frontend FAQ (documentation)Winnie Hellmann2019-04-162-0/+31
|/
* Merge branch '59034-external-link-button' into 'master'Tim Zallmann2019-04-162-1/+6
|\ | | | | | | | | | | | | Replaced "View file" button with doc-text icon Closes #59034 See merge request gitlab-org/gitlab-ce!27365
| * Replaced external link button with doc-text icon59034-external-link-buttonDenys Mishunov2019-04-152-1/+6
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59034
* | Merge branch 'nfriend-update-merge-request-widget-for-post-merge-pipelines' ↵Filipa Lacerda2019-04-1613-5/+270
|\ \ | | | | | | | | | | | | | | | | | | into 'master' Update merge request widget to accommodate post-merge pipelines See merge request gitlab-org/gitlab-ce!25983
| * | Add two warning messages to the MR widgetnfriend-update-merge-request-widget-for-post-merge-pipelinesNathan Friend2019-04-1513-5/+270
| | | | | | | | | | | | | | | This commit adds two new warning messages to the MR widget that handle cases involving merge request pipelines.
* | | Merge branch 'docs-fix-ldap-typo' into 'master'Rémy Coutable2019-04-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix minor typo in LDAP docs Closes #60413 See merge request gitlab-org/gitlab-ce!27415
| * | | Fix minor typo in LDAP docsdocs-fix-ldap-typoMark Fletcher2019-04-161-1/+1
| | | |
* | | | Merge branch 'gt-fix-styling-for-pages-status' into 'master'Filipa Lacerda2019-04-1616-24/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix styling for `app/assets/stylesheets/pages/status.scss` Closes #59929 See merge request gitlab-org/gitlab-ce!26875
| * | | | Rename CI related selectorsGeorge Tsiolis2019-04-1616-24/+24
| | | | |
* | | | | Merge branch '48431-width' into 'master'Kushal Pandya2019-04-163-1/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide overflow in scoped labels Closes #48431 See merge request gitlab-org/gitlab-ce!27362
| * | | | | Hide overflow in scoped labelsRajat Jain2019-04-163-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scoped labels overflew in all the places because of lack of restriction on `max-width`. This commit introduces the same limits on width we have inplace for regular labels
* | | | | | Merge branch 'mc/feature/custom-metrics-ce' into 'master'Kamil Trzciński2019-04-169-28/+58
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport metrics report type See merge request gitlab-org/gitlab-ce!26798
| * | | | | | Backport changes from EEMatija Čupić2019-04-169-28/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports the changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10452
* | | | | | | Merge branch 'update-migration-docs' into 'master'Marcia Ramos2019-04-161-3/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update migration docs See merge request gitlab-org/gitlab-ce!27261
| * | | | | | | Update migration docsMichael Leopard2019-04-161-3/+23
|/ / / / / / /
* | | | | | | Merge branch 'patch-38' into 'master'Marcia Ramos2019-04-161-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Complete "Repository storage" directions See merge request gitlab-org/gitlab-ce!27346
| * | | | | | | Complete "Repository storage" directionsKatrin Leinweber2019-04-131-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '60533-tooltip-for-view-file-shows-raw-html' into 'master'Kushal Pandya2019-04-162-3/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Tooltip for "View file" shows raw HTML" Closes #60533 See merge request gitlab-org/gitlab-ce!27398
| * | | | | | | Fix showing HTML content in view file tooltip60533-tooltip-for-view-file-shows-raw-htmlFatih Acet2019-04-162-3/+4
| | | | | | | |
* | | | | | | | Merge branch '59570-move-quick-action' into 'master'Sean McGivern2019-04-163-120/+92
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract move quick action spec to shared example Closes #59570 See merge request gitlab-org/gitlab-ce!26907
| * | | | | | | | Extract move quick action spec to shared example59570-move-quick-actionAlexandru Croitor2019-04-153-120/+92
| | | | | | | | |
* | | | | | | | | Merge branch 'rewind-iid-on-pipelines' into 'master'Sean McGivern2019-04-167-18/+188
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewind iid on pipelines Closes #59362 See merge request gitlab-org/gitlab-ce!26490
| * | | | | | | | | Rewind IID on Ci::Pipelinesrewind-iid-on-pipelinesKamil Trzciński2019-04-167-18/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If no pipeline is created we currently have IID gap. This is due to fact that we generate IID not on save, but rather ahead of time. This results, us, losing IIDs.
* | | | | | | | | | Merge branch '58748-update-nodejs-to-10.15.3' into 'master'Kamil Trzciński2019-04-162-3/+9
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Node.js to 10.15.3 in CI template for Hexo See merge request gitlab-org/gitlab-ce!25943
| * | | | | | | | | | Update node.js to 10.15.3 in CI template for HexoTakuya Noguchi2019-03-102-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | | | | Merge branch 'mw-i18n-app-misc' into 'master'Sean McGivern2019-04-168-15/+48
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize several strings in controllers/services/presenters See merge request gitlab-org/gitlab-ce!27390
| * | | | | | | | | | | Externalize several strings inMartin Wortschack2019-04-168-15/+48
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - app/services - app/controllers - app/presenters
* | | | | | | | | | | Merge branch 'downloading-expired-artifacts' into 'master'Grzegorz Bizon2019-04-164-12/+51
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't render artifact download links for builds with expired artifacts See merge request gitlab-org/gitlab-ce!26753
| * | | | | | | | | | | use cleaner expectation matchers from Capybaradrew cimino2019-04-121-8/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Don't render artifact download links on the project tags page for builds ↵drew cimino2019-04-124-12/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with expired artifacts
* | | | | | | | | | | | Merge branch '53138-add-metrics-usage-ping' into 'master'Grzegorz Bizon2019-04-163-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds instance metrics to usage ping Closes #53138 See merge request gitlab-org/gitlab-ce!27238
| * | | | | | | | | | | | Use Gitlab::Metrics methods for checking if metrics are enabled53138-add-metrics-usage-pingRyan Cobb2019-04-111-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Adds changelog entryRyan Cobb2019-04-101-0/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | Adds instance metrics to usage pingRyan Cobb2019-04-102-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds influxdb_metrics_enabled and prometheus_metrics_enabled to usage ping.
* | | | | | | | | | | | | Merge branch 'winh-boards-store' into 'master'Phil Hughes2019-04-162-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove EE-specific code from boards store (CE-backport) See merge request gitlab-org/gitlab-ce!26924
| * | | | | | | | | | | | Copy boards store changes from EEwinh-boards-storeWinnie Hellmann2019-04-101-1/+11
| | | | | | | | | | | | |
| * | | | | | | | | | | | Import BoardsStoreEE conditionallyWinnie Hellmann2019-04-102-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit d79e06149136f01d2a3fce328791bcf70d31c0df)
* | | | | | | | | | | | | Merge branch 'mw-i18n-quick-actions' into 'master'Dmitriy Zaporozhets2019-04-165-57/+222
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings in lib/gitlab/quick_actions See merge request gitlab-org/gitlab-ce!27369
| * | | | | | | | | | | | Externalize strings in lib/gitlab/quick_actionsmw-i18n-quick-actionsMartin Wortschack2019-04-155-57/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Externalize strings for desc and explanation - Update PO file
* | | | | | | | | | | | | Merge branch 'ce-4681-autosave' into 'master'Kushal Pandya2019-04-169-4/+150
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autosave description in epics See merge request gitlab-org/gitlab-ce!27296
| * | | | | | | | | | | | | Autosave description in epicsRajat Jain2019-04-169-4/+150
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When editing an epic, the progress was previously lost due to lack of localstorage syncing code. This commit adds support for localstorage sync.
* | | | | | | | | | | | | Merge branch 'bw-query_graphql_field-enhancement' into 'master'Dmitriy Zaporozhets2019-04-162-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow arrays to be specified for fields in graphql_query_for Closes #60238 See merge request gitlab-org/gitlab-ce!27142
| * | | | | | | | | | | | | Allow arrays to specify fields graphql_query_forbw-query_graphql_field-enhancementBrett Walker2019-04-112-2/+3
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'helm_uninstall_command' into 'master'Sean McGivern2019-04-164-0/+161
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Helm DeleteCommand See merge request gitlab-org/gitlab-ce!27348