summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Enable PseudoElement in scss-lintenable-scss-lint-pseudo-elementClement Ho2016-10-2612-28/+28
|
* Merge branch '23607-mr-pipeline-status' into 'master' Alfredo Sumaran2016-10-263-5/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | Show full status link on MR & commit pipelines Before: ![Screen_Shot_2016-10-24_at_2.43.09_PM](/uploads/5543b6e134a5349650b24dcb1b1a9082/Screen_Shot_2016-10-24_at_2.43.09_PM.png) After: ![Screen_Shot_2016-10-24_at_2.42.55_PM](/uploads/a561c8708ca2b17d11c0eb9b2cfd0b9b/Screen_Shot_2016-10-24_at_2.42.55_PM.png) Closes #23607 See merge request !7079
| * Update changelog23607-mr-pipeline-statusAnnabel Dunstone Gray2016-10-251-0/+1
| |
| * Show full status link on MR & commit pipelinesAnnabel Dunstone Gray2016-10-242-5/+2
| |
* | Merge branch 'eslint' into 'master' Fatih Acet2016-10-26238-0/+297
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ESLint ## What does this MR do? - create `package.json` - add ESLint dependencies to `package.json` - add JavaScript linting to CI - add Rake task `lint:javascript`as alias for `eslint` (which itself is an alias for `npm run eslint`) ## Are there points in the code the reviewer needs to double check? Probably not. ## Why was this MR needed? My hovercraft was full of eels. ## What are the relevant issue numbers? - https://gitlab.com/gitlab-org/gitlab-ce/issues/13224#note_12537431 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5006#note_13255658 See merge request !5445
| * | disable ESLint for all JavaScript fileswinniehell2016-10-26231-0/+231
| | |
| * | make build fail for ESLint errorswinniehell2016-10-261-1/+0
| | |
| * | add Rake tasks eslint and lint:javascriptwinniehell2016-10-262-0/+16
| | |
| * | add JavaScript linting to CI (!5445)winniehell2016-10-261-0/+9
| | |
| * | add ESLintwinniehell2016-10-264-0/+42
| | | | | | | | | | | | ESLint config: https://github.com/airbnb/javascript
* | | Merge branch ↵Annabel Dunstone Gray2016-10-261-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '23661-lacking-padding-on-syntax-highlight-blocks-in-diff-comments' into 'master' Resolve "Lacking padding on syntax highlight blocks in diff comments" ## What does this MR do? Enforces horizontal padding on highlight block. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? There was no horizontal padding on diff comment highlight blocks. ## Screenshots (if relevant) ![Screen_Shot_2016-10-23_at_01.48.10](/uploads/6d7a426c0856e8787b63b2c02672298a/Screen_Shot_2016-10-23_at_01.48.10.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23661 See merge request !7062
| * | | Fix horizontal padding for highlight blocks23661-lacking-padding-on-syntax-highlight-blocks-in-diff-commentsLuke Bennett2016-10-251-1/+1
| | | |
* | | | Merge branch ↵Alfredo Sumaran2016-10-265-14/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '21988-refactor-less-readable-existance-checking-code-from-coffeescript' into 'master' Refactored less readable existance checks ## What does this MR do? Clean up complex JavaScript expressions generated by conditional assignment and existence checks in CoffeeScript. These are small changes that effect 1 or 2 lines at a time, but should make sections of code more readable. ## Are there points in the code the reviewer needs to double check? Changes in [gl_dropdown.js](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/assets/javascripts/gl_dropdown.js) don't do much (largely just splitting stuff onto multiple lines). Is this a bit pointless? ## Why was this MR needed? Auto-generated JS contains complex expressions that will be difficult to work with in future. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? A child issue of #21887 Closes #21988 See merge request !6289
| * | | | Refactored less readable existance checksJack Davison2016-10-265-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CoffeeScript generated JavaScript contains some unreadable expressions. This refactoring addresses complex uses of the exestential operator that produced unreadable Javascript.
* | | | | Merge branch 'docs/jira-service-api' into 'master' Achilleas Pipinellis2016-10-261-19/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add all endoints to JIRA service API documentation ## What does this MR do? Add missing API endpoints to the JIRA service. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ee/issues/440 See merge request !7122
| * | | | | Add missing API endpoints to JIRA service API documentationAchilleas Pipinellis2016-10-261-19/+27
| | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/440
* | | | | | Merge branch 'dont-test-ee_compat_check-on-master' into 'master' Robert Speicher2016-10-261-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to run `ee_compat_check` against `master` See merge request !7119
| * | | | | | We don't need to run ee_compat_check against masterRémy Coutable2016-10-261-0/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'docs-trigger-variable' into 'master' Achilleas Pipinellis2016-10-261-3/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a trigger variable to docs trigger job See merge request !7089
| * | | | | | Restrict docs trigger job only to gitlab-org/gitlab-cedocs-trigger-variableAchilleas Pipinellis2016-10-251-1/+1
| | | | | | |
| * | | | | | Use the alpine Docker image for docs triggerAchilleas Pipinellis2016-10-251-2/+4
| | | | | | |
| * | | | | | Add a variable to docs trigger and set Git strategy to noneAchilleas Pipinellis2016-10-251-1/+4
| | | | | | |
* | | | | | | Merge branch 'voogsgerd/gitlab-ce-daniel-cssclassvisable'Rémy Coutable2016-10-262-1/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | See merge request !7086
| * | | | | | Fixed typo in css classDaniel Voogsgerd2016-10-262-1/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed .visable-sm to .visible-sm Fixes #23745 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'issue-board-sidebar' into 'master' Fatih Acet2016-10-2635-48/+913
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue board sidebar ## What does this MR do? Adds a sidebar when clicking an issue in the issue boards lists. This allows user to easily update other parts of the issue details without having to visit the issue itself. Same functionality as on issue page. When creating a new issue the sidebar automatically opens. ## Screenshots (if relevant) ![Screen_Shot_2016-10-07_at_13.10.16](/uploads/ad08785f407d8ac3fe9cb078868a7839/Screen_Shot_2016-10-07_at_13.10.16.png) ## What are the relevant issue numbers? Closes #21219 See merge request !6690
| * \ \ \ \ \ Merge branch 'master' into issue-board-sidebarissue-board-sidebarPhil Hughes2016-10-26297-1539/+3583
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Moved avatar infront of labelsPhil Hughes2016-10-252-5/+9
| | | | | | |
| * | | | | | Fixed height of sidebar causing scrolling issuesPhil Hughes2016-10-251-2/+5
| | | | | | |
| * | | | | | Fixed users profile link in sidebarPhil Hughes2016-10-254-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed new labels not being created Fixed scrolling issues
| * | | | | | Alignment of toggle buttonPhil Hughes2016-10-201-1/+1
| | | | | | |
| * | | | | | Merge branch 'master' into issue-board-sidebarPhil Hughes2016-10-2017-53/+172
| |\ \ \ \ \ \
| * | | | | | | Added button typesPhil Hughes2016-10-202-2/+2
| | | | | | | |
| * | | | | | | Hides/shows the boards sidebarPhil Hughes2016-10-209-32/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than constructing & then deconstructing, we know just hide & show the sidebar. This is done so we dont' have a memory leak on the frontend with objects getting created.
| * | | | | | | Updated close sidebar iconPhil Hughes2016-10-193-3/+10
| | | | | | | |
| * | | | | | | Merge branch 'master' into issue-board-sidebarPhil Hughes2016-10-19193-963/+3195
| |\ \ \ \ \ \ \
| * | | | | | | | Scroll board into view when clicking issuePhil Hughes2016-10-198-15/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed return statement instead of if Delete objects after issue is closed
| * | | | | | | | Tests updatePhil Hughes2016-10-191-2/+3
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into issue-board-sidebarPhil Hughes2016-10-19808-7304/+16319
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fixed some JS stylingPhil Hughes2016-10-072-2/+2
| | | | | | | | | |
| * | | | | | | | | Fixed filter specsPhil Hughes2016-10-071-1/+1
| | | | | | | | | |
| * | | | | | | | | Added tests for showing sidebar when new issue is savedPhil Hughes2016-10-072-0/+29
| | | | | | | | | |
| * | | | | | | | | Make the subscribe button work correctlyPhil Hughes2016-10-072-2/+7
| | | | | | | | | |
| * | | | | | | | | Restore subscribe status in JSONPhil Hughes2016-10-074-3/+15
| | | | | | | | | |
| * | | | | | | | | Fix issue when clicking links inside issue showing sidebarPhil Hughes2016-10-072-2/+6
| | | | | | | | | |
| * | | | | | | | | Fix JSON Schema that validates data returned by board issues endpointDouglas Barbosa Alexandre2016-10-072-1/+2
| | | | | | | | | |
| * | | | | | | | | Added testsPhil Hughes2016-10-074-3/+300
| | | | | | | | | |
| * | | | | | | | | Fixed sidebar dropdowns to work with VuePhil Hughes2016-10-077-6/+24
| | | | | | | | | |
| * | | | | | | | | Styling updates to sidebar to match designPhil Hughes2016-10-072-5/+35
| | | | | | | | | |
| * | | | | | | | | Correct the issue update pathPhil Hughes2016-10-074-4/+4
| | | | | | | | | |
| * | | | | | | | | Hides sidebar when clicking same issuePhil Hughes2016-10-072-2/+7
| | | | | | | | | |
View Lorry Controller Status