summaryrefslogtreecommitdiff
path: root/spec/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '26200-convert-sidebar-to-dropdown' into 'master'Sean McGivern2017-02-171-26/+0
|\ | | | | | | | | | | | | Resolve "Update global sidebar to dropdown" Closes #26200 See merge request !9199
| * Remove all gitlab theme related codeAnnabel Dunstone Gray2017-02-151-26/+0
| |
* | Merge branch 'active_when' into 'master' Robert Speicher2017-02-161-0/+5
|\ \ | | | | | | | | | | | | | | | | | | Add active_when helper Closes #24036 See merge request !9166
| * | Add active_when helperSemyon Pupkov2017-02-151-0/+5
| |/ | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24036
* | dev favicon is blue, not purple27281-deviconSimon Knox2017-02-161-2/+2
| |
* | override favicon for development to find tabs more easilySimon Knox2017-02-161-0/+12
|/
* Merge branch '23535-folders-in-wiki-repository' into 'master' Douwe Maan2017-02-131-0/+21
|\ | | | | | | | | | | | | Show directory hierarchy when listing wiki pages Closes #23535 See merge request !8133
| * Merge branch 'master' into 23535-folders-in-wiki-repositoryAlex Braha Stoll2017-01-2914-43/+68
| |\
| * | Add a breadcrumb at projects/wikis/show.html.hamlAlex Braha Stoll2016-12-311-0/+21
| | |
* | | Merge branch 'restore-issues_mentioned_but_not_closing' into 'master'Sean McGivern2017-02-081-0/+82
|\ \ \ | | | | | | | | | | | | | | | | pass in current_user in MergeRequest and MergeRequestsHelper See merge request !8624
| * | | tests for #mr_closes_issues and #mr_issues_mentioned_but_not_closing in ↵Dongqing Hu2017-01-251-0/+82
| | | | | | | | | | | | | | | | MergeRequestsHelper
* | | | Merge branch 'route-map' into 'master' Robert Speicher2017-02-071-0/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add 'View on [env]' link to blobs and individual files in diffs See merge request !8867
| * | | | Address feedbackDouwe Maan2017-02-061-2/+2
| | | | |
| * | | | Add testsDouwe Maan2017-02-061-0/+19
| | | | |
* | | | | Merge branch '27632_fix_mr_widget_url' into 'master'Sean McGivern2017-02-071-4/+6
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix MR widget url Closes #27632 See merge request !8989
| * | | | Fix MR widget urlJarka Kadlecova2017-02-071-4/+6
| | | | |
* | | | | Add traits for ProjectFeatures to Project factorySemyon Pupkov2017-02-051-1/+0
|/ / / / | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/24007
* | | | Active tense test coveragejej-backport-active-tense-specsValery Sizov2017-02-011-5/+5
| | | | | | | | | | | | | | | | Ports changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/642 back into CE
* | | | Add tests for nested groups in search service and search helperDmitriy Zaporozhets2017-01-301-0/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Move issuable reference display to a helper methodOswaldo Ferreira2017-01-271-0/+40
| |_|/ |/| |
* | | Ensure we have a project with a repo in GitlabMarkdownHelper specsRémy Coutable2017-01-261-2/+1
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Use `:empty_project` where possible in helper specsrs-empty_project-helpersRobert Speicher2017-01-2514-40/+41
|/ /
* | Address MR commentsJarka Kadlecova2017-01-131-0/+15
| |
* | Merge branch '26168-emoji-reactions-missing-tooltip-when-not-logged-in' into ↵Fatih Acet2017-01-031-4/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Disable award emoji button but display tooltip Closes #26168 See merge request !8382
| * | Disable award emoji button but display tooltip26168-emoji-reactions-missing-tooltip-when-not-logged-inSam Rose2016-12-311-4/+4
| |/
* | Fix cross-project references copy to include the project referencefix/cross-project-ref-pathJames Lopez2017-01-031-0/+10
|/ | | | Also added relevant specs and refactored to_references in a bunch of places to be more consistent.
* Add more storage statisticsMarkus Koller2016-12-211-0/+21
| | | | | | | | | | | | | This adds counters for build artifacts and LFS objects, and moves the preexisting repository_size and commit_count from the projects table into a new project_statistics table. The counters are displayed in the administration area for projects and groups, and also available through the API for admins (on */all) and normal users (on */owned) The statistics are updated through ProjectCacheWorker, which can now do more granular updates with the new :statistics argument.
* Reduce duplication for GitHubish import status viewRémy Coutable2016-12-191-10/+23
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Always use `fixture_file_upload` helper to upload files in tests.fix-groups-helper-specRuben Davila2016-12-181-1/+1
| | | | | * Also is not a good idea to use File.open without closing the file handler. We should use it with a block or close it explicitly.
* Add Gitlab::Middleware::MultipartJacob Vosmaer2016-12-151-8/+6
|
* Merge branch 'html-safe-diff-line-content' into 'security' Robert Speicher2016-12-081-9/+52
| | | | | | | | | | Don't accidentally mark unsafe diff lines as HTML safe Fixes potential XSS issue when a legacy diff note is created on a merge request whose diff contained HTML See https://gitlab.com/gitlab-org/gitlab-ce/issues/25249 See merge request !2040
* Add shorthand support to gitlab markdown referencesOswaldo Ferreira2016-12-021-2/+2
|
* Refactor issuable_filters_present to reduce duplicationsSemyon Pupkov2016-11-281-0/+21
| | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23546
* Merge branch 'milestone_start_date' into 'master' Sean McGivern2016-11-231-0/+19
|\ | | | | | | | | | | | | 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/+19
| |
* | Drop Project#authorized_for_user? in favor of ProjectTeam#member?Ahmad Sherif2016-11-231-2/+2
|/ | | | Closes #23938
* Fix sidekiq stats in admin areablackst0ne2016-11-231-0/+23
| | | | | | | | Added tests Added changelog entry Resolved all issues in code
* Use `Gitlab.config.gitlab.host` over `'localhost'`fix-tests-for-different-hostLin Jen-Shin2016-11-182-3/+3
| | | | | | | | This would fix long standing failures running tests on my development machine, which set `Gitlab.config.gitlab.host` to another host because it's not my local computer. Now I finally cannot withstand it and decided to fix them once and for all.
* Merge branch '23990-project-show-error-when-empty-repo' into 'master' Douwe Maan2016-11-171-0/+41
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 500 error on project show when user is not logged in and project is still empty ## What does this MR do? Aims to fix the 500 error when the project is empty and the user is not logged in and tries to access project#show ## Screenshots (if relevant) When the project is empty and the user is not logged in we default to the empty project partial instead of readme. ![Screen_Shot_2016-11-11_at_22.54.21](/uploads/3d87e65195376c85d3e515e6d5a9a850/Screen_Shot_2016-11-11_at_22.54.21.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 [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 #23990 See merge request !7376
| * adds fix for security issue when annonymous user does not have access to ↵23990-project-show-error-when-empty-repotiagonbotelho2016-11-171-7/+29
| | | | | | | | repository we now display the activity feed instead of the readme
| * moves empty view logic onto empty partial to make it reusable and fixes teststiagonbotelho2016-11-151-4/+5
| |
| * change empty project view to annonymous user from activity to empty partialtiagonbotelho2016-11-111-6/+3
| |
| * adds guard clause for readme model method and initializes a new view with ↵tiagonbotelho2016-11-111-0/+21
| | | | | | | | proper stylesheets
* | Merge branch '23117-search-for-a-filename-in-a-project' into 'master' Sean McGivern2016-11-161-32/+0
|\ \ | | | | | | | | | | | | | | | | | | Search for a filename in a project Closes #23117 See merge request !7426
| * | Search for a filename in a project23117-search-for-a-filename-in-a-projectValery Sizov2016-11-161-32/+0
| |/
* | Make access request specs explicitly enable or disable access requests as ↵Nick Thomas2016-11-111-4/+4
|/ | | | required
* Merge branch 'remove-heading-space-from-diff-content' into 'master' Alfredo Sumaran2016-11-091-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove an extra leading space from diff paste data ## What does this MR do? Remove an extra leading space from diff paste data. ## Are there points in the code the reviewer needs to double check? I have checked the following three patterns. * inline diff * parallel diff * blob preview ## Why was this MR needed? Diff paste data contain an extra leading space. So it need to remove an extra leading space manually from pasted diff data. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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 [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? #14176 Closes #23899 See merge request !7133
| * Remove an extra leading space from diff contentHiroyuki Sato2016-11-041-1/+1
| |
* | Replace jQuery.timeago with timeago.jsClement Ho2016-11-071-21/+3
| |
* | Use the Gitlab Workhorse HTTP header in the admin dashboard21664-incorrect-workhorse-version-number-displayedChris Wright2016-11-071-0/+21
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status