summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix/gb/invalid-new-merge-request-api' into 'master' Fatih Acet2017-02-071-1/+7
|\ | | | | | | | | Fix rendering pipelines for a new merge request See merge request !9032
| * Fix merge request controller specs for new actionfix/gb/invalid-new-merge-request-apiGrzegorz Bizon2017-02-071-1/+7
| |
* | Merge branch '21518_recaptcha_spam_issues' into 'master'Sean McGivern2017-02-072-17/+74
|\ \ | |/ |/| | | | | | | | | Use reCaptcha when an issue identified as spam Closes #21518 See merge request !8846
| * Use reCaptcha when an issue identified as spamJarka Kadlecova2017-02-072-17/+74
| |
* | Merge branch ↵Kamil Trzciński2017-02-072-0/+79
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | '26165-combine-runners-and-variables-and-triggers-and-ci-cd-pipelines-settings-pages' into 'master' Merge Triggers, Runners, Variables and Pipelines to a single option called "CI/CD Pipelines" Closes #26165 See merge request !8430
| * | Fixed variables_controller_spec.rb test26165-combine-runners-and-variables-and-triggers-and-ci-cd-pipelines-settings-pagesJose Ivan Vargas2017-02-061-2/+1
| | |
| * | Improved code styling on the variables_controller_specJose Ivan Vargas2017-02-061-7/+11
| | | | | | | | | | | | | | | Also updated the #update action inside the variables controller as to render the show and not redirect back to the settings route
| * | Added tests for the variables controller #update actionJose Ivan Vargas2017-02-061-1/+26
| | |
| * | Added a variable_controller_spec test to test for flash messages on the ↵Jose Ivan Vargas2017-02-062-0/+31
| | | | | | | | | | | | #create action
| * | Fixed tests, renamed files and methodsJose Ivan Vargas2017-02-061-1/+1
| | |
| * | Removed options from the gear button in the projects and consolidated into oneJose Ivan Vargas2017-02-061-0/+20
| | | | | | | | | | | | Added test for the CiCdPipelinesController
* | | Merge branch 'fe-commit-mr-pipelines' into 'master' Fatih Acet2017-02-061-19/+24
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Use vue.js Pipelines table in commit and merge request view Closes #27141 See merge request !8844
| * | Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-041-0/+11
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (76 commits) fix failing test fix Vue warnings for missing element [ci skip] UX Guide: Button placement in groups Change window size before visiting page, to get correct scroll position Fix slash commands spec error Move project services to new location under Integrations Move webhooks to new a location under Integrations Fixed redirection from http://someproject.git to http://someproject consistently use single quotes allow application.js to require other scripts which start with application* DRY with Gitlab.config.webpack.dev_server references disable webpack proxy in rspec environment due to conflicts with webmock gem remove changes to Procfile configure webpack dev server port via environment variable add rack middleware to proxy webpack dev server remove dev-server config from development environment Document that the retro and kickoff notes are public add CHAGELOG.md entry for webpack branch fix failing rspec build fix test failure for merge request widget ...
| * | Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-032-27/+51
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (65 commits) Fixed eslint test failure Fixed adding to list bug Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index Fixed modal lists dropdown not updating when list is deleted Fixed remove btn error after creating new issue in list Removed duplicated test Removed Masonry, instead uses groups of data Uses mixins for repeated functions Fixed up specs Props use objects with required & type values Removes labels instead of closing issue when clicking remove button Fixed JS lint errors Fixed issue card spec Added webkit CSS properties Fixed bug with empty state showing after search Fixed users href path being incorrect Fixed bug where 2 un-selected issues would stay on selected tab Fixed DB schema Changed how components are added in objects Added remove button Add optional id property to the issue schema Fixed issue link href ...
| * | | Add time ago auto-update to the 2 newest tablesFilipa Lacerda2017-02-031-8/+1
| | | |
| * | | Add basic specs for new merge requests pipelines APIGrzegorz Bizon2017-02-031-11/+23
| | | |
* | | | Merge branch 'jej-pages-to-ce' into 'master' Douwe Maan2017-02-061-0/+64
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding GitLab Pages to CE Closes #14605, gitlab-com/infrastructure#1058, gitlab-ee#1333, and #323 See merge request !8463
| * \ \ \ Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-063-27/+62
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | # Conflicts: # db/schema.rb
| * | | | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-033-3/+143
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Fix 500 error while navigating to the `pages_domains` 'show' page.Timothy Andrew2017-01-311-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ================== = Implementation = ================== 1. The path of the page is of the form 'group/project/pages/domains/<domain_name>' 2. Rails looks at `params[:id]` (which should be the domain name), and finds the relevant model record. 3. Given a domain like `foo.bar`, Rails sets `params[:id]` to `foo` (should be `foo.bar`), and sets `params[:format]` to `bar` 4. This commit fixes the issue by adding a route constraint, so that `params[:id]` is set to the entire `foo.bar` domain name. ========= = Tests = ========= 1. Add controller specs for the `PagesDomainController`. These are slightly orthogonal to this bug fix (they don't fail when this bug is present), but should be present nonetheless. 2. Add routing specs that catch this bug (by asserting that the `id` param is passed as expected when it contains a domain name). 3. Modify the 'RESTful project resources' routing spec shared example to accomodate controllers where the controller path (such as `pages/domains`) is different from the controller name (such as `pages_domains`).
* | | | | Add traits for ProjectFeatures to Project factorySemyon Pupkov2017-02-051-13/+3
| |_|/ / |/| | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/24007
* | | | Merge branch 'git_to_html_redirection' into 'master' Sean McGivern2017-02-031-0/+11
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Redirect http://someproject.git to http://someproject Closes #26275 See merge request !8951
| * | | Fixed redirection from http://someproject.git to http://someprojectblackst0ne2017-02-041-0/+11
| | |/ | |/|
* | | Reuse endpoint to list issues for a list instead of create a new oneDouglas Barbosa Alexandre2017-02-031-26/+50
| | |
* | | Fix spec for Projects::Boards::ListsControllerDouglas Barbosa Alexandre2017-02-031-1/+1
|/ /
* | Merge branch 'fix-git-hooks-when-creating-file' into 'master' Douwe Maan2017-02-021-1/+2
|\ \ | | | | | | | | | | | | | | | | | | 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-025-17/+128
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2643-74/+67
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2616-47/+358
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * \ \ \ Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin2017-01-0416-238/+585
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-102-2/+14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-082-1/+63
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * | | | | | | Fix tests to use the new APILin Jen-Shin2016-12-081-1/+2
| | | | | | | |
* | | | | | | | Use `add_$role` helper in snippets specssnippet-spamSean McGivern2017-02-021-4/+4
| | | | | | | |
* | | | | | | | Check public snippets for spamSean McGivern2017-02-022-0/+139
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '24021-Migrate-Projects-Labels-to-Group-Labels' into 'master'27283-fix-wrong-label-hide-show-whitespaceSean McGivern2017-01-311-0/+45
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Promote project labels to group labels Closes #24021 See merge request !7242
| * | | | | | | Abillity to promote project labels to group labelsRitave2017-01-311-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #24021
* | | | | | | | Merge branch 'zj-display-error-team-fetch' into 'master' Kamil Trzciński2017-01-311-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inconsistent return type Closes #27150 See merge request !8290
| * | | | | | | | Fix inconsistent return typeZ.J. van de Weg2017-01-241-2/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'feature/gb/expose-commit-and-mr-pipelines-api' into 'master'Rémy Coutable2017-01-312-15/+54
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Expose pipelines API for commits and merge requests See merge request !8837
| * | | | | | | | Use ApiHelpers in merge request specs for API routesfeature/gb/expose-commit-and-mr-pipelines-apiGrzegorz Bizon2017-01-301-11/+5
| | | | | | | | |
| * | | | | | | | Add controller tests for commit pipelines endpointGrzegorz Bizon2017-01-271-5/+19
| | | | | | | | |
| * | | | | | | | Add controller test for merge requests pipelines APIGrzegorz Bizon2017-01-271-1/+32
| | | | | | | | |
* | | | | | | | | Fix a transient failure in the `Explore::ProjectsController` specrs-issue-27350Robert Speicher2017-01-271-14/+11
|/ / / / / / / /
* | | | | | | | Merge branch '27044-fix-explore-sorting-on-trending' into 'master' Fatih Acet2017-01-261-0/+30
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix /explore sorting (trending) Closes #27044 See merge request !8792
| * | | | | | | Fix /explore sorting (trending)Eric Eastwood2017-01-261-0/+30
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27044
* | | | | | | Use `empty_project` where possible in controller specsrs-empty_project-controllersRobert Speicher2017-01-2543-74/+67
|/ / / / / /
* | | | | | Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master' Robert Speicher2017-01-241-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Dont persist application settings in test env See merge request !8715
| * | | | | Revert "Merge branch 'revert-9cac0317' into 'master' "Grzegorz Bizon2017-01-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c20934869f7dc8cfbdbafb6ecb7b1305452c9e8a, reversing changes made to 4b7ec44b91e0571d209c790d54947ba1756dac0e.
* | | | | | Merge branch '22974-trigger-service-events-through-api' into 'master' Douwe Maan2017-01-231-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | adds events to services api deserialization Closes #22974 See merge request !8324