summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Move Project#rename_repo to a service classrefactor-project-rename-repoYorick Peterse2018-10-229-247/+368
| | | | | | | | | | | | | | | | | | | | | | | | This moves the logic of Project#rename_repo and all methods _only_ used by this method into a new service class: Projects::AfterRenameService. By moving this code into a separate service class we can more easily refactor it, and we also get rid of some RuboCop "disable" statements automatically. During the refactoring of this code, I removed most of the explicit logging using Gitlab::AppLogger. The data that was logged would not be useful when debugging renaming issues, as it does not add any value on top of data provided by users. I also removed a variety of comments that either mentioned something the code does in literal form, or contained various grammatical errors. Instead we now resort to more clearly named methods, removing the need for code comments. This method was chosen based on analysis in https://gitlab.com/gitlab-org/release/framework/issues/28. In this issue we determined this method has seen a total of 293 lines being changed in it. We also noticed that RuboCop determined the ABC size (https://www.softwarerenovation.com/ABCMetric.pdf) was too great.
* Merge branch 'winh-refactor-job-groups' into 'master'Phil Hughes2018-10-179-81/+60
|\ | | | | | | | | Replace job with group in frontend components to be consistent with backend See merge request gitlab-org/gitlab-ce!22387
| * Replace job with group in frontend components to be consistent with backendWinnie Hellmann2018-10-179-81/+60
|/
* Merge branch 'issue_49936' into 'master'Marcia Ramos2018-10-179-54/+89
|\ | | | | | | | | | | | | Allow JIRA to login using email and API token Closes #49936 See merge request gitlab-org/gitlab-ce!21726
| * Allow JIRA to login using email and API tokenFelipe Artur2018-10-179-54/+89
|/
* Merge branch 'sh-sh-add-nfs-details-docs' into 'master'Marcia Ramos2018-10-171-1/+26
|\ | | | | | | | | Add documentation on using NFS v4.1 and disabling server delegations See merge request gitlab-org/gitlab-ce!22379
| * Add documentation on using NFS v4.1 and disabling server delegationsStan Hu2018-10-161-1/+26
| | | | | | | | | | | | | | For more info, see: * https://gitlab.com/gitlab-org/gitaly/issues/1339 * https://gitlab.com/gitlab-org/gitlab-ce/issues/52017
* | Merge branch '50904-job-log' into 'master'Phil Hughes2018-10-1734-1400/+1448
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Integrate new vue+vuex code base with new API and remove old haml code" Closes #50904 See merge request gitlab-org/gitlab-ce!22116
| * | Resolve "Integrate new vue+vuex code base with new API and remove old haml code"Filipa Lacerda2018-10-1734-1400/+1448
|/ /
* | Merge branch '37727-fix-file-delete-redirect' into 'master'Rémy Coutable2018-10-174-5/+93
|\ \ | | | | | | | | | | | | | | | | | | Resolve "In web editor, when delete a file, should navigate to enclosing directory" Closes #37727 See merge request gitlab-org/gitlab-ce!21465
| * | Resolve "In web editor, when delete a file, should navigate to enclosing ↵George Thomas2018-10-174-5/+93
|/ / | | | | | | directory"
* | Merge branch '51712-new-line-before-expect' into 'master'Mike Greiling2018-10-17220-108/+1149
|\ \ | | | | | | | | | | | | 3. enable jasmine/new-line-before-expect See merge request gitlab-org/gitlab-ce!22234
| * | enable jasmine/new-line-before-expectJohann Hubert Sonntagbauer2018-10-17220-108/+1149
|/ /
* | Merge branch 'prettify-all-the-things-8' into 'master'Fatih Acet2018-10-1650-1051/+1330
|\ \ | | | | | | | | | | | | Prettify all the things (part 8) See merge request gitlab-org/gitlab-ce!22258
| * | Prettify additional modules (I through Z)Mike Greiling2018-10-1650-1051/+1330
| | |
* | | Merge branch 'prettify-all-the-things-1' into 'master'Fatih Acet2018-10-1676-1029/+1138
|\ \ \ | | | | | | | | | | | | | | | | Prettify all the things (part 1) See merge request gitlab-org/gitlab-ce!22248
| * | | Prettify environments feature_highlight and filtered_search modulesMike Greiling2018-10-1622-405/+459
| | | |
| * | | Prettify diff_notes diffs and droplab modulesMike Greiling2018-10-1618-136/+172
| | | |
| * | | Prettify blob behaviors and cycle_analytics modulesMike Greiling2018-10-1636-488/+507
| |/ /
* | | Merge branch '49740-share-frontend-configs-between-repos' into 'master'Clement Ho2018-10-163-46/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Share frontend configs between repos" Closes #49740 See merge request gitlab-org/gitlab-ce!22405
| * | | Use @gitlab/eslint-config as base in eslintrcMike Greiling2018-10-163-46/+19
| | | |
* | | | Merge branch '51712-no-promise-without-done-fail' into 'master'Mike Greiling2018-10-167-19/+17
|\ \ \ \ | |/ / / |/| | | | | | | | | | | 2. enable jasmine/no-promise-without-done-fail See merge request gitlab-org/gitlab-ce!22231
| * | | enable jasmine/no-promise-without-done-failJohann Hubert Sonntagbauer2018-10-167-19/+17
| | | |
* | | | Merge branch 'fix-review-link-docs' into 'master'Douwe Maan2018-10-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix "ready for review" link See merge request gitlab-org/gitlab-ce!22393
| * | | | Fix "ready for review" linkJan Provaznik2018-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove assignee_id=0 condition from search filters, we agreed that just presence of "ready of review" label is sufficient for filtering MRs, no need to unassign yourself.
* | | | | Merge branch 'sh-fix-commit-signatures-error' into 'master'Douwe Maan2018-10-163-2/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix commit signature error when project is disabled Closes #50903 See merge request gitlab-org/gitlab-ce!22344
| * | | | | Fix commit signature error when project is disabledStan Hu2018-10-153-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project is disabled, visiting the home page would show, "An error occurred while loading commit signatures". This change checks that the user has permission to view the project to avoid unnecessary GPG signature lookups. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50903
* | | | | | Merge branch '52650-webhook-image-urls-rewritten-incorrectly-in-issues' into ↵Douwe Maan2018-10-166-55/+115
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Webhook Image URLs Rewritten Incorrectly in Issues" Closes #52650 See merge request gitlab-org/gitlab-ce!22361
| * | | | | Web hook -> webhookSean McGivern2018-10-161-3/+3
| | | | | |
| * | | | | Fix image webhook rewriting for uploadsSean McGivern2018-10-166-53/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This rewrote URLs to be absolute URLs. However, for uploads (the most common case), we actually need them to point to not just the GitLab instance, but the project they're from. Thankfully, we can normally get that information from the object we're building the hook for.
* | | | | | Merge branch 'prettify-all-the-things-6' into 'master'Fatih Acet2018-10-1649-1443/+1458
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prettify all the things (part 6) See merge request gitlab-org/gitlab-ce!22256
| * | | | | | Prettify vue_shared modulesMike Greiling2018-10-1028-925/+914
| | | | | | |
| * | | | | | Prettify vue_merge_request_widget modulesMike Greiling2018-10-1022-520/+550
| | | | | | |
* | | | | | | Merge branch '52147-loading-state' into 'master'Mike Greiling2018-10-164-11/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes styling issues in test reports Closes #51386 and #52147 See merge request gitlab-org/gitlab-ce!22204
| * | | | | | | Adds a `js-` class to allow for specsFilipa Lacerda2018-10-112-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rspec was using a CSS class to check if the content was being rendered. Since the CSS has changed, the specs failed This commit replaces the CSS class with a `js-` prepended one to guarantee changing CSS won't break a pipeline
| * | | | | | | Fixes styling issues in test reportsFilipa Lacerda2018-10-113-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Merge Request widget, the reports for tests had an extra border. The loading icon in the mr widget used in all report sections had an extra margin causing text to be misaligned. This commit fixes both issues Closes #52147
* | | | | | | | Merge branch '52686-project-slug-does-not-auto-populate-in-ie11' into 'master'Mike Greiling2018-10-162-4/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project slug does not auto populate in IE11" Closes #52686 See merge request gitlab-org/gitlab-ce!22367
| * | | | | | | | Use literal instead of constructor for creating regexMartin Wortschack2018-10-152-4/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'test-usage-ping-in-timeout-case' into 'master'Robert Speicher2018-10-161-0/+7
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Verify that usage ping works when all counts time out See merge request gitlab-org/gitlab-ce!22358
| * | | | | | | | Verify that usage ping works when all counts time outSean McGivern2018-10-161-0/+7
| | | | | | | | |
* | | | | | | | | Merge branch 'qa-handle-sign-up-with-terms' into 'master'Nick Thomas2018-10-162-1/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [QA] Handle sign-up when terms must be accepted See merge request gitlab-org/gitlab-ce!22374
| * | | | | | | | | [QA] Handle sign-up when terms must be acceptedRémy Coutable2018-10-152-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch '52477-add-iid-headers-to-emails' into 'master'Sean McGivern2018-10-163-0/+23
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add IID headers to E-Mail notifications Closes #52477 See merge request gitlab-org/gitlab-ce!22263
| * | | | | | | | | | Add IID headers to E-Mail notificationsLukas Eipert2018-10-163-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These headers can be used to build URLs for API requests. Good examples would be Issues and Merge Requests
* | | | | | | | | | | Merge branch 'ide-file-templates-clear' into 'master'Filipa Lacerda2018-10-163-0/+14
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed file templates not clearing in Web IDE Closes #52487 See merge request gitlab-org/gitlab-ce!22357
| * | | | | | | | | | | Fixed file templates not clearing in Web IDEPhil Hughes2018-10-153-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where the file templates would not be cleared after changing the template type. Previously the templates would get pushed into the array creating a list of templates for the different types. This changes that by clearing the templates array when the template type gets changed. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52487
* | | | | | | | | | | | Merge branch 'docs-detectable-override' into 'master'Marcia Ramos2018-10-161-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document linguist overriding See merge request gitlab-org/gitlab-ce!22386
| * | | | | | | | | | | | Document linguist overridingZeger-Jan van de Weg2018-10-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users report that some languages aren't detected, or at least not reported. This is mostly due to the fact that these languages aren't programming languages, according to Linguist. Originally noted in: https://gitlab.com/gitlab-org/gitlab-ce/issues/50705#note_99600216 Related: https://gitlab.com/gitlab-org/gitlab-ce/issues/51995
* | | | | | | | | | | | | Merge branch 'diff-stats-perf-bar' into 'master'Filipa Lacerda2018-10-162-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes diff stats not being visible with performance bar See merge request gitlab-org/gitlab-ce!22390
| * | | | | | | | | | | | | Fixes diff stats not being visible with performance barPhil Hughes2018-10-162-0/+6
| |/ / / / / / / / / / / /