summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix border radius of collapse discussion btnavatar-mixinAnnabel Dunstone Gray2019-06-073-9/+13
| | | | Turn avatar-counter into a mixin with optional border-radius
* 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
| * | | | | Migrate legacy uploads to the project location50070-legacy-attachmentsJarka Košanová2019-06-066-4/+485
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uploads coming from AttachmentUploader need to be moved to the currently supported location (FileUploader)
* | | | | | Merge branch '10075-dependency-list-docs' into 'master'Achilleas Pipinellis2019-06-071-0/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dependency list documentation See merge request gitlab-org/gitlab-ce!29307
| * | | | | | Add dependency list documentationTetiana Chupryna2019-06-071-0/+11
|/ / / / / /
* | | | | | Merge branch 'ce-5276-2-update-stores-for-terminal-file-sync' into 'master'Phil Hughes2019-06-076-2/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE of Part 2] 5276 Update existing stores for file terminal sync See merge request gitlab-org/gitlab-ce!29333
| * | | | | | IDE trigger files change eventce-5276-2-update-stores-for-terminal-file-syncPaul Slaughter2019-06-076-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - On CMD+S when editor is focused - On editor blur - When file is created in tree - When file is removed in tree - When file is renamed in tree
* | | | | | | Merge branch 'ce-5276-1-remove-build-page-from-ide-terminal-element' into ↵Phil Hughes2019-06-072-9/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [CE of Part 1] 5276 Remove 'build-page' from 'ide-terminal' element See merge request gitlab-org/gitlab-ce!29331
| * | | | | | | Remove 'build-page' from 'ide-terminal' elementce-5276-1-remove-build-page-from-ide-terminal-elementPaul Slaughter2019-06-072-9/+15
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Port **Why?** The styles applied to `.build-page .top-bar` were mostly unecessary for the IDE terminal. The static positioning might have also been causing a strange line to show up in the terminal.
* | | | | | | Merge branch 'issue/10088' into 'master'Filipa Lacerda2019-06-072-0/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added code differences from EE to CE Closes gitlab-ee#10088 See merge request gitlab-org/gitlab-ce!29271
| * | | | | | | added code differences from EE to CEMichel Engelen2019-06-072-0/+17
|/ / / / / / /
* | | | | | | Merge branch '62091-remove-time-windows-flag' into 'master'Nick Thomas2019-06-077-62/+10
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove metrics_time_window feature flag Closes #62091 See merge request gitlab-org/gitlab-ce!28670
| * | | | | | Remove metrics_time_window feature flagSarah Yasonik2019-06-077-62/+10
|/ / / / / /
* | | | | | Merge branch 'docs/ssot-some-ci-section' into 'master'Achilleas Pipinellis2019-06-0712-118/+285
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SSoT audit fixes for some topics in CI section Closes #61505 See merge request gitlab-org/gitlab-ce!28957
| * | | | | | SSoT audit fixesEvan Read2019-06-0712-118/+285
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Implements part of the single source of truth audit fixes for the CI section.
* | | | | | Merge branch 'docs/edit-click-through' into 'master'Achilleas Pipinellis2019-06-071-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrate demo link into content more See merge request gitlab-org/gitlab-ce!29242
| * | | | | | Integrate demo link into content moreEvan Read2019-06-071-4/+4
|/ / / / / /
* | | | | | Merge branch 'ce-mw-onboarding-tour-helper' into 'master'Phil Hughes2019-06-074-0/+79
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | (CE Port) Onboarding helper component See merge request gitlab-org/gitlab-ce!29133
| * | | | | | Add styles and animations for onboarding helperMartin Wortschack2019-06-074-0/+79
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | - Add styles for popover - Add $accepting-mr-label-color to color variables
* | | | | | Merge branch 'update_source_#62187' into 'master'Achilleas Pipinellis2019-06-072-11/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add git 2.21 install from update_source See merge request gitlab-org/gitlab-ce!28836
| * | | | | | Add git 2.21 install from update_sourceÆx2019-06-072-11/+51
|/ / / / / /
* | | | | | Merge branch '9764-operations-icon-is-shown-twice-on-small-viewport' into ↵Kushal Pandya2019-06-071-16/+16
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Hide operations icon in small screens See merge request gitlab-org/gitlab-ce!29230
| * | | | | Hide operations icon in small screens9764-operations-icon-is-shown-twice-on-small-viewportDhiraj Bodicherla2019-06-061-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In small screens operations icon is visible and also present in More menu. This commit cleans up the More menu for small screens and also shows and hides nav links appropriately based on screen sizes Cleaned up title attrs in dashboard
* | | | | | Merge branch 'docs/58975-jira-integration-docs' into 'master'Mike Lewis2019-06-078-22/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve Jira Server documentation Closes #58975 See merge request gitlab-org/gitlab-ce!28463
| * | | | | | Apply reviewer feedbackdocs/58975-jira-integration-docsMike Lewis2019-06-072-17/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove image for adding new permission scheme - Delete jira_add_permission_scheme.png as no longer included in content - add group language - Reword the add user to group instructions - Reword the add selected users instruction - Reword add permission scheme instruction - Update jira_server_configuration intro
| * | | | | | Change text to match screencapscharlieablett2019-06-071-2/+2
| | | | | | |
| * | | | | | Reword for claritycharlieablett2019-06-071-2/+2
| | | | | | |
| * | | | | | Upgrade jira user permissions workflow docscharlieablett2019-06-078-14/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update screecaps to reflect jira version ~8.1 and update instructions to include Permission Schemes.
| * | | | | | Fix some typoescharlieablett2019-06-071-2/+2
| | | | | | |
* | | | | | | Merge branch 'sh-improve-openid-docs' into 'master'Evan Read2019-06-071-0/+35
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix OpenID Connect documentation See merge request gitlab-org/gitlab-ce!29314
| * | | | | | | Fix OpenID Connect documentationsh-improve-openid-docsStan Hu2019-06-061-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many users were unable to get logins working with OpenID Connect because of a missing `name` argument in the configuration. This resulted in 404s immediately after attempting to login. This describes the workaround mentioned in https://gitlab.com/gitlab-org/gitlab-ce/issues/62208#note_178774809. This also adds an example profile for using Google.
* | | | | | | | Merge branch 'sh-fix-openid-connect-defaults' into 'master'Ash McKenzie2019-06-073-0/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make OpenID Connect work without requiring a name Closes #62208 See merge request gitlab-org/gitlab-ce!29312