summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Add nested groups support on data leveldz-nested-groupsDmitriy Zaporozhets2016-12-082-0/+8
| | | | | | | | * add parent_id field to namespaces table to store relation with nested groups * create routes table to keep information about full path of every group and project * project/group lookup by full path from routes table Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'zj-guest-reads-public-builds' into 'master' Sean McGivern2016-12-061-1/+1
|\ | | | | | | | | Guests can read builds if those are public See merge request !6842
| * Update effected testszj-guest-reads-public-buildsZ.J. van de Weg2016-12-041-1/+1
| |
* | Merge branch 'refine-ci-statuses' into 'master' Kamil Trzciński2016-12-0611-0/+299
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refine CI Statuses ## What does this MR do? This MR introduces classes for each relevant CI status. ## What are the relevant issue numbers? Closes #24273 See merge request !7889
| * | Add text example for pipeline status without actionrefine-ci-statusesGrzegorz Bizon2016-12-061-1/+3
| | |
| * | Extend tests for pipeline status factoryGrzegorz Bizon2016-12-051-3/+16
| | |
| * | Implement pipeline status factory with extended statusGrzegorz Bizon2016-12-051-0/+37
| | |
| * | Fold core/extended status modules to reduce nestingGrzegorz Bizon2016-12-0511-11/+11
| | |
| * | Implement extended pipeline - status with warningsGrzegorz Bizon2016-12-022-0/+77
| | |
| * | Add implementation of common pipeline extended statusGrzegorz Bizon2016-12-021-0/+23
| | |
| * | Add information about badge test to core statusesGrzegorz Bizon2016-12-027-0/+28
| | |
| * | Add scaffold for remaining statuses-related classesGrzegorz Bizon2016-12-024-0/+0
| | |
| * | Implement the rest of core CI statuses with specsGrzegorz Bizon2016-12-027-1/+107
| | |
| * | Add abstract base class for core CI statusGrzegorz Bizon2016-12-021-0/+2
| | |
| * | Add initial implmentation for core success statusGrzegorz Bizon2016-12-021-0/+11
| | |
* | | Merge branch 'glm-shorthand-reference' into 'master' Sean McGivern2016-12-069-119/+750
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | GLM shorthand reference for projects from the same namespace Closes #21679 See merge request !7255
| * | | Add shorthand support to gitlab markdown referencesOswaldo Ferreira2016-12-029-119/+750
| | |/ | |/|
* | | Authorize users into imported GitLab projectfix/authorize-users-into-imported-gitlab-projectAhmad Sherif2016-12-051-2/+9
| | |
* | | Accept `issue new` as command to create an issueZ.J. van de Weg2016-12-051-0/+7
|/ / | | | | | | | | | | | | | | Now only `/trigger issue create` is a valid command, but our UI shows Issue new everywhere. The default now will be `/trigger issue new`. The help message is adjusted to reflect this. Fixes: gitlab-org/gitlab-ce#25025
* | Fixes ActionView::Template::Error: undefined method `text?` for nil:NilClass25251-actionview-template-error-undefined-method-text-for-nil-nilclassValery Sizov2016-12-021-0/+8
|/
* Merge branch 'process-commit-worker-improvements' into 'master' Douwe Maan2016-12-021-1/+1
|\ | | | | | | | | | | | | Pass commit data to ProcessCommitWorker This changes `ProcessCommitWorker` so that it takes a Hash containing commit data instead of a commit SHA. This means the worker doesn't have to access Git just to process a commit message (and other data it may use). This in turn should solve the problem of ending up with 15 000-something jobs in the `process_commit` queue that take forever to process. See merge request !7744
| * Pass commit data to ProcessCommitWorkerprocess-commit-worker-improvementsYorick Peterse2016-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | By passing commit data to this worker we remove the need for querying the Git repository for every job. This in turn reduces the time spent processing each job. The migration included migrates jobs from the old format to the new format. For this to work properly it requires downtime as otherwise workers may start producing errors until they're using a newer version of the worker code.
* | Merge branch '22781-user-generated-permalinks' into 'master' Fatih Acet2016-12-011-8/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "User-generated permalink IDs collide with GitLab interface" ## What does this MR do? Prevents ID values automatically generated by headers in [GitLab Flavored Markdown](https://github.com/gitlabhq/gitlabhq/blob/master/doc/user/markdown.md#header-ids-and-links) from colliding with IDs used elsewhere in the GitLab interface. This can cause confusion when, for instance, a selector looks for a merge request tab with `id="pipelines"` and there is a header with the same ID earlier in the DOM. How this works: * All header IDs generated with GitLab Flavored Markdown are namespaced with `id="user-content_foo"` * All anchor links which point to these IDs continue to use the non-namespaced hash `<a href="#foo">...</a>` * When a page is loaded or when the `hashchange` event is triggered, javascript will automatically search for `#user-content_foo` if `#foo` cannot be found, and scroll to that position instead. ## Before ![2016-11-21-13.00.28](/uploads/e3be2cd6a9142dfd6e64db5462a6aa76/2016-11-21-13.00.28.gif) ## After: ![2016-11-21-13.12.45](/uploads/f7ae3f3a30c91325eaa3665591b6a850/2016-11-21-13.12.45.gif) ![2016-11-21-13.03.00](/uploads/3a6a782c081ecaa05b8781548d794909/2016-11-21-13.03.00.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22781 See also prior attempts to address this issue: #3908, !2023, !2024 See merge request !7631
| * | remove underscore from user-content id namespace22781-user-generated-permalinksMike Greiling2016-11-301-3/+3
| | |
| * | update gitlab flavored markdown tests to reflect namespaced idsMike Greiling2016-11-301-8/+13
| |/
* | Fix branch validation for GitHub PR where repo/fork was renamed/deletedDouglas Barbosa Alexandre2016-12-011-3/+9
|/
* Improve Gitlab::GitAccessWiki spec with download access checksDouglas Barbosa Alexandre2016-11-301-0/+25
|
* Merge branch 'zj-issue-search-slash-command' into 'master' Kamil Trzciński2016-11-291-0/+46
|\ | | | | | | | | Add issue search slash command See merge request !7752
| * Add issue search slash commandzj-issue-search-slash-commandZ.J. van de Weg2016-11-251-0/+46
| | | | | | | | One of many requested in: gitlab-org/gitlab-ce#24768
* | Merge branch 'jej-use-issuable-finder-instead-of-access-check' into 'security' Douwe Maan2016-11-282-19/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace issue access checks with use of IssuableFinder Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867 ## Which fixes are in this MR? :warning: - Potentially untested :bomb: - No test coverage :traffic_light: - Test coverage of some sort exists (a test failed when error raised) :vertical_traffic_light: - Test coverage of return value (a test failed when nil used) :white_check_mark: - Permissions check tested ### Issue lookup with access check Using `visible_to_user` likely makes these security issues too. See [Code smells](#code-smells). - [x] :vertical_traffic_light: app/finders/notes_finder.rb:15 [`visible_to_user`] - [x] :traffic_light: app/views/layouts/nav/_project.html.haml:73 [`visible_to_user`] [`.count`] - [x] :white_check_mark: app/services/merge_requests/build_service.rb:84 [`issue.try(:confidential?)`] - [x] :white_check_mark: lib/api/issues.rb:112 [`visible_to_user`] - CHANGELOG: Prevented API returning issues set to 'Only team members' to everyone - [x] :white_check_mark: lib/api/helpers.rb:126 [`can?(current_user, :read_issue, issue)`] Maybe here too? - [x] :white_check_mark: lib/gitlab/search_results.rb:53 [`visible_to_user`] ### Previous discussions - [ ] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#b2ff264eddf9819d7693c14ae213d941494fe2b3_128_126 - [ ] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#7b6375270d22f880bdcb085e47b519b426a5c6c7_87_87 See merge request !2031
* | Merge branch 'timeout-merge-request-for-binary-file' into 'master' Yorick Peterse2016-11-251-0/+13
|\ \ | | | | | | | | | | | | Fix: Timeout creating and viewing merge request for binary file See merge request !7713
| * | Fix: Timeout creating and viewing merge request for binary filetimeout-merge-request-for-binary-fileValery Sizov2016-11-251-0/+13
| | |
* | | Accept a valid ref for issue showZ.J. van de Weg2016-11-251-0/+8
| |/ |/| | | | | | | For example, now we support `/gitlab issue show #1`. Where the # used to trip the regex.
* | Merge branch 'dz-allow-nested-group-routing' into 'master' Douwe Maan2016-11-244-35/+58
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add nested groups support to the routing ## What does this MR do? It allows routing with `/` in namespace name ## Why was this MR needed? For nested groups feature(https://gitlab.com/gitlab-org/gitlab-ce/issues/2772). We need URI like `/group/subgroup/project` be routed correctly ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !7459
| * | Add nested groups support to the routingdz-allow-nested-group-routingDmitriy Zaporozhets2016-11-234-35/+58
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Use Commit#author so we share logic and cacheLin Jen-Shin2016-11-241-3/+2
| |/ |/| | | | | Closes #24900
* | Merge branch 'milestone_start_date' into 'master' Sean McGivern2016-11-231-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Add a starting date to milestones Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23704 See merge request !7484
| * | Add a starting date to milestonesmilestone_start_dateValery Sizov2016-11-231-0/+1
| | |
* | | Merge branch 'post_receive-any-email' into 'master' Sean McGivern2016-11-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | post_receive: accept any user email from last commit See merge request !7225
| * | | update existing testElan Ruusamäe2016-11-061-1/+1
| | | |
* | | | Update ProjectTeam#max_member_access_for_user_ids to use project authorizationsAhmad Sherif2016-11-231-0/+2
| |/ / |/| |
* | | Merge branch 'fix/cycle-analytics-plan-issue' into 'master' Douwe Maan2016-11-231-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cycle analytics plan stage when commits are missing Takes into account when commits are `nil` so the app doesn't throw an exception and also removes them. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24836 - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !7694
| * | | Fix and relevant spec for plan stage breaking with nil commitsfix/cycle-analytics-plan-issueJames Lopez2016-11-231-0/+8
| | |/ | |/|
* | | Merge branch 'zj-fix-trailing-whitespace-issue-create' into 'master' Kamil Trzciński2016-11-221-0/+9
|\ \ \ | |/ / |/| | | | | | | | Issue creation now accepts trailing whitespace See merge request !7633
| * | Issue creation now accepts trailing whitespacezj-fix-trailing-whitespace-issue-createZ.J. van de Weg2016-11-221-0/+9
| | |
* | | Merge branch 'fix/ci-linter-undefined-error' into 'master' Kamil Trzciński2016-11-221-18/+33
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix undefined error in CI linter ## What does this MR do? This MR fixes undefined error in CI linter. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] Tests added for this feature/bug ## What are the relevant issue numbers? Closes #24759 See merge request !7650
| * | Fix entry lookup in CI config inheritance rulesGrzegorz Bizon2016-11-221-1/+3
| | |
| * | Extend specs for global ci configuration entryGrzegorz Bizon2016-11-221-18/+31
| | |
* | | Merge branch 'improve-deploy-message' into 'master' Kamil Trzciński2016-11-212-6/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve deploy message ## What does this MR do? Improves deploy message to make it more descriptive and useable then what is already offered by deploy command. ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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 it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !7629
| * | | Improve deploy command messageKamil Trzcinski2016-11-212-6/+9
| | | |
View Lorry Controller Status