summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'docs/fix-example-dot-net' into 'master'Mike Lewis2019-06-072-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove example.net, replace with example.com See merge request gitlab-org/gitlab-ce!25535
| * \ \ \ \ \ \ Merge branch 'master' into 'docs/fix-example-dot-net'Mike Lewis2019-06-076958-130043/+325778
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | # Conflicts: # doc/user/project/clusters/serverless/index.md
* | | | | | | | Merge branch '55033-discussion-system-note-alignment' into 'master'57953-suggesting-changes-on-a-line-that-is-not-part-of-an-mr-diff-brings-in-actual-html-code-of-the-element-instead-of-the-text-involvedFatih Acet2019-06-072-3/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align system note within discussion with other notes Closes #55033 See merge request gitlab-org/gitlab-ce!29367
| * | | | | | | | Align system note within discussion with other notesAnnabel Dunstone Gray2019-06-072-3/+8
| | | | | | | | |
* | | | | | | | | Merge branch 'gt-externalize-profiles-preferences' into 'master'Phil Hughes2019-06-073-40/+46
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize profiles preferences Closes #53349 See merge request gitlab-org/gitlab-ce!28470
| * | | | | | | | | Externalize profiles preferencesGeorge Tsiolis2019-06-073-40/+46
| | | | | | | | | |
* | | | | | | | | | Merge branch '61565-merge-request-discussion-text-jumps-when-resolved' into ↵Annabel Dunstone Gray2019-06-072-3/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Merge request discussion text jumps when resolved" Closes #61565 See merge request gitlab-org/gitlab-ce!28995
| * | | | | | | | | | Fix discusson resolve toggle making page jumpJustin Boyson2019-06-072-3/+10
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'issue/62656' into 'master'Annabel Dunstone Gray2019-06-072-4/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed dropdown styles in board page See merge request gitlab-org/gitlab-ce!29338
| * | | | | | | | | | Change styles for the board `Add List` dropdown to look more like the EE versionMichel Engelen2019-06-072-4/+10
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'winh-new-list-sorting' into 'master'Tim Zallmann2019-06-071-3/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove list sorting from NewListDropdown See merge request gitlab-org/gitlab-ce!29077
| * | | | | | | | | | Remove list sorting from NewListDropdownWinnie Hellmann2019-06-071-3/+0
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'bw-gettext-rake-task' into 'master'Sean McGivern2019-06-071-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show description of 'gettext:regenerate' task See merge request gitlab-org/gitlab-ce!29362
| * | | | | | | | | Show description of 'gettext:regenerate' taskbw-gettext-rake-taskBrett Walker2019-06-071-0/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs-scoped-label-key' into 'master'Mike Lewis2019-06-071-0/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note about nested scopes matching See merge request gitlab-org/gitlab-ce!28466
| * | | | | | | | | Apply suggestion to doc/user/project/labels.mddocs-scoped-label-keyJan Provaznik2019-06-051-5/+7
| | | | | | | | | |
| * | | | | | | | | Add a note about nested scopes matchingJan Provaznik2019-05-201-0/+6
| | | | | | | | | |
* | | | | | | | | | Merge branch 'ee-9688-fe-mr-merge-order' into 'master'Clement Ho2019-06-076-15/+115
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of EE Displaying Blocking MRs See merge request gitlab-org/gitlab-ce!29095
| * | | | | | | | | | Backport of EE Displaying Blocking MRsee-9688-fe-mr-merge-orderSam Bigelow2019-06-056-15/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR is a backport of an EE merge request
* | | | | | | | | | | Merge branch 'mh/board-models-ce' into 'master'Kushal Pandya2019-06-0712-30/+28
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move issue board models to boards directory Closes #61293 See merge request gitlab-org/gitlab-ce!29260
| * | | | | | | | | | | Move Vue models from vue_shared to boardsMartin Hanzel2019-06-0712-30/+28
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some classes in vue_shared were used only by boards, so they were moved to the boards directory.
* | | | | | | | | | | Merge branch ↵Stan Hu2019-06-0711-8/+95
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'thomas-nilsson-irfu/gitlab-ce-thomas-nilsson-irfu-master-patch-13137' into 'master' Allow masking if 8 or more characters in base64 See merge request gitlab-org/gitlab-ce!29143
| * | | | | | | | | | | Add masked toggle click to frontend specthomas-nilsson-irfu/gitlab-ce-thomas-nilsson-irfu-master-patch-13137mfluharty2019-06-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to set masked to true before testing now that the default is false
| * | | | | | | | | | | Do not escape forward slashes in Maskable REGEXMatija Čupić2019-06-061-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Add frontend specsmfluharty2019-06-062-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test that a regex is provided Test that it is the expected regex Test length of variable Test special character set
| * | | | | | | | | | | Use exposed regex for frontend maskable checkmfluharty2019-06-065-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass string value in through haml template data attribute Evaluate it into a regex when initiating variable list Use it to determine whether to show the maskability warning
| * | | | | | | | | | | Add CHANGELOG entryMatija Čupić2019-06-061-0/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Expose javascript regexMatija Čupić2019-06-062-2/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Allow masking if 8 or more characters in base64Thomas Nilsson2019-06-063-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should allow for private ssh-keys to remain private. Solves https://gitlab.com/gitlab-org/gitlab-ce/issues/60790.
* | | | | | | | | | | | Merge branch 'fix-legacy-uploads-spec' into 'master'Sean McGivern2019-06-071-9/+25
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix migration specs using factories Closes #62911 See merge request gitlab-org/gitlab-ce!29350
| * | | | | | | | | | | Fix migration specs using factoriesMarkus Koller2019-06-071-9/+25
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to stub default_git_depth and default_git_depth= because some old migrations specs try to create a record using schema before that column was introduced. The `let!` calls were executed before the `before` hook which still caused some factories to fail, so they're created in the `before` hook now as well.
* | | | | | | | | | | Merge branch '51636-task-list-api-pderichs' into 'master'Sean McGivern2019-06-076-21/+206
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add task count and completed count to responses of Issue and MR See merge request gitlab-org/gitlab-ce!28859
| * | | | | | | | | | | Add task count and completed count to responses of Issue and MRPatrick Derichs2019-06-076-21/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add spec for task_completion_status Add test cases for task_completion_status result Extracted shared samples Add new spec file for task completion status response Fix style errors Add changelog entry Changed samples to Hashes Remove test for successful request Remove not nil expectation Add task_completion_status to api documentation for issues Add task_completion_status to api documentation for merge_requests Refactor spec so it just requests one specific item Add task_completion_status to Taskable Simplified task completion status in entities Refactor spec so it separates status code check and content check Fix spec description text and field name
* | | | | | | | | | | | Merge branch 'improve-email-text-part' into 'master'Dmitriy Zaporozhets2019-06-074-9/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve email text part See merge request gitlab-org/gitlab-ce!29111
| * | | | | | | | | | | | Add changelog entryHaunui Saint-sevin2019-06-041-0/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | Sync text part of email with the HTML partHaunui Saint-sevin2019-06-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The text part was missing the condition to change the first message. Borrow the code from the HTML part.
| * | | | | | | | | | | | Remove html tag from the text part of emailHaunui Saint-sevin2019-06-043-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of calling single function emitting HTML tags in the HTML part of email, directly output HTML tags or raw text.
* | | | | | | | | | | | | Merge branch '58297-remove-extraneous-gitaly-calls-from-md-rendering' into ↵Dmitriy Zaporozhets2019-06-076-6/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove extraneous DiffNote#supports_suggestion? calls See merge request gitlab-org/gitlab-ce!29027
| * | | | | | | | | | | | | Add changelog entry58297-remove-extraneous-gitaly-calls-from-md-renderingKerri Miller2019-06-051-0/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Update spec param expectationsKerri Miller2019-06-051-1/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove 2nd stub expectation of #last_diff_fileKerri Miller2019-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It looks to be a stub/mock rather than strictly an expectation of the system, so dropping this to only a single invocation expected, as we've removed one of the two places #last_diff_file would be invoked.
| * | | | | | | | | | | | | Extend #parse to accept a suggestions_filter_enabled paramKerri Miller2019-06-052-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow the front end to specify the behavior as needed.
| * | | | | | | | | | | | | Lock suggestions_filter_enabled as trueKerri Miller2019-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most/all of the work we're doing in this method is done at creation/edit time, so do we need to also check at render? Assume if you've gotten to this point, it's ok to enable the suggestion filter.
* | | | | | | | | | | | | | Merge branch '62418-project-default-git-depth' into 'master'Kamil Trzciński2019-06-0719-41/+219
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add project level git depth setting Closes #59688 See merge request gitlab-org/gitlab-ce!28919
| * | | | | | | | | | | | | | Comment why forks get default_git_depth of 0 instead nil62418-project-default-git-depthKrasimir Angelov2019-06-072-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and simplify ProjectCiCdSetting#set_default_git_depth
| * | | | | | | | | | | | | | Fix migration specs using factoriesKrasimir Angelov2019-06-073-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to stub default_git_depth and default_git_depth= because some old migrations specs try to create a record using schema before that column was introduced.
| * | | | | | | | | | | | | | Reformat ProjectCiCdSetting validations specsKrasimir Angelov2019-06-061-1/+7
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Forks get default_git_depth 0 if the origin is nilKrasimir Angelov2019-06-064-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the origin project has no default_git_depth set (i.e. nil) set the fork's default_git_depth to 0
| * | | | | | | | | | | | | | Add project level git depth settingKrasimir Angelov2019-06-0619-42/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce default_git_depth in project's CI/CD settings and set it to 50. Use it if there is no GIT_DEPTH variable specified. Apply this default only to newly created projects and keep it nil for old ones in order to not break pipelines that rely on non-shallow clones. default_git_depth can be updated from CI/CD Settings in the UI, must be either nil or integer between 0 and 1000 (incl). Inherit default_git_depth from the origin project when forking projects. MR pipelines are run on a MR ref (refs/merge-requests/:iid/merge) and it contains unique commit (i.e. merge commit) which doesn't exist in the other branch/tags refs. We need to add it cause otherwise it may break pipelines for old projects that have already enabled Pipelines for merge results and have git depth 0. Document new default_git_depth project CI/CD setting
* | | | | | | | | | | | | | | Merge branch '50070-legacy-attachments' into 'master'Kamil Trzciński2019-06-076-4/+485
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate legacy uploads Closes #57217 See merge request gitlab-org/gitlab-ce!24679