summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix broken handling of certain calls in GitHub importer clientfix/github-importer-clientAhmad Sherif2016-10-061-2/+12
| | | | Closes #22998
* Merge branch 'dz-split-routes' into 'master' Dmitriy Zaporozhets2016-10-0510-801/+773
|\ | | | | | | | | | | | | Split routes on multiple files Because current 1k routing file is just impossible to read and manage. See merge request !6692
| * Put namespaces#show route below user ssh keys routeDmitriy Zaporozhets2016-10-051-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Put user keys routing back below project routingDmitriy Zaporozhets2016-10-052-3/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Split routes on multiple filesdz-split-routesDmitriy Zaporozhets2016-10-0510-803/+775
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'desplacturing' into 'master' Jacob Schatz2016-10-0525-908/+812
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor remnants of CoffeeScript destructured opts and super into ES6 ## What does this MR do? Gets rid of some CoffeeScript remnants that are difficult to work with, and updates them to use ES6 syntax/constructs. I updated nearby code to ES6, but these updates usually just included using the es6 class syntax and scoped variable keywords. **Important**: For the most part, I tried to avoid refactoring the design of the existing code. If I attempted that, this would've taken much much longer and it would've been out of this issue's scope. ## Why was this MR needed? The compiled coffeescript for destructured default params is very difficult to work in. These changes makes some of these rough patches more maintainable: e.g. ![Screen_Shot_2016-09-19_at_4.43.08_PM](/uploads/40cd3f79b9c5f595f3738213b0dadbbf/Screen_Shot_2016-09-19_at_4.43.08_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [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? Meta Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/21887 Child Issues: https://gitlab.com/gitlab-org/gitlab-ce/issues/21942 https://gitlab.com/gitlab-org/gitlab-ce/issues/21941 https://gitlab.com/gitlab-org/gitlab-ce/issues/21943 ## To Test Manually: #### app/assets/javascripts/LabelManager.js.es6 -> [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-1) - Navigate to [Labels](http://localhost:3000/gitlab-org/gitlab-test/labels) and click around (toggle label priority, add new labels, subcribe, edit, delete) #### app/assets/javascripts/blob/blob_ci_yaml.js.es6 -> [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-3) - [Create new file](http://localhost:3000/gitlab-org/gitlab-test/new/master) and give it the name `.gitlab-ci.yml`, then attempt to select a template #### app/assets/javascripts/blob/blob_license_selectors.js.es6 -> [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-7) - [Create new file](http://localhost:3000/gitlab-org/gitlab-test/new/master) and give it the name `license`, then attempt to select a template #### app/assets/javascripts/blob/template_selector.js.es6 -> [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-8) - This class is extended by the two previously mentioned files. As long as they work, this should work. #### app/assets/javascripts/issues-bulk-assignment.js.es6 -> [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-11) - [Visit issues](http://localhost:3000/gitlab-org/gitlab-test/issues), assign multiple issues a new label or milestone and update. #### app/assets/javascripts/profile/gl_crop.js.es6 -> [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-12) - [Visit your profile settings](http://localhost:3000/profile), upload a photo and attempt to crop and set as new profile picture. #### app/assets/javascripts/profile/profile.js.es6 > [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-14) - [Visit your profile settings](http://localhost:3000/profile), change various fields (Name, Bio, Email, Notifs settings) and submit form #### app/assets/javascripts/todos.js.es6 -> [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-18) - [Visit an issue](http://localhost:3000/documentcloud/underscore/issues/6) and Add Todo, then visit [Todos](http://localhost:3000/dashboard/todos). Try out the sorting features, making sure everything looks right. Mark the Todo done. #### app/assets/javascripts/user.js.es6 -> [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-19) - [Visit user profile](http://localhost:3000/u/root) and click between tabs. #### app/assets/javascripts/user_tabs.js.es6 -> [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-20) - Same as previous. cc: @jschatz1 See merge request !6261
| * | Restore inexplicably removed code from requestFileSuccess.desplacturingBryce Johnson2016-10-054-11/+18
| | | | | | | | | | | | (also clean up a few global refs)
| * | Simplify TemplateSelector keyup/blur handler.Bryce Johnson2016-10-051-5/+1
| | |
| * | Delete leftover usertabs and template_selector es5 files.Bryce Johnson2016-10-052-296/+0
| | |
| * | Remove debug flag.Bryce Johnson2016-10-051-1/+0
| | |
| * | Fix leftover or inadvertantly removed comments.Bryce Johnson2016-10-051-1/+2
| | |
| * | Remove 'released' from CHANGELOG.Bryce Johnson2016-10-051-1/+1
| | |
| * | Refactor TemplateSelector and fix for tests.Bryce Johnson2016-10-055-5/+109
| | |
| * | Make fixes to get tests passing.Bryce Johnson2016-10-055-7/+8
| | |
| * | Remove CHANGELOG duplicate.Bryce Johnson2016-10-051-4/+1
| | |
| * | Fix todos specs.Bryce Johnson2016-10-051-1/+1
| | |
| * | Fix profile test failure.Bryce Johnson2016-10-051-1/+1
| | |
| * | Remove old LabelManager.Bryce Johnson2016-10-051-115/+0
| | |
| * | Fix up for issues bulk assignment test.Bryce Johnson2016-10-051-9/+11
| | |
| * | Fix tests for Blob Selectors.Bryce Johnson2016-10-051-2/+2
| | |
| * | Fix test for SearchAutocomplete.Bryce Johnson2016-10-051-1/+1
| | |
| * | Update Changelog.Bryce Johnson2016-10-051-0/+4
| | |
| * | Remove unneeded semicolon.Bryce Johnson2016-10-051-1/+1
| | |
| * | Remove super passthrough.Bryce Johnson2016-10-052-5/+1
| | |
| * | Convert BlobLicenseSelctors to ES6.Bryce Johnson2016-10-052-25/+21
| | |
| * | Update LabelManager to ES6.Bryce Johnson2016-10-052-1/+106
| | |
| * | Refactor IssuesBulkAssignment to ES6.Bryce Johnson2016-10-053-83/+63
| | |
| * | Set defaults in constructor, in case opts are undefined.Bryce Johnson2016-10-056-22/+15
| | |
| * | Pass default opts.Bryce Johnson2016-10-052-2/+3
| | |
| * | Refactor GitLabCrop to ES6.Bryce Johnson2016-10-051-64/+59
| | |
| * | Make use of destructuring options, clean up based on feedback.Bryce Johnson2016-10-056-47/+54
| | |
| * | Use parentheses in IFFE's as per AirBnb styleguide.Bryce Johnson2016-10-055-5/+6
| | |
| * | Refactor Profile to use ES6.Bryce Johnson2016-10-051-60/+57
| | |
| * | Fixup debugger ref left in Dispatcher.Bryce Johnson2016-10-052-1/+0
| | |
| * | Refactor SearchAutocomplete to ES6 class syntax.Bryce Johnson2016-10-052-81/+77
| | |
| * | Fixup refs to currPage and currPages.Bryce Johnson2016-10-051-2/+2
| | |
| * | Refactor Todos to ES6.Bryce Johnson2016-10-052-79/+64
| | |
| * | Properly scope BlobCiYamlSelector and BlobCiYamlSelectors.Bryce Johnson2016-10-052-25/+32
| | |
| * | Refactor UserTabs to ES6.Bryce Johnson2016-10-052-1/+161
| | |
| * | Refactor BlobCiYamlSelector and BlobCiYamlSelectors to ES6.Bryce Johnson2016-10-052-46/+32
| | | | | | | | | | | | (Removes opts destructuring and inheritance boilerplate)
* | | Merge branch '22509-pipeline-tables' into 'master' Annabel Dunstone Gray2016-10-057-72/+76
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Pipeline list commit column width should be adjusted ## What does this MR do? - Fixes some HTML problems - Pipeline and Build tables were inside an `ul` tag - Pipeline table had 2 `tbody` tags and no `thead` - Adds grid classes in Pipeline table in order to be responsive: The content of the last column was being hidden but the column it self was not which results in a lot of blank space - Adds a percentage width to the commit column in the Pipeline table. - Removes one level of nesting in the commit column in the Pipeline table and to the Build column in the Build table. ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? The commit column had to much white space. ## Screenshots (if relevant) ![pipelines](/uploads/d198f07dceb498cc7ec537842cd34fff/pipelines.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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 - [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? Closes #22509 See merge request !6595
| * | | Removes class22509-pipeline-tablesFilipa Lacerda2016-10-051-1/+1
| | | |
| * | | Improves CSS for `branch-commit` classFilipa Lacerda2016-10-041-4/+5
| | | |
| * | | Fixes invalid html - table was inside an ul and had 2 tbody tagsFilipa Lacerda2016-10-037-72/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds hidden-xs class to the all column instead of the div inside it in order to remove extra whitespace when the actions are hidden Fixes columns width in pipeplines table Changes table parent element to not be an ul and reduces column width for the Build column Adds entry to CHANGELOG Removes added width for build table. Adds the CHANGELOG entry in the middle to avoid more conflicts with master
* | | | Merge branch 'test-improve-gitlab-identifier' into 'master' Rémy Coutable2016-10-056-9/+199
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Gitlab::Identifier ## What does this MR do? This refactors `Gitlab::Identifier` so that it: 1. Has tests 2. Caches output in an instance variable to reduce queries 3. Uses only a single query to find a user by an SSH key, instead of 2 ## Why was this MR needed? This code was untested and would execute more SQL queries than needed. See merge request !6680
| * | | | Refactor Gitlab::IdentifierYorick Peterse2016-10-056-9/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors Gitlab::Identifier so it uses fewer queries and is actually tested. Queries are reduced by caching the output as well as using 1 query (instead of 2) to find a user using an SSH key.
* | | | | Merge branch 'update-runner-information' into 'master' Rémy Coutable2016-10-055-33/+48
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update runner version only when updating contacted_at ## What does this MR do? Improves how we update runners table, especially the version. This is another round of improvements to reduce number of `ci_runners` updates. I did make `contacted_at` to be updated more often (on average every 15 minutes). We will also update version information in one go to solve: https://gitlab.com/gitlab-org/gitlab-ce/issues/22206 Improves: https://gitlab.com/gitlab-org/gitlab-ce/issues/22590 Solves: https://gitlab.com/gitlab-org/gitlab-ce/issues/22206 See merge request !6537
| * | | | Add some tests for updating ci runner informationupdate-runner-informationGrzegorz Bizon2016-10-031-16/+27
| | | | |
| * | | | Extract method that checks if ci runner needs updateGrzegorz Bizon2016-10-031-4/+11
| | | | |
| * | | | Update runner version only when updating contacted_atKamil Trzcinski2016-10-034-15/+12
| | | | |
View Lorry Controller Status