summaryrefslogtreecommitdiff
path: root/spec/features
Commit message (Collapse)AuthorAgeFilesLines
* Change all `:empty_project` to `:project`rs-empty_project-defaultRobert Speicher2017-08-02170-211/+211
|
* Merge branch 'rs-empty_project-cleanup' into 'master'Rémy Coutable2017-08-027-8/+8
|\ | | | | | | | | Ensure all project factories use `:repository` trait or `:empty_project` See merge request !13238
| * Ensure all project factories use `:repository` trait or `:empty_project`rs-empty_project-cleanupRobert Speicher2017-08-017-8/+8
| |
* | Add filtered search to group issue dashboardClement Ho2017-08-021-5/+5
|/
* Merge branch '28283-legacy-storage-format' into 'master'Sean McGivern2017-08-013-29/+29
|\ | | | | | | | | [CE] Added Legacy Storage format See merge request !13149
| * Rename more path_with_namespace -> full_path or disk_pathGabriel Mazetto2017-08-011-1/+1
| |
| * Rename many path_with_namespace -> full_pathGabriel Mazetto2017-08-012-28/+28
| |
* | Inline script cleanup globals and easyTim Zallmann2017-08-011-2/+2
|/
* Merge branch '35643-impersonate-spec' into '9-4-stable-patch-2'cherry-pick-41db362cRémy Coutable2017-07-281-1/+3
| | | | | Resolve "Impersonation Tokens creation spec failure in admin_users_impersonation_tokens_spec.rb" See merge request !13145
* Merge branch '35599-fix-uncontrolled-default_url_options-overriding' into ↵Robert Speicher2017-07-282-17/+5
|\ | | | | | | | | | | | | | | | | 'master' Ensure Gitlab.config.gitlab.host/port and Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs Closes #35599 See merge request !13126
| * Fix a spec that was assuming to be on the wrong page35599-fix-uncontrolled-default_url_options-overridingRémy Coutable2017-07-281-6/+4
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Ensure Gitlab::Application.routes.default_url_options are set correctly in ↵Rémy Coutable2017-07-281-11/+1
| | | | | | | | | | | | Capybara + :js specs Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'rs-fix-master' into 'master'Robert Speicher2017-07-281-3/+3
|\ \ | | | | | | | | | | | | Fix spec/features/projects/branches_spec See merge request !13163
| * | Fix spec/features/projects/branches_specRobert Speicher2017-07-281-3/+3
| |/ | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8666
* | Merge branch 'fix-replying-to-commit-comment-in-mr-from-fork' into 'master'Douwe Maan2017-07-281-0/+27
|\ \ | |/ |/| | | | | | | | | Fix replying to commit comments on merge requests created from forks Closes #31772 See merge request !13137
| * Fix replying to commit comments on MRs from forksSean McGivern2017-07-281-0/+27
| | | | | | | | | | | | A commit comment shows in the MR, but if the MR is from a fork, it will have a different project ID to the MR's target project. In that case, add an note_project_id param so that we can pick the correct project for the note.
* | Merge branch 'rs-empty_project-features' into 'master'Rémy Coutable2017-07-28148-213/+217
|\ \ | | | | | | | | | | | | Use `:empty_project` where possible in feature specs See merge request !13118
| * | Use `empty_project` where possible in spec/features/securityrs-empty_project-featuresRobert Speicher2017-07-276-6/+9
| | |
| * | Use `empty_project` where possible in spec/features/merge_requestsRobert Speicher2017-07-2729-42/+42
| | |
| * | Use `empty_project` where possible in spec/features/issuesRobert Speicher2017-07-2718-30/+30
| | |
| * | Use `empty_project` where possible in spec/features/projectsRobert Speicher2017-07-2773-97/+95
| | |
| * | Use `empty_project` where possible in spec/features/issuablesRobert Speicher2017-07-272-3/+3
| | | | | | | | | | | | (It wasn't possible.)
| * | Use `empty_project` where possible in spec/features/atomRobert Speicher2017-07-274-5/+5
| | |
| * | Use `empty_project` where possible in spec/features/profilesRobert Speicher2017-07-271-3/+3
| | |
| * | Use `empty_project` where possible in spec/features/exploreRobert Speicher2017-07-271-1/+1
| | |
| * | Use `empty_project` where possible in spec/features/groupsRobert Speicher2017-07-273-5/+5
| | |
| * | Use `empty_project` where possible in spec/features/adminRobert Speicher2017-07-274-11/+14
| | |
| * | Use `empty_project` where possible in spec/features/dashboardRobert Speicher2017-07-277-10/+10
| |/
* | Merge branch '32483-jira-error' into 'master'Sean McGivern2017-07-281-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Display specific error message when JIRA test fails Closes #32483 See merge request !13100
| * | Display specific error message when JIRA test fails32483-jira-errorJarka Kadlecova2017-07-271-1/+1
| | |
* | | Merge branch '1827-prevent-concurrent-editing-wiki' into 'master'Robert Speicher2017-07-271-1/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Prevent concurrent editing wiki Closes #1827 See merge request !9707
| * | | Remove unnecessary codeHiroyuki Sato2017-07-261-1/+0
| | | |
| * | | Merge branch 'master' into 1827-prevent-concurrent-editing-wikiHiroyuki Sato2017-07-23361-5296/+15076
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/controllers/projects/wikis_controller.rb app/views/projects/wikis/edit.html.haml spec/features/projects/wiki/user_updates_wiki_page_spec.rb
| * | | | Refactor specHiroyuki Sato2017-03-091-2/+2
| | | | |
| * | | | Prevent concurrent editing wikiHiroyuki Sato2017-03-081-1/+11
| | | | |
* | | | | Merge branch 'backport-ee-2456' into 'master'Robert Speicher2017-07-271-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Skip OAuth authorization for trusted applications See merge request !13061
| * | | | | Backport gitlab-ee!2456Oswaldo Ferreira2017-07-271-0/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch 'feature/gpg-signed-commits' into 'master'Dmitriy Zaporozhets2017-07-272-0/+159
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | GPG signed commits Closes #20268 See merge request !9546
| * | | | fetch gpg signature badges by ajaxAlexis Reigel2017-07-271-2/+2
| | | | |
| * | | | use short project path helpersAlexis Reigel2017-07-271-6/+6
| | | | |
| * | | | swap user's name and the user's usernameAlexis Reigel2017-07-271-1/+1
| | | | |
| * | | | show gpg key's user info when no profile existsAlexis Reigel2017-07-271-3/+20
| | | | |
| * | | | user may now revoke a gpg keyAlexis Reigel2017-07-271-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | other than just removing a key, which doesn't affect the verified state of a commit, revoking a key unverifies all signed commits.
| * | | | improve spacing / alignments in gpg popupAlexis Reigel2017-07-271-7/+7
| | | | |
| * | | | use sign_in instead of login_withAlexis Reigel2017-07-271-3/+3
| | | | |
| * | | | remove the :gpg rspec tagAlexis Reigel2017-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | since everything (except the CurrentKeyChain method) operates on a tempoary keychain anyway we don't need this anymore.
| * | | | use updated gitlab-test repo for signed commitsAlexis Reigel2017-07-271-19/+5
| | | | |
| * | | | add gpg commit popover badgesAlexis Reigel2017-07-271-0/+25
| | | | |
| * | | | perform signature update in sidekiq workerAlexis Reigel2017-07-271-4/+10
| | | | |
| * | | | update features specs for gpg commitsAlexis Reigel2017-07-271-13/+38
| | | | |