summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix bug preventing mentioned issued from being closed when MR is merged ↵close-issues-by-mrDouwe Maan2015-10-182-0/+11
| | | | using fast-forward merge.
* Merge branch 'cross-reference-mr-on-issues' into 'master' Douwe Maan2015-10-1813-7/+88
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Show merge requests which close current issue Closes #2903 ### What does this MR do If an issue is to be closed by a merge request the current user has access to, this will be displayed when the user looks at the issue. ![Screenshot_from_2015-10-12_12-10-37](https://gitlab.com/zj/gitlab-ce/uploads/52e429704e73067b24b69801f13ad7bc/Screenshot_from_2015-10-12_12-10-37.png) /cc @DouweM See merge request !1569
| * Merge branch 'master' into cross-reference-mr-on-issueszj/gitlab-ce-cross-reference-mr-on-issuesZeger-Jan van de Weg2015-10-169-19/+127
| |\
| * | Only accept open issues and merge requestsZeger-Jan van de Weg2015-10-1610-19/+62
| | |
| * | Show merge requests which close current issueZeger-Jan van de Weg2015-10-169-2/+40
| | |
* | | Merge branch 'outdated-discussion-padding' into 'master' Dmitriy Zaporozhets2015-10-172-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix padding of outdated discussion item. Old: ![Screen_Shot_2015-10-16_at_09.29.17](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d715debebe54d27c2eed7c22843e886c/Screen_Shot_2015-10-16_at_09.29.17.png) New: ![Screen_Shot_2015-10-16_at_09.29.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7c0c033adade92cb16406c027cb4c010/Screen_Shot_2015-10-16_at_09.29.23.png) It still looks the same when the discussion is expanded. See merge request !1614
| * | | Fix padding of outdated discussion item.outdated-discussion-paddingDouwe Maan2015-10-162-1/+5
| |/ /
* | | Merge branch 'fix-issue-3067' into 'master' Dmitriy Zaporozhets2015-10-172-6/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix nonatomic database update potentially causing project star counts to go negative The `counter_cache` decrement function is called when a project star is deleted, but there was no guarantee multiple workers would not attempt to delete the same item simultaneously. Use an atomic update to prevent the count from going negative. Note: I was only able to duplicate the issue on GitLab.com, but I haven't been able to replicate it anywhere else. Presumably this bug happens when the `WHERE` clause takes some time to search for the right entry and multiple requests get sent simultaneously. Need to verify whether this fix truly solves the issue. Closes #3067 See merge request !1628
| * | | Fix nonatomic database update potentially causing project star counts to go ↵Stan Hu2015-10-172-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | negative The counter_cache decrement function is called when a project star is deleted, but there was no guarantee multiple workers would not attempt to delete the same item simultaneously. Use an atomic update to prevent the count from going negative. Closes #3067
* | | | Merge branch 'rs-redactor-filter' into 'master' Douwe Maan2015-10-1744-476/+810
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate rendering of Markdown reference links from redacting those the user doesn't have access to and extracting referenced objects Related: !1014 See merge request !1090
| * \ \ \ Merge branch 'master' into rs-redactor-filterrs-redactor-filterDouwe Maan2015-10-16113-852/+1544
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-15296-2085/+4176
| |\ \ \ \
| * | | | | Participable doesn't need to know about MentionableDouwe Maan2015-10-145-11/+16
| | | | | |
| * | | | | Fix specsDouwe Maan2015-10-141-5/+5
| | | | | |
| * | | | | Explicitly only parse references by specified filterDouwe Maan2015-10-142-2/+8
| | | | | |
| * | | | | Have Issue#participants load all users mentioned in notes using a single queryDouwe Maan2015-10-143-24/+28
| | | | | |
| * | | | | Code cleanupDouwe Maan2015-10-133-23/+17
| | | | | |
| * | | | | Allow ReferenceExtractor to efficiently load references from multiple texts ↵Douwe Maan2015-10-134-19/+36
| | | | | | | | | | | | | | | | | | | | | | | | at once
| * | | | | Efficiently load multiple references of one type.Douwe Maan2015-10-137-23/+33
| | | | | |
| * | | | | Pass project to RedactorFilterDouwe Maan2015-10-133-6/+11
| | | | | |
| * | | | | Raise error when a ReferenceFilter doesn't implement referenced_byDouwe Maan2015-10-081-1/+1
| | | | | |
| * | | | | Update inline docDouwe Maan2015-10-081-2/+2
| | | | | |
| * | | | | Update ReferenceFilter docsRobert Speicher2015-10-071-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Always allow references to the current projectDouwe Maan2015-10-077-8/+12
| | | | | |
| * | | | | Refactor reference gathering to use a dedicated filterDouwe Maan2015-10-0725-182/+414
| | | | | |
| * | | | | Return strings where expectedDouwe Maan2015-10-071-2/+2
| | | | | |
| * | | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-07947-3889/+24469
| |\ \ \ \ \
| * | | | | | Remove last remaining `reference_only_path` usagesRobert Speicher2015-09-033-3/+3
| | | | | | |
| * | | | | | Basic support for an Atom-specific rendering pipelineRobert Speicher2015-09-036-59/+70
| | | | | | |
| * | | | | | Return early from markdown and gfm when text is emptyRobert Speicher2015-09-033-4/+6
| | | | | | |
| * | | | | | Remove unnecessary current_user context from filter specsRobert Speicher2015-09-022-24/+11
| | | | | | |
| * | | | | | Add RedactorFilter specs for invalid Group and Project referencesRobert Speicher2015-09-011-0/+12
| | | | | | |
| * | | | | | Add post_process method to Gitlab::MarkdownRobert Speicher2015-09-013-3/+27
| | | | | | |
| * | | | | | Update MarkdownFeature support classRobert Speicher2015-09-011-19/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Memoize variables a bit more cleanly - Add user to project's team
| * | | | | | Fix GitlabMarkdownHelper specRobert Speicher2015-09-011-11/+14
| | | | | | |
| * | | | | | Remove `current_user` context from markdown and gfm helpersRobert Speicher2015-09-012-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These helpers are no longer dependent on the current user state. Hooray!
| * | | | | | Rescue from `RecordNotFound` in RedactorFilterRobert Speicher2015-09-011-0/+4
| | | | | | |
| * | | | | | Default `user_can_reference?` to true when no attributes matchRobert Speicher2015-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, a reference link with a `.gfm` class but without one of our `data-*-id` attributes should be shown to the user rather than hidden.
| * | | | | | Add RedactorFilterRobert Speicher2015-09-013-0/+143
| | | | | | |
| * | | | | | Remove all permission checking from Reference filtersRobert Speicher2015-09-0110-228/+105
| | | | | | |
* | | | | | | Merge branch 'redirect-ci-dash' into 'master' Dmitriy Zaporozhets2015-10-172-3/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary bring /ci page page with help information Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1630
| * | | | | | | Temporary bring /ci page page with help informationDmitriy Zaporozhets2015-10-172-3/+23
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'redirect-ci-page' into 'master' Dmitriy Zaporozhets2015-10-171-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirect old CI project route to GitLab project Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1629
| * | | | | | | Redirect old CI project route to GitLab projectDmitriy Zaporozhets2015-10-171-0/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'hide-builds-tab' into 'master' Dmitriy Zaporozhets2015-10-171-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide Builds tab is GitLab CI is not enabled Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1627
| * | | | | | Hide Builds tab is GitLab CI is not enabledhide-builds-tabDmitriy Zaporozhets2015-10-171-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'filter-label' into 'master' Robert Speicher2015-10-167-25/+55
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow dashboard and group issues/MRs to be filtered by label See merge request !1591
| * \ \ \ \ \ Merge branch 'master' into filter-labelfilter-labelDouwe Maan2015-10-14129-858/+1630
| |\ \ \ \ \ \
| * | | | | | | Allow dashboard and group issues/MRs to be filtered by labelDouwe Maan2015-10-146-20/+55
| | | | | | | |
* | | | | | | | Merge branch 'fix_svn_link' into 'master' Robert Speicher2015-10-161-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix import from SVN link See merge request !1617
View Lorry Controller Status