summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix karma out-of-memory failuresfix-karma-out-of-memoryMike Greiling2018-09-251-0/+3
|
* Merge branch '51050-fix' into 'master'Annabel Dunstone Gray2018-09-242-1/+14
|\ | | | | | | | | | | | | Resolve "Collapsed open and closed sections in boards styling is broken" Closes #51050 See merge request gitlab-org/gitlab-ce!21868
| * Resolve "Collapsed open and closed sections in boards styling is broken"Andrea Leone2018-09-242-1/+14
|/
* Merge branch ↵Robert Speicher2018-09-243-104/+126
|\ | | | | | | | | | | | | '47818-post-comment-on-commit-when-downstream-pipeline-is-created-qa' into 'master' Post a commit note with the downstream pipeline URL for omnibus triggers See merge request gitlab-org/gitlab-ce!21512
| * Refactor scripts/trigger-build and post a commit note with the downstream ↵Rémy Coutable2018-09-243-104/+126
|/ | | | | | pipeline URL for omnibus triggers Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'auto-devops-docs-improvements' into 'master'Achilleas Pipinellis2018-09-241-19/+1
|\ | | | | | | | | Auto devops docs improvements See merge request gitlab-org/gitlab-ce!21882
| * Auto devops docs improvementsDylan Griffith2018-09-241-19/+1
|/
* Merge branch '24128-fix-comment-unresolve-discussions' into 'master'Douwe Maan2018-09-244-30/+75
|\ | | | | | | | | | | | | Resolve "Resolved discussions automatically get unresolved when commented on" Closes #24128 See merge request gitlab-org/gitlab-ce!21881
| * Auto resolve new notes of resolved discussionsPaul Slaughter2018-09-244-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** The previous behavior had resolved discussions being unresolved when commented on. This was strange UX, especially since there is a separate button for "Comment & unresolve discussion". https://gitlab.com/gitlab-org/gitlab-ce/issues/24128 **Note:** - Also adds changelog
| * Refactor 'resolved discussion reply form' specsPaul Slaughter2018-09-241-30/+35
| | | | | | | | | | | | | | | | | | **Why?** - These specs had duplicated code for a common context - New specs for this context needs to be added **Notes:** - Also added some `wait_for_requests` to buttons that triggered AJAX
* | Merge branch 'feature/new_user_snippets_breadcrumbs' into 'master'Rémy Coutable2018-09-243-1/+24
|\ \ | | | | | | | | | | | | Feature/new user snippets breadcrumbs See merge request gitlab-org/gitlab-ce!21661
| * | Feature/new user snippets breadcrumbsJ.D. Bean2018-09-243-1/+24
|/ /
* | Merge branch 'dz-group-labels-finder' into 'master'Yorick Peterse2018-09-243-4/+51
|\ \ | |/ |/| | | | | | | | | Move group labels AR code into finder Closes #49653 See merge request gitlab-org/gitlab-ce!21854
| * Move group labels AR code into finderdz-group-labels-finderDmitriy Zaporozhets2018-09-213-4/+51
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'master' into 'master'Rémy Coutable2018-09-241-0/+1
|\ \ | | | | | | | | | | | | Add Baw-Appie as Korean proofreader See merge request gitlab-org/gitlab-ce!20586
| * | Update proofreader.mdBaw-Appie2018-07-121-1/+1
| | |
| * | Update proofreader.mdBaw-Appie2018-07-121-0/+1
| | |
* | | Merge branch 'upgrade-eslint' into 'master'Marin Jankovski2018-09-2462-324/+428
|\ \ \ | | | | | | | | | | | | | | | | Upgrade eslint to v5.x See merge request gitlab-org/gitlab-ce!21825
| * | | Switch to per-line rule exceptionsupgrade-eslintMike Greiling2018-09-211-2/+4
| | | |
| * | | Upgrade eslint-plugin-jasmine and resolve violationsMike Greiling2018-09-206-5/+15
| | | |
| * | | Upgrade other eslint pluginsMike Greiling2018-09-202-90/+74
| | | |
| * | | Resolve eslint-plugin-vue errorsMike Greiling2018-09-2054-96/+102
| | | | | | | | | | | | | | | | | | | | | | | | The eslint-plugin-vue upgrade had some breaking changes to vue/attribute-order which needed to be resolved in order to avoid disabling the rule entirely
| * | | Upgrade eslint-plugin-vue to v5.xMike Greiling2018-09-202-31/+14
| | | |
| * | | Upgrade eslint to v5Mike Greiling2018-09-205-114/+233
| | | | | | | | | | | | | | | | | | | | | | | | We needed to disable a few eslint-config-airbnb-base rules in order to keep the number of line changes under control. These should be re-enabled asap.
* | | | Merge branch 'docs/geo-premium' into 'master'Marcia Ramos2018-09-241-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Change the tier badge of Geo to be PREMIUM See merge request gitlab-org/gitlab-ce!21877
| * | | | Change the tier badge of Geo to be PREMIUMdocs/geo-premiumAchilleas Pipinellis2018-09-241-1/+1
| | | | |
* | | | | Merge branch 'dm-create-note-return-discussion' into 'master'Filipa Lacerda2018-09-2412-94/+140
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase performance when creating discussion on diff Closes #49002 See merge request gitlab-org/gitlab-ce!21743
| * | | | | Added CHANGELOGPhil Hughes2018-09-241-0/+5
| | | | | |
| * | | | | Fixed utils specPhil Hughes2018-09-211-1/+2
| | | | | |
| * | | | | Changed `true` string to a booleanPhil Hughes2018-09-212-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fixed toBeTruthy to toBe(true) in spec
| * | | | | Fixed karma spec for getNoteFormDataPhil Hughes2018-09-213-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fixed toggling new notes caused by not returning the stores discussion
| * | | | | Use returned discussion from APIPhil Hughes2018-09-216-78/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now use the returned discussion instead of re-fetching all of the discussions and filtering out the ones we don't need. This speeds up the process of creating a diff discussions by saving us another API request before we can render the discussion
| * | | | | Return discussion object from NotesController#create when return_discussion ↵Douwe Maan2018-09-213-13/+44
| | | | | | | | | | | | | | | | | | | | | | | | param is set
* | | | | | Merge branch 'fix/help-text-font-color-in-merge-request-creation' into 'master'Filipa Lacerda2018-09-242-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes WIP text with two different colors in MR edit page Transforms a `p` element in a `div` to guarantee WIP the explanation is rendered inside `text-muted` See merge request gitlab-org/gitlab-ce!21740
| * | | | | | Removed span tag and p tag from form-textGerard Montemayor2018-09-221-3/+3
| | | | | | |
| * | | | | | Change .js-wip-explanation div element to spanGerard Montemayor2018-09-132-2/+7
| | | | | | |
* | | | | | | Merge branch 'update-gitlab-ui-version' into 'master'Phil Hughes2018-09-242-4/+4
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Use gitlab-ui 1.5.1 See merge request gitlab-org/gitlab-ce!21865
| * | | | | | Use gitlab-ui 1.5.1Clement Ho2018-09-212-4/+4
| | | | | | |
* | | | | | | Merge branch 'gitaly-auth-v2' into 'master'Robert Speicher2018-09-211-8/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the new gitaly auth scheme (v2) See merge request gitlab-org/gitlab-ce!21417
| * | | | | | | Use the new gitaly auth scheme (v2)Alejandro Rodríguez2018-09-201-8/+22
| | | | | | | |
* | | | | | | | Merge branch 'ee-admin-geo-namespace-support' into 'master'Douglas Barbosa Alexandre2018-09-211-3/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Backport Admin menu changes from EE See merge request gitlab-org/gitlab-ce!21864
| * | | | | | | Backport Admin menu changes from EEGabriel Mazetto2018-09-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using path syntax to include Admin namespace as part of Project controller menu expansion code, in order to not conflict with same controller name but in Geo namespace.
* | | | | | | | Merge branch '51725-push-mirrors-default-branch-reset-to-master' into 'master'Stan Hu2018-09-216-72/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doesn't synchronize default branch for push mirrors Closes #51725 See merge request gitlab-org/gitlab-ce!21861
| * | | | | | | | Add CHANGELOG entryDouglas Barbosa Alexandre2018-09-211-0/+5
| | | | | | | | |
| * | | | | | | | Doesn't synchronize default branch for push mirrorsDouglas Barbosa Alexandre2018-09-215-72/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should not synchronize the source repository with the target root ref while updating a push mirror.
* | | | | | | | | Merge branch 'align-form-labels' into 'master'Clement Ho2018-09-217-10/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align form labels following Bootstrap 4 docs See merge request gitlab-org/gitlab-ce!21752
| * | | | | | | | | Align form labels following Bootstrap 4 docsAnnabel Dunstone Gray2018-09-217-10/+14
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs-fix-setup-grammar-marcel-contribution-2'Robert Speicher2018-09-2154-72/+72
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct grammar (setup to set-up) in Docs See merge request gitlab-org/gitlab-ce!21857
| * | | | | | | | | Correct grammar (setup to set-up) in DocsMarcel Amirault2018-09-2154-72/+72
| | | | | | | | | |
* | | | | | | | | | Merge branch 'add-most-stars-for-filter-option' into 'master'Douglas Barbosa Alexandre2018-09-216-2/+41
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows to sort projects by most stars Closes #47203 See merge request gitlab-org/gitlab-ce!21762
View Lorry Controller Status