summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Ensure only IDs ending in .git perform git actionsfix-git-http-routingSean McGivern2016-06-092-18/+71
| | | | | | | It doesn't seem possible to set constraints based on format for project IDs ending in .git, so set the constraint on the ID and ensure the format is nil to avoid the case where the project ID is something like project.git.foo.
* Merge branch 'fix-award-emoji-hidden' into 'master' Jacob Schatz2016-06-091-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shows award emoji for comments to all users who are logged in. ## What does this MR do? Fixes the award emoji picker not showing up for users who weren't able to edit another user's comment. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-08_at_5.18.04_PM](/uploads/a8b40ba319481f53d55de055d84649b9/Screen_Shot_2016-06-08_at_5.18.04_PM.png) After (logged in): ![Screen_Shot_2016-06-08_at_5.16.16_PM](/uploads/535edcca6fbdd8834beda39399f85384/Screen_Shot_2016-06-08_at_5.16.16_PM.png) After (logged out): ![Screen_Shot_2016-06-08_at_5.15.08_PM](/uploads/7f0dff751714c7d20f78b56893cacd59/Screen_Shot_2016-06-08_at_5.15.08_PM.png) cc: @fatihacet See merge request !4547
| * Shows award emoji for comments to all users who are logged in.Connor Shea2016-06-081-1/+2
| |
* | Merge branch 'mention-loading-indicator' into 'master' Jacob Schatz2016-06-081-5/+73
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Show loading indicator for autocomplete ![autocomplete](/uploads/397df34689aeb5f4cbca99aea209c8cf/autocomplete.gif) Closes #15435 See merge request !4182
| * | Show loading indicator for autocompletemention-loading-indicatorPhil Hughes2016-05-251-5/+73
| | | | | | | | | | | | Closes #15435
* | | Merge branch '17284-Edit-form-does-not-cancel-correctly' into 'master' Jacob Schatz2016-06-082-5/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #17284 Edit form does not cancel correctly ## What does this MR do? Replaces the markdown textarea with the currently saved note text when the note edit is cancelled. ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? Allows the user to revert back to the original note text, as expected, using cancel. ## What are the relevant issue numbers? Fixes #17284. ## Screenshots ![17284](/uploads/c3598de6f8e70d52275ef25907d92d42/17284.gif) See merge request !4175
| * | | Added a line to find the currently saved text and replace the markdown ↵Luke Bennett2016-06-072-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | textarea text when cancelling Updated CHANGELOG Corrected the changes to store the markdown in a hidden input when edit starts and retrieve the original from that input when edit is cancelled Replaced hidden input with form attribute
* | | | Merge branch 'nav-scroll-bug' into 'master' Jacob Schatz2016-06-081-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Side nav scrolls if content height taller than screen ## What does this MR do? Header logo is now fixed at top; put back scrolling functionality in side nav ## Screenshots (if relevant) <img src="/uploads/e1d1b60c296c39c61d7fe7da22b6c52d/scroll.gif" width="600px"> See merge request !4513
| * | | | Side nav scrolls if content height taller than screennav-scroll-bugAnnabel Dunstone2016-06-071-1/+8
| | | | |
* | | | | Merge branch 'git-http-no-authenticity-token' into 'master' Robert Speicher2016-06-081-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Disable CSRF protection when serving Git HTTP clients Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18331 See merge request !4538
| * | | | Skip authenticity token checks for Git HTTPJacob Vosmaer2016-06-081-0/+2
| | | | |
* | | | | Merge branch '17240-svg' into 'master' Jacob Schatz2016-06-0819-28/+230
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new icons in left sidebar and layout nav Closes #17609 Closes #17240 Closes #17321 ![Screen_Shot_2016-06-02_at_8.47.38_AM](/uploads/f254fe81cba65cbdeb8e5720f0b2fc19/Screen_Shot_2016-06-02_at_8.47.38_AM.png) ![Screen_Shot_2016-06-02_at_8.53.33_AM](/uploads/2c27284f0a4916fe447794d9b663c4df/Screen_Shot_2016-06-02_at_8.53.33_AM.png) @skyruler I couldn't find the icons for `Projects`, `Merge Requests`, `Snippets`, or `Help` in the design repo. Do you have them available somewhere? See merge request !4268
| * | | | | Fix activity SVG17240-svgAnnabel Dunstone2016-06-082-11/+7
| | | | | |
| * | | | | Fix merge conflicts from removing links from sidebarAnnabel Dunstone2016-06-082-22/+4
| | | | | |
| * | | | | Add new icons to group page layout navAnnabel Dunstone2016-06-089-23/+97
| | | | | |
| * | | | | Add SVG icons to side barAnnabel Dunstone2016-06-088-179/+60
| | | | | |
| * | | | | Start adding SVG iconsAnnabel Dunstone2016-06-0810-0/+269
| | | | | |
* | | | | | Merge branch '18333-layout-bug' into 'master' Jacob Schatz2016-06-083-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use container helper instead of hard coded container ## What does this MR do? Add `container_class` helper class to fix layout bug ## What are the relevant issue numbers? #18333 ## Screenshots (if relevant) Fixed: ![Screen_Shot_2016-06-08_at_2.03.38_PM](/uploads/6e7575d711efb8eaf6ba641907b2d607/Screen_Shot_2016-06-08_at_2.03.38_PM.png) Fluid: ![Screen_Shot_2016-06-08_at_2.03.56_PM](/uploads/33d3f73781ca9ed129f853abfe9feb4b/Screen_Shot_2016-06-08_at_2.03.56_PM.png) See merge request !4543
| * | | | | | Use container helper instead of hard coded containerAnnabel Dunstone2016-06-083-3/+3
| | | | | | |
* | | | | | | Merge branch 'dropdown-link-lineheight' into 'master' Jacob Schatz2016-06-081-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed dropdown link line-height ## What does this MR do? Fixes line-height issue on dropdown menu links ## Why was this MR needed? The line-height of some dropdown links were taking the parent, most noticeable the commit header ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-08_at_12.26.13](/uploads/51d6bbb4d727da0e3f27d715d6556d4f/Screen_Shot_2016-06-08_at_12.26.13.png) After: ![Screen_Shot_2016-06-08_at_12.25.03](/uploads/2dcbfaa67982500eef42cfe4247cd54d/Screen_Shot_2016-06-08_at_12.25.03.png) See merge request !4531
| * | | | | | | Fixed dropdown line-heightdropdown-link-lineheightPhil Hughes2016-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most noticable on the commit header
* | | | | | | | Merge branch 'dz-improve-ui-consistency' into 'master' Jacob Schatz2016-06-0819-39/+38
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve ui consistency * Decline idea of using gray buttons actively in UI * remove icons from some buttons that already has text * standardizes margin between buttons First step in https://gitlab.com/gitlab-org/gitlab-ce/issues/18324 See merge request !4533
| * | | | | | | | Remove unnecessary icons from buttonsdz-improve-ui-consistencyDmitriy Zaporozhets2016-06-089-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Cleanup and imrpove issue/mr buttonsDmitriy Zaporozhets2016-06-088-20/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Reject idea of using white/gray button depends on bg colorDmitriy Zaporozhets2016-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Improve button color for issue and mr pagesDmitriy Zaporozhets2016-06-083-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * make sidebar button white * make header button gray if not primary Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Use hex value instead of rgba for gray border colorDmitriy Zaporozhets2016-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Merge branch '14098-customize-after-sign-up-path' into 'master' Robert Speicher2016-06-0811-4/+39
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow custom text on 'almost there' page Add a new application setting, after_sign_up_text. This is text to be rendered as Markdown and shown on the 'almost there' page after a user signs up, but before they've confirmed their account. Closes #14098. See merge request !4098
| * | | | | | | | | Allow custom text on 'almost there' pageSean McGivern2016-06-0811-4/+39
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new application setting, after_sign_up_text. This is text to be rendered as Markdown and shown on the 'almost there' page after a user signs up, but before they've confirmed their account. Tweak the styles for that page so that centered lists look reasonable.
* | | | | | | | | Merge branch '13840-allow-clones-from-http-url-s-without-appending-git' into ↵Robert Speicher2016-06-082-0/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Allow clones from /namespace/project Allow `git clone https://host/namespace/project` to work, in addition to `git clone https://host/namespace/project.git` Closes #13840. See merge request !4530
| * | | | | | | | | Allow clones from /namespace/projectSean McGivern2016-06-082-0/+18
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirect /namespace/project/info/refs to /namespace/project.git/info/refs, so `git clone` works on either namespace/project.git or namespace/project.
* | | | | | | | | Merge branch 'password-min-length-placeholder' into 'master' Robert Speicher2016-06-082-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added minimum password length to password field Add a placeholder to the password field in the register form with the minimum number of characters required. Also added a pattern to the field to stop it submitting if less than that. Closes #17765 See merge request !4458
| * | | | | | | | | Added minimum password length to password fieldpassword-min-length-placeholderPhil Hughes2016-06-032-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #17765
* | | | | | | | | | Merge branch 'issue_14553' into 'master' Robert Speicher2016-06-084-1/+13
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set target="_blank" for external links Closes #14553 See merge request !4526
| * | | | | | | | | Update CHANGELOGAlfredo Sumaran2016-06-081-0/+1
| | | | | | | | | |
| * | | | | | | | | Combine tests for internal linksAlfredo Sumaran2016-06-081-4/+4
| | | | | | | | | |
| * | | | | | | | | Remove obvious comment and extra lineAlfredo Sumaran2016-06-081-2/+0
| | | | | | | | | |
| * | | | | | | | | Set target="_blank" for external linksAlfredo Sumaran2016-06-083-1/+14
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rubocop/disable-uniq-before-pluck-cop' into 'master' Robert Speicher2016-06-081-0/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable Rails/UniqBeforePluck rubocop cop Rails/UniqBeforePluck seems to have some bugs * https://github.com/bbatsov/rubocop/issues/3122 * https://github.com/bbatsov/rubocop/issues/3148 and we had some problems in EE with that https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/425#note_12245005 See merge request !4477
| * | | | | | | | | Disable Rails/UniqBeforePluck rubocop coprubocop/disable-uniq-before-pluck-copGrzegorz Bizon2016-06-041-0/+3
| | | | | | | | | |
* | | | | | | | | | Fix version references in 8.8 to 8.9 update guideRobert Speicher2016-06-081-2/+2
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch 'admin-nav' into 'master' Jacob Schatz2016-06-082-27/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sidebar updates ## What does this MR do? Updates `nav/_admin.html.haml` and `nav/_explore.html.haml` to match new compact sidebar design ## Screenshots (if relevant) ![Screen_Shot_2016-06-07_at_2.19.18_PM](/uploads/5699987001de901a67d503b097d1b19d/Screen_Shot_2016-06-07_at_2.19.18_PM.png) See merge request !4517
| * | | | | | | | | Update explore sidebaradmin-navAnnabel Dunstone2016-06-071-4/+4
| | | | | | | | | |
| * | | | | | | | | Update admin sidebarAnnabel Dunstone2016-06-071-23/+19
| | | | | | | | | |
* | | | | | | | | | Merge branch 'knapsack-update-results-only-on-master' into 'master' Kamil Trzciński2016-06-081-0/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Knapsack report only on master ## What does this MR do? Makes to generate Knapsack report only on master. This speed-ups tests, because the last stage can be run significant time after previous stages. See merge request !4540
| * | | | | | | | | | Update Knapsack report only on masterKamil Trzcinski2016-06-082-1/+5
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '17960-issues-api-endpoint-performs-poorly' into 'master' Yorick Peterse2016-06-087-8/+53
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize issuable APIs interaction with notes See merge request !4471
| * | | | | | | | | | | Update CHANGELOGAlejandro Rodríguez2016-06-081-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fix pseudo n+1 queries with Note and Note Authors in issuables APIsAlejandro Rodríguez2016-06-084-6/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was not a clear cut n+1 query, given that if you're directly subscribed to all issues that the API is returning you never really need to check for the notes. However, if you're subscribed to _all_ of them, then for each issuable you need to go once to `notes`, and once to `users` (for the authors). By preemtively loading notes and authors, at worst you have 1 extra query, and at best you saved 2n extra queries. We also took advantage of this preloading of notes when counting user notes.
| * | | | | | | | | | | Remove `projects` inclusion in `notes_with_associations` to skip some ↵Alejandro Rodríguez2016-06-083-3/+3
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unnecessary queries `notes_with_associations` are used for `participant` declarations, but `Participable` only really cares about the target entity project, and not the participants projects. `notes_with_associations` are also used in `Commit::has_been_reverted?` which employs the reference extractor of the commit, so no references to the notes projects are made there (`Mentionable::all_references` cares only about the `author` and other `attr_mentionable`). A paralel situation occurs on `Issue::referenced_merge_requests`.