summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Apply better hierarchy to markdown headers and issue/mr titles21395-standarize-markdown-headlinestauriedavis2016-10-173-21/+14
|
* Merge branch 'find-file-enter-fix' into 'master' Fatih Acet2016-10-171-0/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | Fixed find file keyboard navigation ## What does this MR do? The code to view a file on find file page was removed, this adds that back in & adds some tests. ## What are the relevant issue numbers? Closes #23423 See merge request !6944
| * Fixed find file keyboard navigationfind-file-enter-fixPhil Hughes2016-10-171-0/+9
| | | | | | | | Closes #23423
* | Added download-button class and applied button margin23380-no-space-between-buttons-on-files-pageLuke Bennett2016-10-172-1/+5
|/
* Merge branch 'safari-is-baNaNas' into 'master' Rémy Coutable2016-10-174-109/+163
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Safari displaying NaN for selected due date ## What does this MR do? 1. Stops using `Date.parse` to parse selected due dates. 2. Refactors DueDateSelectors to be more maintainable and readable ## Are there points in the code the reviewer needs to double check? **To review the actual fix, look here:** https://gitlab.com/gitlab-org/gitlab-ce/commit/4ad43ac3a12902d7ea01dc09f8a361b01c21a0ee. It would be difficult to pick out from the overall diff. ## Why was this MR needed? In Safari, the due date selector was displaying 'NaN' when a date is selected, which was being returned by `Date.parse`. Because `Date.parse` is implemented differently across browsers it's generally recommended to favor implicit Date parsing with the `Date` constructor. For more background on this, [see MDN on Date.parse](https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/Date/parse). Also, the code for DueDateSelector was pretty messy, and its logic was very tightly coupled, so I refactored it. None of the basic logic changed, I just broke it up into smaller pieces and made it more OO. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22984 See merge request !6797
| * Convert due_date_select.js filetype to es6.safari-is-baNaNasBryce Johnson2016-10-174-109/+163
| |
| * Stop directly parsing due_date with Date.parse, prefer parsing implicitly.Bryce Johnson2016-10-171-2/+2
| |
* | Merge branch 'add-pipeline-metrics-worker' into 'master' Kamil Trzciński2016-10-172-4/+36
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Pipeline metrics worker ## What does this MR do? Creating a new Merge Request metrics is time consuming, because we need to access repository. This makes this operation asynchronous, thus non-blocking for updating pipeline. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [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 - [ ] 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? See merge request !6896
| * | Improve spec for pipeline metrics workeradd-pipeline-metrics-workerKamil Trzcinski2016-10-171-5/+20
| | |
| * | Add Pipeline metrics workerKamil Trzcinski2016-10-172-4/+21
| |/
* | Merge branch 'ebraminio/gitlab-ce-master' into 'master'Robert Speicher2016-10-171-0/+13
|\ \ | |/ |/| | | | | | | Add RTL support to Markdown rendering See merge request !6296
| * Add RTL support to markdown rendererEbrahim Byagowi2016-10-161-0/+13
| |
* | Added logic to handle a revision input that does not exist in the menuLuke Bennett2016-10-162-3/+14
| |
* | Fix 500 error when creating mileston from group pagedz-fix-group-milestone-creationDmitriy Zaporozhets2016-10-161-4/+5
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'sh-fix-ruby-2-1' into 'master' Stan Hu2016-10-161-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | Fix Hash syntax to work for both Ruby 2.1 and 2.3 Ruby 2.1 specs were failing (e.g. https://gitlab.com/gitlab-org/gitlab-ce/builds/5149275) due the error: ``` SyntaxError: /builds/gitlab-org/gitlab-ce/app/views/devise/shared/_tabs_normal.html.haml:3: syntax error, unexpected ':', expecting => ...'#login-pane', data: {'toggle':'tab'}, role: 'tab')).to_s));... ``` See merge request !6917
| * Fix Hash syntax to work for both Ruby 2.1 and 2.3sh-fix-ruby-2-1Stan Hu2016-10-151-2/+2
| |
* | Fix broken SCSS linter errors due to missing newlinesStan Hu2016-10-151-0/+3
|/
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceJacob Schatz2016-10-151-0/+4
|\
| * Merge branch 'dz-handle-unmatched-routes' into 'master' Dmitriy Zaporozhets2016-10-151-0/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle unmatched routing with not_found method ## What does this MR do? Handle all unmatched routes with 404 method ## Why was this MR needed? We need this to prevent routing error when user access URL like /123 when there is no resource located under such name. ## What are the relevant issue numbers? Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/23378 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6733. See merge request !6905
| | * Handle unmatched routing with not_found methodDmitriy Zaporozhets2016-10-151-0/+4
| | | | | | | | | | | | | | | | | | | | | We need this to prevent routing error when user access URL like /123 when there is no resource located under such name Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Revert "Improve tabbing usability for sign in page"login-ui-improvementsBryce Johnson2016-10-151-10/+0
| | | | | | | | | | | | This reverts commit 8751491b8db471dc661daa19bc82a9dbd58e4aae.
* | | Clean up stray Sign up ref.Bryce Johnson2016-10-151-1/+1
| | |
* | | Back off the array spreading, bc poltergeist freaks out.Bryce Johnson2016-10-151-4/+3
| | |
* | | Convert dispatcher to es6.Bryce Johnson2016-10-151-0/+0
| | |
* | | Add exists to users routes and fix endpoint.Bryce Johnson2016-10-151-1/+1
| | |
* | | Attempt to fix username validation ruby.Bryce Johnson2016-10-151-1/+1
| | |
* | | Clean up layouts/devise.html.Bryce Johnson2016-10-151-2/+2
| | |
* | | Use Ruby 1.9 syntax in tab_single def and usage.Bryce Johnson2016-10-157-8/+7
| | |
* | | Fixup invalid refs.Bryce Johnson2016-10-152-2/+2
| | |
* | | Convert field error NodeList to an Array.Bryce Johnson2016-10-151-2/+2
| | |
* | | Use native dom in dispatcher field error init.Bryce Johnson2016-10-151-3/+4
| | |
* | | Improve method naming in gl_field_errors.Bryce Johnson2016-10-151-21/+22
| | |
* | | Stringify username before passing to ActiveRecord.Bryce Johnson2016-10-151-1/+1
| | |
* | | Add accessor for current val for convenience.Bryce Johnson2016-10-151-5/+9
| | |
* | | Safely scope siblings of validated input.Bryce Johnson2016-10-151-2/+15
| | |
* | | Remove superfluous comment.Bryce Johnson2016-10-151-1/+0
| | |
* | | Prevent unneccessary loading of UsernameValidator.Bryce Johnson2016-10-151-1/+0
| | |
* | | Fix syntax error -- missing comma in _new_crowd.Bryce Johnson2016-10-151-1/+1
| | |
* | | Fix nesting on sessions/new.Bryce Johnson2016-10-151-8/+7
| | |
* | | Unbreak all the tests relying on one login-box.Bryce Johnson2016-10-152-2/+2
| | |
* | | Properly implement focus on first invalid.Bryce Johnson2016-10-151-11/+6
| | |
* | | Fix omniauth box styling.Bryce Johnson2016-10-151-1/+1
| | |
* | | Add third box shadow to validation focus, for depth.Bryce Johnson2016-10-151-53/+37
| | |
* | | Add submit button contain with custom margin.Bryce Johnson2016-10-153-2/+6
| | |
* | | Make style fixes, make all submit buttons full-width btn-block.Bryce Johnson2016-10-152-2/+7
| | |
* | | Include correct validation error with username invalid.Bryce Johnson2016-10-151-2/+1
| | |
* | | Fix errors, get validation running for signup box and sign in.Bryce Johnson2016-10-153-28/+38
| | |
* | | Refactor gl field errors for simpler state management.Bryce Johnson2016-10-151-45/+89
| | |
* | | Clean up username_validator private vars and members.Bryce Johnson2016-10-151-44/+47
| | |
* | | Add padding to fixed footer, to more quickly support scrolling.Bryce Johnson2016-10-151-0/+4
| | |