Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec/support
AgeCommit message (Collapse)Author
2016-07-05Improve the error message displayed when branch creation fails.Timothy Andrew
Note: This feature was developed independently on master while this was in review. I've removed the conflicting bits and left the relevant additions, mainly a test for `Gitlab::Git::Hook`. The original commit message follows: 1. `gitlab-shell` outputs errors to `stderr`, but we weren't using this information, prior to this commit. Now we capture the `stderr`, and display it in the flash message when branch creation fails. 2. This can be used to display better errors for other git operation failures with small tweaks. 3. The return value of `Gitlab::Git::Hook#trigger` is changed from a simple `true`/`false` to a tuple of `[status, errors]`. All usages and tests have been updated to reflect this change. 4. This is only relevant to branch creation _from the Web UI_, since SSH and HTTP pushes access `gitlab-shell` either directly or through `gitlab-workhorse`. 5. A few minor changes need to be made on the `gitlab-shell` end. Right now, the `stderr` message it outputs is prefixed by "GitLab: ", which shows up in our flash message. This is better removed.
2016-07-04Merge branch 'user-avatar-header' into 'master' Dmitriy Zaporozhets
Added user avatar to header ## What does this MR do? Adds the users avatar to the header with a dropdown for profile & sign out. ## What are the relevant issue numbers? Closes #18543 ## Screenshots (if relevant) ![Screen_Shot_2016-06-27_at_12.47.34](/uploads/852d0eb7075eefcf21f5cf5ff71a389a/Screen_Shot_2016-06-27_at_12.47.34.png) ![Screen_Shot_2016-06-27_at_12.47.36](/uploads/6cb29843d3a12bbf2d3ed2a7c9bde770/Screen_Shot_2016-06-27_at_12.47.36.png) See merge request !4939
2016-07-01Enable Style/EmptyLines cop, remove redundant onesGrzegorz Bizon
2016-06-30Remove hardcoded gitlab-shell version in test env now that the required tag ↵Alejandro Rodríguez
is published
2016-06-30Refactor repository paths handling to allow multiple git mount pointsAlejandro Rodríguez
2016-06-28Fixed logout testsPhil Hughes
2016-06-28support cgi style options, such as erb?parent=jsonhttp://jneen.net/
2016-06-28fix the spec, using project.change_headhttp://jneen.net/
2016-06-28Revert "bump the master sha for gitlab-test!9"http://jneen.net/
This reverts commit b435d7405364d28ec364072f4437512da2876762.
2016-06-28bump the master sha for gitlab-test!9http://jneen.net/
2016-06-16Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez
feature/project-export # Conflicts: # app/models/ci/pipeline.rb
2016-06-16Revert "squashed merge and fixed conflicts"James Lopez
This reverts commit 13e37a3ee5c943525a99481b855d654e97e8597c.
2016-06-16squashed merge and fixed conflictsJames Lopez
2016-06-13Merge branches 'feature/project-export' and 'master' of ↵James Lopez
gitlab.com:gitlab-org/gitlab-ce into feature/project-export
2016-06-12Fix Error 500 when viewing a blob with binary characters after the 1024-byte ↵Stan Hu
mark Here was the problem: 1. When determining whether a given blob is viewable text, gitlab_git reads the first 1024 bytes and checks with Linguist whether it is a text or binary file. 2. If the blob is text, GitLab will attempt to display it. 3. However, if the text has binary characters after the first 1024 bytes, then GitLab will attempt to load the entire contents, but the encoding will be ASCII-8BIT since there are binary characters. 4. The Error 500 results when GitLab attempts to display a mix UTF-8 and ASCII-8BIT. To fix this, we load as much data as we are willing to display so that the detection will work properly. Requires an update to gitlab_git: gitlab-org/gitlab_git!86 Closes #13826
2016-06-09Merge branch 'make-omniauth-tests-to-not-modify-global-state' into 'master' Yorick Peterse
Make Omniauth providers specs to not modify global configuration See merge request !4534
2016-06-09Merge branch '18019-fix-wiki-linking' into 'master' Rémy Coutable
Fix wiki linking behavior for markdown wiki pages Related to #18019 - As per the documentation in !4372 ## TODO - [ ] !4432 Have wiki linking behave as per the documentation - [x] Move `WikiLinkFilter` specs to the pipeline level - [x] Verify current behavior on wiki `show` page - [x] Fix current behavior on wiki `show` page - [x] Verify current behaviour on wiki preview - [x] Fix current behaviour on wiki preview - [x] Rewrite all links and get preview links working - [x] Make sure all links are on-par with the wiki `show` page - [x] TDD `WikiLinkFilter` and get it working - [x] Hook `WikiLinkFilter` up - [x] Fix tests - [x] Fix `markdown_spec` - [x] Fix `wiki` spinach feature - [x] Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/4f50dd2/builds) to pass - [x] Make sure all wiki-related pages are working as expected (history, all pages, etc.) - [x] Test in different ruby versions - [x] GitLab instances hosted on a relative URL - [x] Non-markdown rendering formats? - [x] RDoc - [x] ASCIIDoc - [x] Create issues to fix things for RDoc and ASCIIDoc - [x] Gauge performance impact - [x] Refactor - [x] Re-organize commits - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/f860e9a8dcabe7d5f160c32fc549807c98baa4a1/builds) passes - [x] Respond to @rymai's comments - [x] `class WikiLinkFilter < HTML::Pipeline::Filter` - [x] blank line after guard clause - [x] keyword arguments for `wiki` and `slug` - [x] invert the condition - [x] inline `user` in spec - [x] Make sure spec names are not out of date - [x] Comment for each rewrite rule - [x] Add CHANGELOG entry - [x] Reorganize commits - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/19b91e749a6320d12fb299d33f1f6440777e0e26/builds) passes - [ ] Wait for merge See merge request !4432
2016-06-09Hook up the updated `WikiLinkFilter` to the wiki controllers.Timothy Andrew
- Need to pass in a `page_slug` to the filter, so it can rewrite based on the current page (all links are rewritten to the level of the app root). - The earlier `markdown_preview` endpoint was at the level of the wiki. We need to know the current page (for rewriting, as above), so this commit moves the endpoint to the level of a wiki page. - Fix all tests
2016-06-08Move ImportSpecHelper to spec/support/Kamil Trzcinski
2016-06-06Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski
2016-06-06Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski
# Conflicts: # spec/features/builds_spec.rb
2016-06-06Add feature specs covering U2F registration and authentication.Timothy Andrew
2016-06-03Rename all `[ci_]commit` to `[ci_]pipeline` in specs and featuresKamil Trzcinski
2016-06-03merge hellJames Lopez
2016-06-03Revert "Fix merge conflicts - squashed commit"James Lopez
This reverts commit 3e99123095b26988de67a94b0e7a5207c1ef5ae2.
2016-06-03Fix merge conflicts - squashed commitJames Lopez
# Conflicts: # app/models/project.rb
2016-06-02Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski
2016-06-01Merge branch 'separate-banzai-references' into 'master' Douwe Maan
Separate reference gathering from rendering This is a required step to allow batch processing when gathering references. This in turn would allow grabbing (for example) all mentioned users of an issue/merge request using a single query. cc @rspeicher @DouweM See merge request !3969
2016-05-31Pass the "Remember me" value to the 2FA token formRobert Speicher
Prior, if a user had 2FA enabled and checked the "Remember me" field, the setting was ignored because the OTP input was on a new form and the value was never passed. Closes #18000
2016-05-26Split Markdown rendering & reference gatheringYorick Peterse
This splits the Markdown rendering and reference extraction phases into two distinct code bases. The reference extraction phase no longer relies on the html-pipeline Gem (and any related code) and allows for extracting of references from multiple HTML nodes in a single pass. This means that if you want to extract user references from 200 comments you no longer need to run 200 times N number of queries, instead only a handful of queries may be needed.
2016-05-21Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'Douwe Maan
# Conflicts: # app/services/system_note_service.rb
2016-05-19Merge remote-tracking branch 'origin/master' into ↵Rémy Coutable
eReGeBe/gitlab-ce-feature/milestone-md Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-18Create DiffFilter and change SystemNoteService#change_title to use ↵Adam Butler
Gitlab::Diff::InlineDiff
2016-05-17Fix specsKamil Trzcinski
2016-05-17Improve test coverageKamil Trzcinski
2016-05-14Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski
2016-05-13Codestyle: make sure we have space around operatorsGabriel Mazetto
2016-05-09Added Docker Registry View testsKamil Trzcinski
2016-05-06fixed and refactored a few things based on MR feedbackJames Lopez
2016-05-03Merge branches 'feature/project-export' and 'master' of ↵James Lopez
gitlab.com:gitlab-org/gitlab-ce into feature/project-export
2016-04-25Ensure URL in all Service subclasses are validRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-21Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez
feature/project-export
2016-04-21Transforming milestones link references to the short reference formAlejandro Rodríguez
2016-04-21Implementing special GitLab markdown reference for milestonesAlejandro Rodríguez
Using the syntax proposed in #13829 [project_reference]%(milestone_id | milestone_name) to get a link to the referred milestone.
2016-04-19Merge branch 'pmq20/gitlab-ce-issue_12785'Douwe Maan
2016-04-19Added System Hooks for push and tag_pushGabriel Mazetto
Code is based on Project Webhooks, removing deprecations and without commits listing.
2016-04-18Read job variables directly from gitlab CI configGrzegorz Bizon
2016-04-18Add support to cherry-pick any commitP.S.V.R
Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785 Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
2016-04-12Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez
feature/project-export
2016-04-07continuing to refactor config, added spec and fixed a few problemsJames Lopez
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 12:51:46 +0300