summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use sha1 of discussion ID.Douwe Maan2016-07-254-7/+7
|
* Fix reply button on commit discussionsDouwe Maan2016-07-251-1/+3
|
* Tweak wordingDouwe Maan2016-07-253-3/+3
|
* Add resolved and last updated status to collapsed discussionsDouwe Maan2016-07-252-8/+32
|
* Hide resolve button when not allowedDouwe Maan2016-07-252-23/+48
|
* Collapse/hide resolved discussionsDouwe Maan2016-07-252-3/+17
|
* Add endpoints to resolve diff notes and discussionsDouwe Maan2016-07-255-12/+71
|
* Add access checks for diff note and discussion resolutionDouwe Maan2016-07-252-1/+15
|
* Add methods to resolve diff notes and discussionsDouwe Maan2016-07-252-0/+30
|
* Add resolved methods on DiscussionDouwe Maan2016-07-251-1/+19
|
* Add resolved_at and resolved_by_id to DiffNoteDouwe Maan2016-07-254-1/+38
|
* Fix conflict in Gemfile.lockDouwe Maan2016-07-241-8/+0
|
* Fix discussion partialsDouwe Maan2016-07-244-10/+10
|
* Fixed loading icon not working on resovle all buttonsPhil Hughes2016-07-243-6/+10
|
* Added comment & resolve button to reply formPhil Hughes2016-07-247-11/+42
|
* Seperated resolve all button from reply buttonPhil Hughes2016-07-244-20/+25
|
* Added resolve button to discussionsPhil Hughes2016-07-2415-65/+129
| | | | Top count displays how many resolved discussions
* Use VueJS resourcePhil Hughes2016-07-247-28/+48
|
* Assigns to variable rather than using VueJS methodPhil Hughes2016-07-243-7/+6
|
* Spacing above resolve all boxPhil Hughes2016-07-241-0/+1
|
* Resolve all endpointPhil Hughes2016-07-246-15/+19
|
* Moved away from vuejs-railsPhil Hughes2016-07-246-12/+23
| | | | Fixed issue with resolve buttons always being visible - even when not logged in
* Posts to rails to update note eventuallyPhil Hughes2016-07-2410-14/+69
|
* Fixed tabsPhil Hughes2016-07-242-5/+2
|
* Fixed issue when adding or deleting through jQueryPhil Hughes2016-07-244-3/+14
|
* VueJS updatesPhil Hughes2016-07-245-10/+13
|
* Resolve all comments buttonPhil Hughes2016-07-248-22/+71
| | | | Store that manages the state of each button
* Diff line comments resolvePhil Hughes2016-07-248-0/+83
|
* Merge branch 'gfm-markdown-docs' into 'master' Achilleas Pipinellis2016-07-241-14/+51
|\ | | | | | | | | | | | | | | | | | | | | Add links to the real markdown.md file for all GFM examples ## What does this MR do? Add links to the real markdown.md file for all GFM examples since they will not render correctly on docs.gitlab.com. We already have a note https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5440, but better be explicit. See merge request !5458
| * Add links to the real markdown.md file for all GFM examplesAchilleas Pipinellis2016-07-241-14/+51
| |
* | Merge branch 'nullify-note-type' into 'master' Stan Hu2016-07-233-5/+21
|\ \ | | | | | | | | | | | | | | | | | | Fix bug where replies to commit notes displayed in the MR discussion tab wouldn'… Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20157 See merge request !5446
| * | Fix bug where replies to commit notes displayed in the MR discussion tab ↵Douwe Maan2016-07-233-5/+21
| |/ | | | | | | wouldn't show up on the commit page
* | Merge branch 'add-gitlab-workhorse-version-to-admin-dashboard' into 'master' Douwe Maan2016-07-234-0/+31
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add gitlab-workhorse version to admin dashboard ## What does this MR do? Add gitlab-workhorse version to admin dashboard. ## What are the relevant issue numbers? Closes #15418 ## Screenshot ![Zrzut_ekranu_2016-07-20_o_23.20.55](/uploads/ba6761e2145d903ac87bc7198bc8b182/Zrzut_ekranu_2016-07-20_o_23.20.55.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Add test - show Gitlab Workhorse version on Admin Dashboard - [x] All builds are passing - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) cc @ubudzisz @yorickpeterse @grzesiek [@chastell](https://github.com/chastell) [@tomash](https://github.com/tomash) See merge request !5321
| * | If version file is unavailable unknown statusKatarzyna Kobierska2016-07-232-4/+3
| | |
| * | Add gitlab-workhorse version to admin dashboardKatarzyna Kobierska2016-07-234-0/+32
| |/ | | | | | | | | | | Test for showing GitLab Workhorse version on Admin Dashboard Refactoring
* | Merge branch 'improve-rename-logging' into 'master' Robert Speicher2016-07-231-1/+10
|\ \ | | | | | | | | | | | | | | | | | | Improve project rename log messages for better debugging This should help diagnose issues such as #20178. See merge request !5450
| * | Improve project rename log messages for better debuggingimprove-rename-loggingStan Hu2016-07-231-1/+10
| |/ | | | | | | Helping to diagnose #20178
* | Merge branch 'dz-avatar-border' into 'master' Dmitriy Zaporozhets2016-07-234-15/+13
|\ \ | |/ |/| | | | | | | | | | | | | | | | | Add light border to rounded avatars Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20128 To make it clear that avatar is cropped by border radius cc @hazelyang See merge request !5429
| * Add light border to rounded avatarsdz-avatar-borderDmitriy Zaporozhets2016-07-224-15/+13
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'gfm-doc-site' into 'master' Douwe Maan2016-07-221-0/+5
|\ \ | | | | | | | | | | | | | | | | | | Add note to say GFM doesn't work on documentation website See merge request !5440
| * | Add note to say GFM doesn't work on documentation websiteDouwe Maan2016-07-221-0/+5
|/ /
* | Merge branch 'preserve_repo_ref_param' into 'master' Robert Speicher2016-07-221-1/+2
|\ \ | | | | | | | | | | | | | | | | | | Fix missing repo_ref param Closes #19444 See merge request !5435
| * | fix missing repo_ref parambarthc2016-07-221-1/+2
| |/
* | Merge branch 'fix/load-project-invited-groups-and-members-eagerly' into ↵Douwe Maan2016-07-222-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Load project invited groups and members eagerly in ProjectTeam#fetch_members ## What does this MR do? Load project invited groups and members eagerly in `ProjectTeam#fetch_members`, reducing number of queries to DB. ## Are there points in the code the reviewer needs to double check? N/A ## Why was this MR needed? `ProjectTeam#fetch_members` is part of the code path of `Participable#raw_participants`, so it should improve its performance a bit. ## What are the relevant issue numbers? #19985 ## Screenshots (if relevant) N/A ## 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 [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 !5436
| * | Load project invited groups and members eagerly in ProjectTeam#fetch_membersfix/load-project-invited-groups-and-members-eagerlyAhmad Sherif2016-07-222-1/+2
| |/
* | Merge branch 'handle-invalid-kept-around-references' into 'master' Douwe Maan2016-07-222-2/+31
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gracefully handle case when keep-around references are corrupted or exist already We were seeing a number of error messages when attempting to create a keep-around ref: 1. Failed to create locked file `refs/keep-around/XYZ`: File exists 2. Failed to write reference `refs/keep-around/XYZ`: a reference with that name already exists. I'm not sure how these happen, but I suspect when multiple workers attempt to write the same file we may have an issue. The force parameter should help ensure the file gets created, as well as the rescues to prevent 500 Errors. Rugged/libgit2 unfortunately does not allow you to delete or re-create a reference that has been corrupted, even with the force parameter. A truncated reference will stay that way until manual intervention. Closes #20109 See merge request !5430
| * | Gracefully handle case when keep-around references are corrupted or exist ↵handle-invalid-kept-around-referencesStan Hu2016-07-222-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | already We were seeing a number of error messages when attempting to create a keep-around ref: 1. Failed to create locked file `refs/keep-around/XYZ`: File exists 2. Failed to write reference `refs/keep-around/XYZ`: a reference with that name already exists. I'm not sure how these happen, but I suspect when multiple workers attempt to write the same file we may have an issue. The force parameter should help ensure the file gets created, as well as the rescues to prevent 500 Errors. Rugged/libgit2 unfortunately do not allow you to delete or re-create a reference that has been corrupted, even with the force parameter. Closes #20109
* | | Merge branch 'add_more_info_for_repository_storage' into 'master' Achilleas Pipinellis2016-07-221-17/+35
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | Add detailed info on storage path mountpoints Users that run GitLab from source should be extra careful when using the multiple repository storage feature. Make sure there is a detailed explanation why this happens and how to overcome it. See merge request !5437
| * | Add detailed info on storage path mountpointsAchilleas Pipinellis2016-07-221-17/+35
| | | | | | | | | | | | [ci skip]
* | | Merge branch '20121-make-spec-mailers-notify_spec-rb-more-robust' into 'master' Rémy Coutable2016-07-221-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Make Notify specs more robust by setting up assignee names Closes #20121. See merge request !5427
View Lorry Controller Status