summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fix system note alignment within difffix-diff-system-note-alignmentAnnabel Dunstone Gray2019-06-101-1/+1
|
* Add word break style to branch name in dropdownSamantha Ming2019-06-101-0/+1
| | | | Add change log
* User link styling for commitsMarcel van Remmerden2019-06-102-1/+9
|
* Move project default git depth behind feature flagsFabio Pitino2019-06-102-1/+3
|
* Fix nil coercion updating storage size on project statisticsAlessio Caiazza2019-06-101-1/+1
|
* Merge branch 'cancel-auto-merge-when-branch-is-changed' into 'master'Kamil Trzciński2019-06-104-7/+9
|\ | | | | | | | | Cancel Auto Merge when target branch is changed See merge request gitlab-org/gitlab-ce!29416
| * Cancel Auto Merge when target branch is changedcancel-auto-merge-when-branch-is-changedShinya Maeda2019-06-104-7/+9
| | | | | | | | When target branch is updated, Auto Merge should be canceled.
* | Merge branch 'fix-issue-mr-badge' into 'master'Phil Hughes2019-06-102-4/+3
|\ \ | | | | | | | | | | | | Use grid and correct border radius for status badge See merge request gitlab-org/gitlab-ce!29420
| * | Use grid and correct border radius for status badgeAnnabel Dunstone Gray2019-06-102-4/+3
| | |
* | | Fix border radius of collapse discussion btnAnnabel Dunstone Gray2019-06-103-9/+13
|/ / | | | | | | Turn avatar-counter into a mixin with optional border-radius
* | Make margin between buttons consistentMarcel van Remmerden2019-06-101-1/+1
|/
* List ssh-ed25519 exampleBen Bodenmiller2019-06-101-2/+2
|
* Merge branch 'sh-fix-fogbugz-import' into 'master'James Lopez2019-06-101-2/+6
|\ | | | | | | | | | | | | Fix Fogbugz Importer not working Closes #33530 See merge request gitlab-org/gitlab-ce!29383
| * Fix Fogbugz Importer not workingsh-fix-fogbugz-importStan Hu2019-06-091-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This stopped working in GitLab 11.11 when we upgraded to Rails 5.1. Rails 5 changed ActionController::Parameters to return an Object instead of a Hash. The old behavior was deprecated in Rails 5 but finally removed in Rails 5.1 Since the controller wasn't updated properly, the callback endpoint quietly failed with the message, "Could not connect to FogBugz, check your url". To fix this, we need to call `to_h` on the `import_params` to access the Hash. We also need to do this for the user map and permit specific keys. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/33530
* | Merge branch 'patch-56' into 'master'Sean McGivern2019-06-102-2/+2
|\ \ | | | | | | | | | | | | Clarify that performance bar is not always on See merge request gitlab-org/gitlab-ce!28287
| * \ Merge remote-tracking branch 'origin/master' into patch-56Sean McGivern2019-06-10704-3497/+7751
| |\ \
| * | | Clarify that performance bar is not always onBen Bodenmiller2019-06-092-2/+2
| | | |
* | | | Externalize strings of email page in user profileantony liu2019-06-103-26/+26
| | | |
* | | | Make option dropdown button to match adjacent buttonSamantha Ming2019-06-101-1/+1
| |/ / |/| |
* | | Merge branch 'ce-5276-3-update-ide-diff-and-mirror-modules' into 'master'Phil Hughes2019-06-101-1/+11
|\ \ \ | |_|/ |/| | | | | | | | [CE for Part 3] Update IDE file mirror service (ce utils) See merge request gitlab-org/gitlab-ce!29360
| * | Update IDE file mirror service (ce utils)ce-5276-3-update-ide-diff-and-mirror-modulesPaul Slaughter2019-06-071-1/+11
| | | | | | | | | | | | | | | | | | **Notes:** This module is a client to the webide-file-sync service. https://gitlab.com/gitlab-org/webide-file-sync
* | | Merge branch '11396-dependency-list-connect-frontend-to-backend-ce' into ↵Thong Kuah2019-06-101-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add project Dependency List sidebar entry See merge request gitlab-org/gitlab-ce!29189
| * | | Add project Dependency List sidebar entry11396-dependency-list-connect-frontend-to-backend-ceMark Florian2019-06-061-0/+2
| | | | | | | | | | | | | | | | | | | | This is a CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13968.
* | | | 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-071-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-3/+3
| | | | |
* | | | | Merge branch 'gt-externalize-profiles-preferences' into 'master'Phil Hughes2019-06-071-10/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize profiles preferences Closes #53349 See merge request gitlab-org/gitlab-ce!28470
| * | | | | Externalize profiles preferencesGeorge Tsiolis2019-06-071-10/+11
| | | | | |
* | | | | | Fix discusson resolve toggle making page jumpJustin Boyson2019-06-071-3/+5
| | | | | |
* | | | | | Change styles for the board `Add List` dropdown to look more like the EE versionMichel Engelen2019-06-071-4/+5
| | | | | |
* | | | | | Remove list sorting from NewListDropdownWinnie Hellmann2019-06-071-3/+0
| |/ / / / |/| | | |
* | | | | Merge branch 'ee-9688-fe-mr-merge-order' into 'master'Clement Ho2019-06-075-15/+75
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-055-15/+75
| | |/ / / | |/| | | | | | | | | | | | | This MR is a backport of an EE merge request
* | | | | Move Vue models from vue_shared to boardsMartin Hanzel2019-06-076-18/+16
| | | | | | | | | | | | | | | | | | | | | | | | | Some classes in vue_shared were used only by boards, so they were moved to the boards directory.
* | | | | Merge branch ↵Stan Hu2019-06-077-7/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | | | Do not escape forward slashes in Maskable REGEXMatija Čupić2019-06-061-1/+1
| | | | | |
| * | | | | 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
| * | | | | Expose javascript regexMatija Čupić2019-06-061-0/+4
| | | | | |
| * | | | | Allow masking if 8 or more characters in base64Thomas Nilsson2019-06-062-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should allow for private ssh-keys to remain private. Solves https://gitlab.com/gitlab-org/gitlab-ce/issues/60790.
* | | | | | Merge branch '51636-task-list-api-pderichs' into 'master'Sean McGivern2019-06-071-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-0/+7
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-073-9/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve email text part See merge request gitlab-org/gitlab-ce!29111
| * | | | | | 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-072-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove extraneous DiffNote#supports_suggestion? calls See merge request gitlab-org/gitlab-ce!29027
| * | | | | | | Extend #parse to accept a suggestions_filter_enabled paramKerri Miller2019-06-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-076-15/+54
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Forks get default_git_depth 0 if the origin is nilKrasimir Angelov2019-06-062-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-066-16/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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