summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rs-event-traits' into 'master' Rémy Coutable2017-02-032-10/+10
|\ | | | | | | | | Add traits for the different Event types to the Event factory See merge request !8870
| * Add traits for the different Event types to the Event factoryrs-event-traitsRobert Speicher2017-02-012-10/+10
| |
* | Merge branch 'markdown-plantuml' into 'master' Sean McGivern2017-02-031-0/+32
|\ \ | | | | | | | | | | | | | | | | | | PlantUML support for Markdown Closes #4048 See merge request !8588
| * | PlantUML support for MarkdownHoracio Sanson2017-02-031-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow rendering of PlantUML diagrams in Markdown documents using fenced blocks: ```plantuml Bob -> Sara : Hello Sara -> Bob : Go away ``` Closes: #4048
* | | Merge branch 'squash' into 'master' Sean McGivern2017-02-031-1/+3
|\ \ \ | | | | | | | | | | | | | | | | Backport changes from EE squash See merge request !8912
| * | | Backport changes from EE squashSean McGivern2017-02-031-1/+3
| |/ / | | | | | | | | | | | | | | | | | | Backport changes from the EE-only squash implementation, which would otherwise conflict when merge CE into EE. <https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1024>
* | | Merge branch 'fwn-to-find-by-full-path' into 'master' Dmitriy Zaporozhets2017-02-031-1/+1
|\ \ \ | |/ / |/| | | | | | | | replace `find_with_namespace` with `find_by_full_path` See merge request !8949
| * | replace `find_with_namespace` with `find_by_full_path`Adam Pahlevi2017-02-031-1/+1
| |/ | | | | | | add complete changelog for !8949
* | Merge branch 'fix-git-hooks-when-creating-file' into 'master' Douwe Maan2017-02-024-24/+26
|\ \ | | | | | | | | | | | | | | | | | | Don't execute git hooks if you create branch as part of other change Closes #23439 See merge request !7237
| * \ Merge remote-tracking branch 'upstream/master' into ↵fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-0223-125/+395
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (190 commits) Remove unnecessary returns / unset variables from the CoffeeScript -> JS conversion. update spec Change the reply shortcut to focus the field even without a selection. use destroy_all Remove settings cog from within admin scroll tabs; keep links centered add changelog remove old project members from project add spec replicating validation error Fix small typo on new branch button spec Improve styling of the new issue message Don't capitalize environment name in show page Abillity to promote project labels to group labels Edited the column header for the environments list from created to updated and added created to environments detail page colum header titles Update and pin the `jwt` gem to ~> 1.5.6 refactor merge request build service Update index.md Clarify that Auto Deploy requires a public project. 19164 Add settings dropdown to mobile screens cop for gem fetched from a git source Add CHANGELOG entry ...
| * \ \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-01-2665-101/+114
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: Ensure we have a project with a repo in GitlabMarkdownHelper specs Revert "Make sure TraceReader uses Encoding.default_external" Make sure TraceReader uses Encoding.default_external Update CONTRIBUTING.md after merging "up-for-grabs" and "Accepting Merge Requests" [ci skip] Use `:empty_project` where possible in finder specs Use `empty_project` where possible in controller specs Use `:empty_project` where possible in helper specs Don’t count tasks that are not defined as list items correctly Use a project factory with a repository where necessary Use `:empty_project` where possible throughout spec/lib Use hashrocket for dasherized attribute Remove markdown file extension and add anchor to link Fixed builds info link on project settings page Factories with a project association use `:empty_project` by default Update enviroments.md the example for deleting an environment is missing the "s" in environments. curl --request DELETE --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/environments/1" wil 404
| * \ \ \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-01-2682-334/+5246
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (1122 commits) Update CHANGELOG.md for 8.16.2 Display project ID in project settings (!8572) fixed points from comments to improve code quality Update CHANGELOG.md for 8.14.8 Statisfy eslint Add CHANGELOG entry Fix access to the wiki code via HTTP when repository feature disabled Display fullscreen button on small screens (!5302) Prevent removing fields from dropdowns on input elements fix for all themes Return struct instead of multiple values Fix race conditions for AuthorizedProjectsWorker Add User#nested_groups and User#nested_projects methods Fix spec failure due to timestamp ordering issue in mySQL Fixed error with filter keyboard tests `can?` already includes the `feature_available?` check Test there is no Merge Request button when MRs are disabled Ensure the correct Merge Request button is found Add 409 conflict tests Add CHANGELOG ...
| * | | | | Fix renamingLin Jen-Shin2017-01-071-3/+3
| | | | | |
| * | | | | Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin2017-01-0478-445/+2658
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (1031 commits) Add changelog entry for renaming API param [ci skip] Add missing milestone parameter Refactor issues filter in API Fix project hooks params Gitlab::LDAP::Person uses LDAP attributes configuration Don't delete files from spec/fixtures Copy, don't move uploaded avatar files Minor improvements to changelog docs Rename logo, apply for Slack too Fix Gemfile.lock for the octokit update Fix cross-project references copy to include the project reference Add logo in public files Use stable icon for Mattermost integration rewrite the item.respond_to?(:x?) && item.x? to item.try(:x?) API: extern_uid is a string Increases pipeline graph drowdown width in order to prevent strange position on chrome on ubuntu Removed bottom padding from merge manually from CLI because of repositioning award emoji's Make haml_lint happy Improve spec Add feature tests for Cycle Analytics ...
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-107-3/+121
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (60 commits) Refactor SSH keys docs Improvements to setting up ssh Do not reload diff for merge request made from fork when target branch in fork is updated Add 8.12.10, 8.12.11, and 8.12.12 CHANGELOG.md items Changes after review Fix broken test Adds CHANGELOG entry Adds tests Uniformize props name format Replace commit icon svg logic Replace play icon svg logic Update docs to reflect new defaults on omnibus Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security' Merge branch 'html-safe-diff-line-content' into 'security' Merge branch 'rs-filter-authentication_token' into 'security' Merge branch 'destroy-session' into 'security' remove unnecessary issues event filter on comments tab Updating reference to database password Add CHANGELOG entry Displays milestone remaining days only when it's present ...
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-0825-123/+1194
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (116 commits) adds impersonator variable and makes sudo usage overall more clear Reenables /user API request to return private-token if user is admin and requested with sudo Fix Backup::Manager#remove_old Allow public access to some Tag API endpoints Update outdated visible content spec descriptions Grapify the issues API new DevOps report, 404s, typos Remove dashboard.scss Update custom_hooks.md for global custom hooks and chained hook info Move admin hooks spinach to rspec Move admin logs spinach test to rspec Fix 404 error when visit group label edit page A simpler implementation of finding a merge request Encourage bug reporters to mention if they use GitLab.com [ci skip] Bump gitlab-shell version to 4.0.3 Remove confirmation.scss Explain "js: true" in "deleted_source_branch_spec.rb" [ci skip] Move award emojis to framwork Move image styles to framework Remove tags.scss ...
| * | | | | | | | rubocop prefers lisp styleLin Jen-Shin2016-12-082-6/+2
| | | | | | | | |
| * | | | | | | | Fix tests to use the new APILin Jen-Shin2016-12-083-21/+25
| | | | | | | | |
* | | | | | | | | Merge branch '20248-add-coverage-regex-in-job-yaml' into 'master'Douwe Maan2017-02-025-6/+114
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to define a coverage regex in the .gitlab-ci.yml Closes #20428 See merge request !7447
| * | | | | | | | | Be more lenient on build coverage value updates and fix specsLeandro Camargo2017-01-251-0/+1
| | | | | | | | | |
| * | | | | | | | | Make more code improvements around the '/' stripping logicLeandro Camargo2017-01-253-5/+12
| | | | | | | | | |
| * | | | | | | | | Force coverage value to always be surrounded by '/'Leandro Camargo2017-01-252-14/+9
| | | | | | | | | |
| * | | | | | | | | Improve specs styles/organization and add some more specsLeandro Camargo2017-01-253-14/+31
| | | | | | | | | |
| * | | | | | | | | Comply to more requirements and requests made in the code reviewLeandro Camargo2017-01-251-2/+7
| | | | | | | | | |
| * | | | | | | | | Simplify coverage setting and comply to some requests in code reviewLeandro Camargo2017-01-252-20/+11
| | | | | | | | | |
| * | | | | | | | | Add specs to cover the implemented feature and fix a small bugLeandro Camargo2017-01-254-5/+97
| | | | | | | | | |
* | | | | | | | | | Merge branch 'snippet-spam' into 'master' Rémy Coutable2017-02-021-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snippet spam Closes #26276 See merge request !8911
| * | | | | | | | | | Check public snippets for spamSean McGivern2017-02-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the same spam checks to public snippets (either personal snippets that are public, or public snippets on public projects) as to issues on public projects.
* | | | | | | | | | | Merge branch 'jej-backport-active-tense-specs' into 'master' Douwe Maan2017-02-024-7/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port 'Active tense test coverage' changes from EE See merge request !8921
| * | | | | | | | | | Active tense test coveragejej-backport-active-tense-specsValery Sizov2017-02-014-7/+7
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ports changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/642 back into CE
* | | | | | | | | | Merge branch '24462-reduce_ldap_queries_for_lfs' into 'master' Robert Speicher2017-02-011-26/+70
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce hits to LDAP on Git HTTP auth by reordering auth mechanisms Closes #24462 See merge request !8752
| * | | | | | | | | | Reduce hits to LDAP on Git HTTP auth by reordering auth mechanismsDrew Blessing2017-01-301-26/+70
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We accept half a dozen different authentication mechanisms for Git over HTTP. Fairly high in the list we were checking user password, which would also query LDAP. In the case of LFS, OAuth tokens or personal access tokens, we were unnecessarily hitting LDAP when the authentication will not succeed. This was causing some LDAP/AD systems to lock the account. Now, user password authentication is the last mechanism tried since it's the most expensive.
* | | | | | | | | | Merge branch 'zj-format-chat-messages' into 'master' Kamil Trzciński2017-02-0110-70/+228
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Format chat messages Closes #24917 and #25746 See merge request !8528
| * | | | | | | | | Incorporate feedbackZ.J. van de Weg2017-01-302-5/+11
| | | | | | | | | |
| * | | | | | | | | Rename presenters for consitencyZ.J. van de Weg2017-01-305-4/+21
| | | | | | | | | |
| * | | | | | | | | Incorporate feedbackZ.J. van de Weg2017-01-309-9/+282
| | | | | | | | | |
| * | | | | | | | | Chat Commands have presentersZ.J. van de Weg2017-01-3013-341/+203
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the styling and readability of the code. This is supported by both Mattermost and Slack.
* | | | | | | | | update specfix/import-user-validation-errorJames Lopez2017-01-311-6/+2
| | | | | | | | |
* | | | | | | | | add spec replicating validation errorJames Lopez2017-01-311-0/+28
| | | | | | | | |
* | | | | | | | | Merge branch ↵Kamil Trzciński2017-01-314-4/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '25910-convert-manual-action-icons-to-svg-to-propperly-position-them' into 'master' Convert pipeline action icons to svg to have them propperly positioned Closes #25910 See merge request !8766
| * | | | | | | | | Fix broken testsFilipa Lacerda2017-01-254-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix linter error
* | | | | | | | | | fix typo in specJames Lopez2017-01-301-1/+1
| | | | | | | | | |
* | | | | | | | | | programmatically remove encrypted attributes. Added relevant spec.James Lopez2017-01-301-0/+11
| | | | | | | | | |
* | | | | | | | | | fix spec failuresJames Lopez2017-01-301-2/+2
| | | | | | | | | |
* | | | | | | | | | fix typoJames Lopez2017-01-301-2/+2
| | | | | | | | | |
* | | | | | | | | | Ignore encrypted attributes in Import/ExportJames Lopez2017-01-302-4/+23
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Regenerates tokens for all models that have them * Remove variables, since they are basically just storing encrypted data * Bumped version up to 0.1.6 * Updated related docs
* | | | | | | | | Merge branch '26943-fix-user-in-build-presenter' into 'master' Robert Speicher2017-01-273-17/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't override Ci::Build#user when presenting a build Closes #26943 See merge request !8668
| * | | | | | | | | Raise Gitlab::View::Presenter::CannotOverrideMethodError if presentee ↵26943-fix-user-in-build-presenterRémy Coutable2017-01-251-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | already respond to method Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | Don't override presentee methods for Gitlab::View::Presenter::DelegatedRémy Coutable2017-01-243-17/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'fix-trace-reader-encoding' into 'master' Douwe Maan2017-01-261-2/+14
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure TraceReader uses Encoding.default_external Closes #27052 See merge request !8801