summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added performance guidelines for new MRsmr-performance-guidesYorick Peterse2016-08-223-0/+175
| | | | | | | These guidelines cover the performance requirement for newly submitted merge requests. These guidelines are put in to place to prevent merge requests from negatively impacting GitLab performance as much as possible.
* Merge branch 'fix-branch-title-trailing-space' into 'master' Jacob Schatz2016-08-192-2/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix branch title trailing space on hover ## What does this MR do? Removes the unnecessary encapsulation of the `<span>` inside of the `<a>` which was creating the trailing space on hover. ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Makes the UI look more polished ## What are the relevant issue numbers? Closes #20676 ## Screenshots (if relevant) Before (When hovering on branch title): ![Screen_Shot_2016-08-05_at_2.54.43_PM](/uploads/1c90ae1ed69268a2fdcdafdede267028/Screen_Shot_2016-08-05_at_2.54.43_PM.png) After (When hovering on branch title): ![Screen_Shot_2016-08-05_at_2.54.19_PM](/uploads/6eab261a343e7acb6223ed205443b644/Screen_Shot_2016-08-05_at_2.54.19_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [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) See merge request !5688
| * Fix branch title trailing space on hoverClement Ho2016-08-162-2/+3
| |
* | Merge branch 'fix-alignment-build-status-icon' into 'master' Jacob Schatz2016-08-193-1/+23
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spacing and vertical alignment on build status icon on commits page ## What does this MR do? Fixes the hover state of the build status text and adds extra margin and vertically aligns the build status icon ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Improves existing UI ## What are the relevant issue numbers? Closes #20642 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-09_at_12.07.50_PM](/uploads/5265c00077eeef8fc42e08e89555bfb7/Screen_Shot_2016-08-09_at_12.07.50_PM.png) ![Screen_Shot_2016-08-09_at_12.07.59_PM](/uploads/dc5cf7e09785ac394b264a47c594cf98/Screen_Shot_2016-08-09_at_12.07.59_PM.png) After: ![Screen_Shot_2016-08-09_at_12.05.45_PM](/uploads/c0ce182c6342a7db767d1932372991d0/Screen_Shot_2016-08-09_at_12.05.45_PM.png) ![Screen_Shot_2016-08-09_at_12.05.37_PM](/uploads/e337ff23462552f75760f80087a2b1ef/Screen_Shot_2016-08-09_at_12.05.37_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [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) See merge request !5739
| * | Fix spacing and vertical alignment on build status icon on commits pageClement Ho2016-08-103-1/+23
| | |
* | | Merge branch 'fix-gfm-commit-font' into 'master' Jacob Schatz2016-08-192-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix commit mention font inconsistency ## What does this MR do? Removes the mono font styling for the auto linked commit hashes. ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Resolve existing UI inconsistency ## What are the relevant issue numbers? Closes #20936 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-15_at_1.48.13_PM](/uploads/9f8728e91442b087f723e73edfe8893e/Screen_Shot_2016-08-15_at_1.48.13_PM.png) After: ![Screen_Shot_2016-08-15_at_1.48.26_PM](/uploads/d48d877337f9f3673cdffd434ff368cb/Screen_Shot_2016-08-15_at_1.48.26_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [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) See merge request !5817
| * | | Fix commit mention font inconsistencyClement Ho2016-08-152-1/+2
| | | |
* | | | Merge branch 'fix-badge-alignment' into 'master' Jacob Schatz2016-08-192-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix badge count alignment ## What does this MR do? Changes the badge count vertical alignment to match the baseline of the adjacent text ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Improves UI ## What are the relevant issue numbers? Closes #21007 ## Screenshots (if relevant) ![dSvi6YMmda](/uploads/693285e54cc0ab7093d91c3485a4f636/dSvi6YMmda.gif) ![rCGA65SNg4](/uploads/d8b42a0dbd680b10b4a48affdeb5e799/rCGA65SNg4.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [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) See merge request !5853
| * | | | Fix badge count alignmentClement Ho2016-08-172-0/+2
| | | | |
* | | | | Merge branch 'fix-button-missing-type' into 'master' Jacob Schatz2016-08-193-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix button missing type ## What does this MR do? Adds the `type` attribute to `<button>` ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? So that bootlint would stop giving warnings on the issue thread page and the merge request thread page ## What are the relevant issue numbers? #20715 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [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) See merge request !5718
| * | | | | Fix button missing typeClement Ho2016-08-083-2/+3
| | |_|/ / | |/| | |
* | | | | Merge branch 'scroll-code-blocks' into 'master' Jacob Schatz2016-08-193-8/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap single lines of code; horizontally scroll multi-line code blocks ## What does this MR do? Original problem: code blocks were wrapping in issue body * Multi-line code blocks (```) should scroll horizontally * Single lines of code (`) should wrap ## Why was this MR needed? Inconsistent scrolling vs wrapping behavior ## What are the relevant issue numbers? Closes #19619 ## Screenshots (if relevant) ![Screen_Shot_2016-08-04_at_2.32.30_PM](/uploads/a4abcc81b57ffaa8dc8ce2b70a24bc21/Screen_Shot_2016-08-04_at_2.32.30_PM.png) See merge request !5675
| * | | | | Remove unneeded codescroll-code-blocksAnnabel Dunstone2016-08-121-15/+0
| | | | | |
| * | | | | Wrap single lines of code; horizontally scroll multi-line code blocksAnnabel Dunstone2016-08-123-1/+18
| | | | | |
* | | | | | Merge branch '21039-member-invite-declined-email-wrong-arguments' into 'master' Rubén Dávila Santos2016-08-193-2/+41
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix notification_service argument error of declined invitation emails ## What does this MR do? Remove unused arguments that raised the argument error after a refactor, more details in the commit message. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? Closes #21039 ## Screenshots (if relevant) ## 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 - [x] Added for this feature/bug - [x] All builds are passing - [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) See merge request !5893
| * | | | | | Fix notification_service argument error of declined invitation emailsPaco Guzman2016-08-193-2/+41
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing unused access_level parameter. Bug introduced here -> 6d103a2f4764441b1650ba6d790732056c9a8516 access_level parameter wasn’t needed since -> 88c2639356e6e4b4b05d96584768e07a9ce4b048
* | | | | | Merge branch 'labels-grammar' into 'master' Achilleas Pipinellis2016-08-191-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix same tiny grammar mistake as in ee This is a tiny grammar fix that was already merged into EE https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/667#note_14043471 See merge request !5865
| * | | | | | fix same mistake as in eeDe Wet Blomerus2016-08-181-2/+2
| | | | | | |
* | | | | | | Merge branch 'diff-line-comment-vuejs' into 'master' Douwe Maan2016-08-1976-137/+3629
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff line comments resolve ## What does this MR do? Diff line comments can be resolved. Part of #10325 To do: - [x] Backend (@DouweM) - [x] Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13319326. Will be made easier by https://gitlab.com/gitlab-org/gitlab-ce/issues/17237#note_13370331 - [x] System note when all discussions are resolved - [x] Notification when all discussions are resolved - [x] Write unit tests - [x] Look at resolve time https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13912743 - Fixed by 4a13aa9 - [x] Frontend (@iamphill) - [x] Fix bugs - [x] Write more feature tests - [x] Frontend (@connorshea) - [x] Address frontend feedback - [x] Feature specs for Jump feature - [x] Documentation - [x] Add Vue.js in a standard way See merge request !5022
| * | | | | | | Fix expansion of discussions in diffdiff-line-comment-vuejsDouwe Maan2016-08-183-5/+3
| | | | | | | |
| * | | | | | | Improve performance of MR show pageDouwe Maan2016-08-189-22/+33
| | | | | | | |
| * | | | | | | Fix jumping between discussions on changes tabDouwe Maan2016-08-181-0/+1
| | | | | | | |
| * | | | | | | Fix MR note discussion IDDouwe Maan2016-08-181-1/+3
| | | | | | | |
| * | | | | | | Remove right margin on Jump button iconDouwe Maan2016-08-181-2/+6
| | | | | | | |
| * | | | | | | Fix bug causing “Jump to discussion” button not to showDouwe Maan2016-08-182-11/+7
| | | | | | | |
| * | | | | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-1856-139/+1379
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * \ \ \ \ \ \ \ Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-1852-176/+844
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix class method definitionDouwe Maan2016-08-171-1/+1
| | | | | | | | | |
| * | | | | | | | | Add changelog entryDouwe Maan2016-08-171-0/+1
| | | | | | | | | |
| * | | | | | | | | Function should return a boolean.Connor Shea2016-08-171-1/+1
| | | | | | | | | |
| * | | | | | | | | Forgot another one.Connor Shea2016-08-171-0/+2
| | | | | | | | | |
| * | | | | | | | | Fix a lingering conflict.Connor Shea2016-08-171-5/+1
| | | | | | | | | |
| * | | | | | | | | Fix more incomplete if/else statements.Connor Shea2016-08-172-0/+8
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-17153-179/+8177
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Store discussion_id on Note for faster discussion lookup.Douwe Maan2016-08-1713-47/+191
| | | | | | | | | | |
| * | | | | | | | | | Remove non-standard VueJS files from vendor.Connor Shea2016-08-173-11391/+2
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-1718-124/+11801
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add return statements for if statements that were missing them.Connor Shea2016-08-171-0/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-16241-917/+4136
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add documentation for discussion resolution.Connor Shea2016-08-166-8/+40
| | | | | | | | | | | | |
| * | | | | | | | | | | | Init commit on documentation for resolving inline comments in MRsAchilleas Pipinellis2016-08-171-0/+8
| | | | | | | | | | | | |
| * | | | | | | | | | | | Remove accidental addition of table and index.Connor Shea2016-08-161-10/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add comment for v-cloak selector. [ci skip]Connor Shea2016-08-161-1/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix Resolve All button.Connor Shea2016-08-161-5/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Improve CSS for line comment resolution button.Connor Shea2016-08-161-5/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add test for jumping between discussions and unhiding toggled discussions.Connor Shea2016-08-161-0/+18
| | | | | | | | | | | | |
| * | | | | | | | | | | | Address review feedbackDouwe Maan2016-08-169-86/+116
| | | | | | | | | | | | |
| * | | | | | | | | | | | Resolve feedback.Connor Shea2016-08-153-9/+16
| | | | | | | | | | | | |
| * | | | | | | | | | | | Single quotes for consistency, cache 'this' selector.Connor Shea2016-08-151-3/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-12606-6514/+9877
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |