summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove additional loggingissue_51789_part_1Felipe Artur2019-04-012-4/+0
|
* Address review commentsFelipe Artur2019-03-283-23/+14
|
* Merge masterFelipe Artur2019-03-274727-30866/+92031
|\
| * Merge branch 'docs/improve-auto-fetch-endpoint' into 'master'Achilleas Pipinellis2019-03-271-5/+11
| |\ | | | | | | | | | | | | Expand and improve autofetch of endpoint section See merge request gitlab-org/gitlab-ce!26303
| | * Expand and improve autofetch of endpoint sectionEvan Read2019-03-271-5/+11
| |/
| * Merge branch 'docs-disable_nfs_delegation' into 'master'Achilleas Pipinellis2019-03-271-3/+2
| |\ | | | | | | | | | | | | Recommend disabling NFS server delegation See merge request gitlab-org/gitlab-ce!26668
| | * Recommend disabling NFS server delegationDrew Blessing2019-03-271-3/+2
| | |
| * | Merge branch 'osw-multi-line-suggestions-creation-strategy' into 'master'Andreas Brandl2019-03-2728-147/+633
| |\ \ | | | | | | | | | | | | | | | | Prepares suggestion implementation for multi-line support See merge request gitlab-org/gitlab-ce!26057
| | * | Prepare suggestion implementation for multi-lineOswaldo Ferreira2019-03-2728-149/+613
| | | | | | | | | | | | | | | | | | | | | | | | Adds the groundwork needed in order to persist multi-line suggestions, while providing the parsing strategy which will be reused for the **Preview** as well.
| | * | Add multi-line suggestion migrationsOswaldo Ferreira2019-03-262-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds outdated, lines_above and lines_below columns to suggestions table. outdated - boolean which represents whether the suggestion is outdated or not. For instance, if any line changed after you left the multi-line suggestion, even though the note is not outdated, it helps tracking if the content has changed in the latest file. We cache this information in a column given it's not a cheap operation to do for every suggestion in the request time. lines_below, lines_above - persists the parsed arguments from `suggestion:-10+3` syntax, where `10` would be lines_above and 3 lines_below. We need that to dynamically calculate which lines we should monitor for outdating / persisting the correct content in from_content column.
| * | | Merge branch 'mw-i18n-controllers' into 'master'Rémy Coutable2019-03-2736-108/+374
| |\ \ \ | | |_|/ | |/| | | | | | | | | | Externalize strings in controllers See merge request gitlab-org/gitlab-ce!26420
| | * | Externalize strings in projects controllersMartin Wortschack2019-03-2736-108/+374
| |/ / | | | | | | | | | | | | | | | | | | - concerns - dashboard - groups - import
| * | Merge branch 'issue_58547' into 'master'Nick Thomas2019-03-273-0/+55
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add API access check to Graphql Closes #58547 See merge request gitlab-org/gitlab-ce!26570
| | * | Add API access check to GraphqlFelipe Artur2019-03-273-0/+55
| |/ / | | | | | | | | | Check if user can access API on GraphqlController
| * | Merge branch '10714-env-table' into 'master'Phil Hughes2019-03-271-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for environments_table Closes gitlab-ee#10714 See merge request gitlab-org/gitlab-ce!26655
| | * | Removes EE differences for environments_tableFilipa Lacerda2019-03-271-1/+1
| | | |
| * | | Merge branch '10719-stage-spec' into 'master'Phil Hughes2019-03-271-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for stage_column_component_spec Closes gitlab-ee#10719 See merge request gitlab-org/gitlab-ce!26659
| | * | | Removes EE differences for stage_column_component_specFilipa Lacerda2019-03-271-1/+1
| | |/ /
| * | | Merge branch '10711-pipeline-bundle' into 'master'Phil Hughes2019-03-272-9/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for pipelines_details_bundle Closes gitlab-ee#10711 See merge request gitlab-org/gitlab-ce!26654
| | * | | Removes EE differences for pipelines_details_bundleFilipa Lacerda2019-03-272-9/+10
| | |/ /
| * | | Merge branch '10708-environments-scss' into 'master'Phil Hughes2019-03-271-1/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for environments.scss Closes gitlab-ee#10708 See merge request gitlab-org/gitlab-ce!26648
| | * | | Removes EE differences for environments.scssFilipa Lacerda2019-03-271-1/+3
| | |/ /
| * | | Merge branch 'winh-cleanup-note_form_spec' into 'master'Fatih Acet2019-03-271-6/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove top-level mount from note_form_spec.js Closes #59114 See merge request gitlab-org/gitlab-ce!26616
| | * | | Remove top-level mount from note_form_spec.jsWinnie Hellmann2019-03-261-6/+12
| | | | |
| * | | | Merge branch 'qa-create-personal-access-token-in-seeds' into 'master'Andreas Brandl2019-03-271-0/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add seed for personal access token Closes #59500 See merge request gitlab-org/gitlab-ce!26582
| | * | | | Add seed for personal access tokenSanad Liaquat2019-03-261-0/+15
| | |/ / /
| * | | | Merge branch 'update-security-mr-templates' into 'master'Robert Speicher2019-03-271-2/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the MR template for security MRs Closes gitlab-org/release/framework#256 See merge request gitlab-org/gitlab-ce!26658
| | * | | | Update the MR template for security MRsYorick Peterse2019-03-271-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes two changes to the template: 1. EE MRs are now always required (see https://gitlab.com/gitlab-org/release/framework/issues/256 for a backstory). 2. We clarify that a release manager is not a suitable reviewer for security merge requests.
| * | | | | Merge branch 'sh-optimize-projects-api' into 'master'Douwe Maan2019-03-274-10/+89
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | Optimize /api/v4/projects endpoint for visibility level See merge request gitlab-org/gitlab-ce!26481
| | * | | | Skip querying for private projects if they are not requestedStan Hu2019-03-271-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the requested visibility levels contains only public and/or internal, omitting private, then we can skip the EXISTS query to search for private projects for the user.
| | * | | | Optimize /api/v4/projects endpoint for visibility levelStan Hu2019-03-274-7/+71
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously when a user requested a list of projects, `Project#public_or_visible_to_user` would search all authorized projects and public/internal projects as well. However, when a user requests a specific `visibility_level` (e.g. private), that should reduce the search space, and we shouldn't need to load public/internal projects. Improves https://gitlab.com/gitlab-org/gitlab-ce/issues/59329
| * | | | Merge branch 'qa-dd-unquarantine-autodevops-test' into 'master'Mark Lapierre2019-03-271-2/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Unquarantine previously failing auto devops test See merge request gitlab-org/gitlab-ce!26641
| | * | | | Unquarantine previously failing auto devops testDan Davison2019-03-271-2/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | The smoke test for AutoDevOps was previously failing. This test is now passing and ready to be unquarantined
| * | | | Merge branch '10710-pipeline-store' into 'master'Phil Hughes2019-03-271-1/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes extra space in CE Closes gitlab-ee#10710 See merge request gitlab-org/gitlab-ce!26649
| | * | | | Removes extra space in CEFilipa Lacerda2019-03-271-1/+0
| | |/ / /
| * | | | Merge branch '6658-issuable-css' into 'master'Phil Hughes2019-03-271-1/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for issuable.scss See merge request gitlab-org/gitlab-ce!26588
| | * | | | Removes EE differences for issuable.scssFilipa Lacerda2019-03-261-1/+7
| | | | | |
| * | | | | Merge branch '59502-fix-breadcrumb-artifacts' into 'master'Phil Hughes2019-03-273-1/+12
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes link in artifacts breadcrumb Closes #59502 See merge request gitlab-org/gitlab-ce!26592
| | * | | | Fixes link in artifacts breadcrumbFilipa Lacerda2019-03-273-1/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | The link to the job page was not set properly, with this commit it links to the correct job page.
| * | | | Merge branch 'winh-assignees_spec' into 'master'Filipa Lacerda2019-03-271-0/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy missing test in assignees_spec.js from EE Closes gitlab-ee#6641 See merge request gitlab-org/gitlab-ce!26618
| | * | | | Copy missing test in assignees_spec.js from EEWinnie Hellmann2019-03-261-0/+13
| | | |_|/ | | |/| |
| * | | | Merge branch 'remove-expand-diff-feature-flag' into 'master'Filipa Lacerda2019-03-274-12/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove expand diff to full file feature flag See merge request gitlab-org/gitlab-ce!26614
| | * | | | Remove expand diff to full file feature flagPhil Hughes2019-03-264-12/+2
| | | | | |
| * | | | | Merge branch '59296-get-milestone-by-title-via-api' into 'master'Sean McGivern2019-03-276-0/+26
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Get milestone by title via API" Closes #59296 See merge request gitlab-org/gitlab-ce!26573
| | * | | | | Resolve "Get milestone by title via API"Fabio Busatto2019-03-276-0/+26
| |/ / / / /
| * | | | | Merge branch '10677-framework-css' into 'master'Phil Hughes2019-03-272-0/+93
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for framework.scss Closes gitlab-ee#10677 See merge request gitlab-org/gitlab-ce!26590
| | * | | | | Removes EE differences for framework.scssFilipa Lacerda2019-03-262-0/+93
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'winh-jest-console' into 'master'Phil Hughes2019-03-274-2/+30
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide custom Jest environment with mocked console Closes #58203 See merge request gitlab-org/gitlab-ce!26577
| | * | | | | Provide custom Jest environment with mocked consoleWinnie Hellmann2019-03-262-0/+28
| | | | | | |
| | * | | | | Add jest-environment-jsdom and jest-util dependenciesWinnie Hellmann2019-03-262-2/+2
| | | |_|_|/ | | |/| | |
View Lorry Controller Status