summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* We're not using them (and look at the typo)remove-unused-helperLin Jen-Shin2016-07-122-9/+0
|
* Merge branch 'expire-branch-cache-after-gc' into 'master' Jacob Vosmaer (GitLab)2016-07-122-2/+26
|\ | | | | | | | | | | | | | | | | | | | | | | Expire the branch cache after `git gc` runs Due to a stale NFS cache, it's possible that a branch lookup fails while `git gc` is running and causes missing branches in merge requests. I'm not totally convinced this is the right solution, but since we and our customers are experiencing this issue quite frequently, I'm taking a stab at it. Possible workaround for #15392 See merge request !5160
| * Expire the branch cache after `git gc` runsStan Hu2016-07-122-2/+26
| | | | | | | | | | | | | | Due to a stale NFS cache, it's possible that a branch lookup fails while `git gc` is running and causes missing branches in merge requests. Possible workaround for #15392
* | Be explicit on merge request discussion variablesPaco Guzman2016-07-121-0/+25
|/
* Merge branch 'fix-expandable-diffs' into 'master' Rémy Coutable2016-07-121-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix expandable diffs ## What does this MR do? Fix expandable diffs and the master build. ## Are there points in the code the reviewer needs to double check? Nope. ## Why was this MR needed? https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4776#note_13003494 Doesn't need a CHANGELOG entry etc. See merge request !5200
| * Fix expandable diffsSean McGivern2016-07-121-3/+3
| |
* | Merge branch 'remove-branch-api' into 'master' Rémy Coutable2016-07-121-0/+4
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | api: expose {should,force}_remove_source_branch ## What does this MR do? Exposes the `should_remove_source_branch` and `force_remove_source_branch` booleans via the API. ## Are there points in the code the reviewer needs to double check? I don't think so. ## Why was this MR needed? See the commit message. ## What are the relevant issue numbers? N/A ## 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 - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] 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) - [ ] 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 !5184
| * api: expose {should,force}_remove_source_branchBen Boeckel2016-07-111-0/+4
| | | | | | | | | | Workflows which use a bot to merge should remove branches if requested. Expose the flag so that bots can request know this.
* | Merge branch 'quick-start-ci-route' into 'master' Douwe Maan2016-07-123-22/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make "Get started with Builds" Help Page link work properly `help_page_path('ci/quick_start', 'README')` causes a link to `https://gitlab.com/help/ci%2Fquick_start/README` which in turn breaks every relative link on the page. This remedies the problem. That said, this is probably a horrible way of fixing this issue, *but* it does work. I can’t find much information on linking this deeply with Rails routes. If anyone has suggestions as to a better way of handling this, I'll gladly take them. I tried a few different things, but none of them really worked. Resolves #14872. cc: @axil @rspeicher @elstamey See merge request !3561
| * | Fix failing tests.Connor Shea2016-07-112-21/+14
| | |
| * | Update the help_page_path route to accept paths directly instead of using ↵Connor Shea2016-07-111-1/+1
| | | | | | | | | | | | parameters.
* | | Merge branch 'optimize-cross-ref-system-notes-check' into 'master' Douwe Maan2016-07-124-4/+64
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize cross ref system notes check ## What does this MR do? This MR optimizes system note visibility checking by memoizing the visible reference count, reducing the overhead of calling `Note#cross_reference_not_visible_for?`. ## Are there points in the code the reviewer needs to double check? Note that since a cross reference message contains, "Mentioned in XYZ", we EXPECT that there is at least one reference. That's why using the ref count > 0 works. ## Why was this MR needed? The previous implementation relied on `Note#cross_reference_not_visible_for?`, which essentially tries to render all the Markdown references in a system note and only displays the note if the user can see the referring project. But this duplicated the work that Banzai::NotesRenderer was doing already. This shaves about 0.8 s from the load time from https://gitlab.com/gitlab-com/operations/issues/42. ## What are the relevant issue numbers? #19273 ## 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 !5070
| * | | Optimize system note visibility checking by hiding notes thatStan Hu2016-07-114-4/+64
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | have been fully redacted and contain cross-project references. The previous implementation relied on Note#cross_reference_not_visible_for?, which essentially tries to render all the Markdown references in a system note and only displays the note if the user can see the referring project. But this duplicated the work that Banzai::NotesRenderer was doing already. Instead, for each note we render, we memoize the number of visible user references and use it later if it is available. Improves #19273
* | | Merge branch 'master' into faster-diffsfaster-diffsJacob Schatz2016-07-1132-364/+1717
|\ \ \
| * \ \ Merge branch 'remove-pinto-from-flash' into 'master' Jacob Schatz2016-07-111-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove pinTo from Flash ## What does this MR do? - replace `pinTo` of `Flash` by `parent` parameter in constructor - move positioning of layout containers from CoffeeScript to layout files - adjust styling of inline flash messages ## Are there points in the code the reviewer needs to double check? - display of flash messages in general ## Why was this MR needed? - allow finding and positioning flash message containers within layout files - allow adding different CSS classes to flash containers within layout files (necessary for fixing #18908) - allow multiple flash messages to be displayed at different places at the same time - make inline flash messages look nicer ## What are the relevant issue numbers? closes #18908, closes part of #18897 ## Screenshots ### Inline flash message (before) ![before](/uploads/c5b3cc05140eaeb9d14e481fa506ebbf/before.png) ![before-mobile](/uploads/004b1f2b9510bd97f4f8a7a6e56f17ef/before-mobile.png) ### Inline flash message (after) ![inline-flash-message](/uploads/fe2a23b63623612b696d529e81fa459e/inline-flash-message.png) ![inline-flash-mobile](/uploads/6207604acfebcf7402d77d5638c89ca8/inline-flash-mobile.png) ### Other flash messages (after) ![flash-message-issue](/uploads/d7e12bd0da68cfa333471ed102428cec/flash-message-issue.png) --- ![flash-new-project](/uploads/3465967dba83296068f154f149d26f64/flash-new-project.png) --- ![flash-sign-in](/uploads/4a5b317d5a369034f43343031607a0c2/flash-sign-in.png) --- ![flash-file-comment](/uploads/488a1119374be7e2173c0a590cfd8821/flash-file-comment.png) --- ![flash-fork](/uploads/f41964e8b910801e03eef3d7649e5009/flash-fork.png) --- ![flash-update-profile](/uploads/9fd972d6c6609fbbf86afcd99d343b5f/flash-update-profile.png) --- ### This is possible now ![flashs-everywhere](/uploads/07f425534511fb4ecaa1d7e2a9870787/flashs-everywhere.png) See merge request !4854
| | * | Remove `pinTo` from `Flash` and make inline flash messages look nicer (!4854)winniehell2016-06-301-1/+1
| | | |
| * | | Merge branch 'fix/import-event-error' into 'master' Robert Speicher2016-07-112-2/+29
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix problems with events under notes importing GitLab projects Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19588 See merge request !5154
| | * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-07-11176-509/+5699
| | |\ \ \ | | | | |/ | | | |/| | | | | | fix/import-event-error
| | * | | squashed - refactor to cope with sub sub N relations probably using the ↵James Lopez2016-07-112-2/+29
| | | | | | | | | | | | | | | | | | | | sub_relations method recursively.
| * | | | Merge branch 'fix-sent-notification-position' into 'master' Rémy Coutable2016-07-111-0/+24
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow SentNotification#position to be set as string or hash Fixes https://sentry.gitlap.com/gitlab/staginggitlabcom/issues/8491/ See merge request !5189
| | * | | | Allow SentNotification#position to be set as string or hashDouwe Maan2016-07-111-0/+24
| | | | | |
| * | | | | Fix feature specs on CIsingle-file-diffsSean McGivern2016-07-112-22/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL's text column isn't big enough for the diffs in the expand-collapse-diffs branch.
| * | | | | Merge branch 'master' into single-file-diffsSean McGivern2016-07-119-5/+436
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch 'fix-type-in-project-factory' into 'master' Rémy Coutable2016-07-111-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in factory for projects.rb ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? ## 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5100
| | | * | | | Fix typo in factory for projects.rbYatish Mehta2016-07-051-1/+1
| | | | | | |
| | * | | | | Merge branch 'fix/remove-import-url-migration' into 'master' Rémy Coutable2016-07-111-0/+6
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove slow migration and add fix to sanitize errors Getting rid of the slow migration and preventing the Error to occur Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19608 See merge request !5176
| | | * | | | | spec and fix for sanitize methodJames Lopez2016-07-111-0/+6
| | | | | | | |
| | * | | | | | Merge branch 'blockquote-fence-filter' into 'master' Robert Speicher2016-07-103-0/+260
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add blockquote fence syntax to Markdown Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/16564 Before Markdown rendering happens, this will transform this: ``` Let me quote this here email: >>> Dear friend, How are you? Greetings, Me >>> ``` Into this, saving me from having to prefix all of those lines with `>` manually when I copy some multiline text from another medium: ``` Let me quote this here email: > Dear friend, > > How are you? > > Greetings, > > Me ``` See merge request !3954
| | | * | | | | | Fix typo in specDouwe Maan2016-07-101-1/+1
| | | | | | | | |
| | | * | | | | | Add more comments to regexDouwe Maan2016-07-102-2/+2
| | | | | | | | |
| | | * | | | | | Add blockquote fence syntax to MarkdownDouwe Maan2016-07-093-0/+260
| | | | |_|/ / / | | | |/| | | |
| | * | | | | | Re-use queries in reference parsersreuse-queries-in-reference-parsersYorick Peterse2016-07-081-0/+75
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caches various queries to ensure that multiple reference extraction runs re-use any objects queried in previous runs.
| | * | | | | Merge branch '1548-average-commits-per-day' into 'master' Rémy Coutable2016-07-081-0/+39
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: Infinity Bug in Commit Statistics ## What does this MR do? It fixes a logic bug in the commits statistics: The code assumed that the amount of days involved in a commit range is equal to the difference between the first and last date. This is not true, though, as (from a human standpoint), a commit yesterday and a commit today involve two days, not one. Similarly, a fresh project with only commits made today already 'used' one day. Since the number of involved days used to be zero for new projects, the result for commits per day quite often amounted to `Infinity`… ## Are there points in the code the reviewer needs to double check? The test file. I hope it is up to the standards of GitLab. ## Why was this MR needed? The bug occurres especially for new users with their first project while exploring GitLab. ## What are the relevant issue numbers? This bug was reported as #1548. ## Screenshots (if relevant) See merge request !4231
| | | * | | | | Infinity Bug in Commit StatisticsJonas Weber2016-05-201-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #1548
| | * | | | | | Merge branch 'api-shared-projects' into 'master' Rémy Coutable2016-07-082-4/+55
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Api shared projects ## What does this MR do? Exposes the shared projects in the group endpoint ## What are the relevant issue numbers? Builds upon !5148 and closes #18780 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] 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 !5150
| | | * | | | | API: Expose shared projects in a groupapi-shared-projectsRobert Schilling2016-07-081-2/+17
| | | | | | | |
| | | * | | | | Expose shared groups for projectsapi-shared-groupsRobert Schilling2016-07-081-2/+38
| | | | | | | |
| * | | | | | | Support renames in diff_for_path actionsSean McGivern2016-07-116-42/+75
| | | | | | | |
| * | | | | | | Tidy up spec action namesSean McGivern2016-07-083-14/+14
| | | | | | | |
| * | | | | | | Allow expanding all diffs at onceSean McGivern2016-07-081-0/+38
| | | | | | | |
| * | | | | | | Ensure only renderable text diffs are collapsedSean McGivern2016-07-083-1/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Other diffs (those that are too large to render anyway, image diffs, diffs suppressed by .gitattributes) should be rendered immediately.
| * | | | | | | Disable overflow messagesSean McGivern2016-07-081-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the option to expand and collapse individual diffs, these aren't needed any more.
| * | | | | | | Collapse large diffs by defaultSean McGivern2016-07-086-319/+595
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | When rendering a list of diff files, skip those where the diff is over 10 KB and provide an endpoint to render individually instead.
| * | | | | | Merge branch 'feature/option-set-new-users-external' into 'master' Rémy Coutable2016-07-081-0/+21
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added setting to set new users by default as external ## What does this MR do? This implements the feature request #14508. It adds an option in the application settings to set new users by default as external. ## Are there points in the code the reviewer needs to double check? Everything. Like I mentioned in the discussion of the issue my knowledge of Ruby basically doesn't exists. I tested it on my machine and it seems to work, but as I am very unexperienced in Ruby I highly recommend to take a close look at the code. ## Why was this MR needed? It was requested by @DouweM to work on the issue with the proposed changes by me. ## What are the relevant issue numbers? This MR is for the issue #14508 that followed up after the implementation of #4009. See merge request !4545
| | * | | | | | Added setting to set new users by default as externalDravere2016-07-071-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As requested by the issue #14508 this adds an option in the application settings to set newly registered users by default as external. The default setting is set to false to stay backward compatible.
| * | | | | | | Merge branch '9127-link-report-to-profile' into 'master' Robert Speicher2016-07-081-0/+30
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to the user's profile in the abuse reports Link to the user's profile in the abuse reports and add a link to the admin area view if the user viewing the profile is an admin Fixes #9127 See merge request !5118
| | * | | | | | | Removed unnecessary `id` from links and corrected tests to use the proper ↵9127-link-report-to-profilePatricio Cano2016-07-071-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matcher.
| | * | | | | | | Added specs to check for the correct links.Patricio Cano2016-07-061-0/+31
| | | | | | | | |
| * | | | | | | | Revert "Revert "Merge branch 'issue_3946' into 'master' ""Robert Speicher2016-07-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bf2a86b73cce332ff8f4392ffc8df501193f32ec.
| * | | | | | | | Merge remote-tracking branch 'origin/master'Robert Speicher2016-07-075-3/+342
| |\ \ \ \ \ \ \ \