Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '45318-junit-FE' into 'master' | Phil Hughes | 2018-08-03 | 11 | -10/+531 |
|\ | | | | | | | | | Frontend code for "JUnit XML Test Summary In MR widget" See merge request gitlab-org/gitlab-ce!20936 | ||||
| * | Adds action spec to cover 204 | Filipa Lacerda | 2018-08-03 | 1 | -5/+17 |
| | | |||||
| * | Changes after review: | Filipa Lacerda | 2018-08-02 | 3 | -12/+23 |
| | | | | | | | | | | | | | | - Cleans up CSS to use common classes - Removes getters to use mapState instead - Makes the first request even when tab is not visible - Show loading state in 204 | ||||
| * | Adds frontend support to render test reports on theMR widget | Filipa Lacerda | 2018-08-02 | 11 | -0/+498 |
| | | | | | | | | | | | | | | Creates an app to render grouped test reports in the MR widget Ports CSS from EE into CE Creates a reusable code component Adds getters and utils to the existing reports store | ||||
* | | Merge branch 'ide-rename-files' into 'master' | Filipa Lacerda | 2018-08-03 | 7 | -38/+247 |
|\ \ | | | | | | | | | | | | | | | | | | | Enable renaming files & folders in the Web IDE Closes #44845 See merge request gitlab-org/gitlab-ce!20835 | ||||
| * | | fixed karma | Phil Hughes | 2018-08-02 | 1 | -1/+1 |
| | | | |||||
| * | | fixed review mode diffs | Phil Hughes | 2018-08-02 | 2 | -41/+5 |
| | | | |||||
| * | | more spec fixes | Phil Hughes | 2018-08-02 | 1 | -1/+2 |
| | | | |||||
| * | | spec fixes | Phil Hughes | 2018-08-02 | 1 | -0/+3 |
| | | | |||||
| * | | fixed karma | Phil Hughes | 2018-07-31 | 1 | -3/+14 |
| | | | |||||
| * | | specs | Phil Hughes | 2018-07-31 | 4 | -7/+194 |
| | | | |||||
| * | | karma fixes | Phil Hughes | 2018-07-30 | 4 | -2/+13 |
| | | | |||||
| * | | Enable renaming files & folders in the Web IDE | Phil Hughes | 2018-07-30 | 1 | -1/+33 |
| | | | | | | | | | | | | Closes #44845 | ||||
* | | | Fixed Web IDE row dropdowns scrolling list incorrectly | Phil Hughes | 2018-08-02 | 1 | -1/+3 |
| |/ |/| | | | | | Closes #49892 | ||||
* | | Add vanilla JS avatar_helper and update existing avatar helpers | Paul Slaughter | 2018-08-01 | 3 | -12/+120 |
| | | |||||
* | | Raise timeout for Karma tests to 2 seconds | Winnie Hellmann | 2018-08-01 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'andr3-remove-mr-regressions-fixes-from-master' into 'master' | Filipa Lacerda | 2018-08-01 | 11 | -379/+44 |
|\ \ | | | | | | | | | | | | | Remove fixes for MR refactor regressions from master See merge request gitlab-org/gitlab-ce!20920 | ||||
| * | | Revert "Merge branch '_acet-fix-outdated-discussions' into 'master'" | André Luís | 2018-08-01 | 5 | -69/+0 |
| | | | | | | | | | | | | | | | This reverts commit 740ae2d194f3833e224c326cc909d833c5807484, reversing changes made to 1ba47de5fef7a86a453e97a574741d3dba85c521. | ||||
| * | | Revert "Merge branch '_acet-fix-mr-autosave' into 'master'" | André Luís | 2018-08-01 | 3 | -43/+17 |
| | | | | | | | | | | | | | | | This reverts commit 5ba542b1094bd8fd95d48d2ac834fd8605cf8fee, reversing changes made to 32c831ea2b8425c71c790b67fb8f2170f3d9955a. | ||||
| * | | Revert "Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master'" | André Luís | 2018-08-01 | 4 | -262/+26 |
| | | | | | | | | | | | | | | | This reverts commit ced005f330419ec81657e852c5cb9124fdb29fbb, reversing changes made to 9b01b293ce5ddbaeedaf014cdc804af2c5e86416. | ||||
| * | | Revert "Merge branch 'tz-mr-refactor-memory-reduction' into 'master'" | André Luís | 2018-08-01 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | This reverts commit 2411ecb5762f8e04a6c6f61cc50ed25f29f55be3, reversing changes made to 58a0df7e68e46902e453a0252e6753517d9cf665. | ||||
* | | | Merge branch 'winh-lint-console-tests' into 'master' | Mike Greiling | 2018-07-31 | 4 | -4/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | Enable no-console ESLint rule for tests See merge request gitlab-org/gitlab-ce!20812 | ||||
| * | | | Enable no-console ESLint rule for testswinh-lint-console-tests | Winnie Hellmann | 2018-07-24 | 4 | -4/+4 |
| | | | | |||||
* | | | | Merge branch '49161-disable-toggle-comments' into 'master' | Phil Hughes | 2018-07-31 | 2 | -7/+59 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | Resolve "MR refactor: Disable toggle comments button when diff has no discussions" Closes #49161 See merge request gitlab-org/gitlab-ce!20667 | ||||
| * | | | Disables toggle comments button for diff with no discussions | Filipa Lacerda | 2018-07-31 | 2 | -7/+59 |
| | | | | |||||
* | | | | Merge branch 'ide-warn-staged-files' into 'master' | Filipa Lacerda | 2018-07-31 | 1 | -0/+27 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Warn in IDE when user navigates away with staged changes See merge request gitlab-org/gitlab-ce!20857 | ||||
| * | | | | Warn in IDE when user navigates away with staged changes | Phil Hughes | 2018-07-26 | 1 | -0/+27 |
| | | | | | |||||
* | | | | | Changes poll.js to keep polling on any 2xx http status code | Filipa Lacerda | 2018-07-30 | 1 | -17/+22 |
| |/ / / |/| | | | |||||
* | | | | [Backport] View summed weights of issues in board column | Felipe Artur | 2018-07-30 | 1 | -0/+22 |
| | | | | |||||
* | | | | Resolve "Copy diff file path as GFM" is broken | Filipa Lacerda | 2018-07-30 | 2 | -20/+36 |
| |_|/ |/| | | |||||
* | | | Fix Karma failures due to invalid icon names | Stan Hu | 2018-07-27 | 2 | -4/+4 |
| | | | | | | | | | | | | The icon JSON field has been renamed from icon_status_success to status_success. | ||||
* | | | Merge remote-tracking branch 'dev/master' | Felipe Artur | 2018-07-26 | 7 | -32/+178 |
|\ \ \ | |||||
| * \ \ | Merge branch 'security-ide-branch-name-xss' into 'master' | Felipe Artur Cardozo | 2018-07-26 | 1 | -0/+8 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | [master] Fixed XSS in branch name in Web IDE See merge request gitlab/gitlabhq!2431 | ||||
| | * | | | Fixed XSS in branch name in Web IDE | Phil Hughes | 2018-07-10 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | #2691 | ||||
| * | | | | Merge branch 'security-2690-fix-tooltip' into 'master' | Felipe Artur Cardozo | 2018-07-26 | 6 | -32/+170 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [master] Escapes job name used in tooltips See merge request gitlab/gitlabhq!2427 | ||||
| | * | | | | Escapes job name used in tooltips in vue components | Filipa Lacerda | 2018-07-06 | 6 | -32/+170 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use sanitize to strip src attributes Changes sidebar back to use sanitize | ||||
* | | | | | | Full list of vulnerabilities | Sam Beckham | 2018-07-26 | 2 | -1/+34 |
| | | | | | | |||||
* | | | | | | Merge branch '48055-web-ide-resize-handles' into 'master' | Phil Hughes | 2018-07-26 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Resize handles for Web IDE right sidebar are too thin" Closes #48055 See merge request gitlab-org/gitlab-ce!20818 | ||||
| * | | | | | | Rename 'dragleft' and 'dragright' to 'drag-left' and 'drag-right' | Paul Slaughter | 2018-07-24 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Rename class dragHandle to drag-handle | Paul Slaughter | 2018-07-24 | 1 | -2/+2 |
| |/ / / / / | |||||
* | | | | | | Enable deleting files in the Web IDE | Phil Hughes | 2018-07-26 | 11 | -27/+260 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Make report_issues.vue easily extendable | Lukas Eipert | 2018-07-26 | 2 | -4/+4 |
| | | | | | |||||
* | | | | | Merge branch 'winh-fail-slow-karma-tests' into 'master' | Tim Zallmann | 2018-07-26 | 1 | -0/+13 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fail Karma tests that take longer than a second Closes #44174 See merge request gitlab-org/gitlab-ce!20518 | ||||
| * | | | | | Fail Karma tests that take longer than a second | Winnie Hellmann | 2018-07-23 | 1 | -0/+13 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Fixed IDE not opening JSON files | Phil Hughes | 2018-07-26 | 1 | -0/+17 |
| | | | | | |||||
* | | | | | Merge branch 'jivl-redesign-contributors-graph' into 'master' | Clement Ho | 2018-07-25 | 1 | -0/+85 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add bar chart component See merge request gitlab-org/gitlab-ce!20082 | ||||
| * | | | | | Add bar chart componentjivl-redesign-contributors-graph | Jose | 2018-07-25 | 1 | -0/+85 |
| | | | | | | |||||
* | | | | | | Replace issues time tracking progress bar with gitlab-ui's progress bar | Clement Ho | 2018-07-25 | 1 | -14/+3 |
|/ / / / / | |||||
* | | | | | Merge branch 'replace-snake-case-css-classes' into 'master' | Phil Hughes | 2018-07-25 | 3 | -9/+9 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Replace author_link snake case in stylesheets, specs, and helpers Closes #30921 See merge request gitlab-org/gitlab-ce!20797 | ||||
| * | | | | Replace author_link snake case in specs | George Tsiolis | 2018-07-24 | 3 | -9/+9 |
| | | | | |