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
AgeCommit message (Collapse)Author
2017-07-29Merge branch '35643-impersonate-spec' into '9-4-stable-patch-2'Rémy Coutable
Resolve "Impersonation Tokens creation spec failure in admin_users_impersonation_tokens_spec.rb" See merge request !13145
2017-07-28Merge branch '35599-fix-uncontrolled-default_url_options-overriding' into ↵Robert Speicher
'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
2017-07-28Merge branch 'rs-fix-master' into 'master'Robert Speicher
Fix spec/features/projects/branches_spec See merge request !13163
2017-07-28Merge branch 'fix-replying-to-commit-comment-in-mr-from-fork' into 'master'Douwe Maan
Fix replying to commit comments on merge requests created from forks Closes #31772 See merge request !13137
2017-07-28Fix spec/features/projects/branches_specRobert Speicher
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8666
2017-07-28Fix a spec that was assuming to be on the wrong pageRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-28Fix replying to commit comments on MRs from forksSean McGivern
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.
2017-07-28Ensure Gitlab::Application.routes.default_url_options are set correctly in ↵Rémy Coutable
Capybara + :js specs Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-28Merge branch 'rs-empty_project-features' into 'master'Rémy Coutable
Use `:empty_project` where possible in feature specs See merge request !13118
2017-07-28Merge branch '32483-jira-error' into 'master'Sean McGivern
Display specific error message when JIRA test fails Closes #32483 See merge request !13100
2017-07-27Merge branch '1827-prevent-concurrent-editing-wiki' into 'master'Robert Speicher
Prevent concurrent editing wiki Closes #1827 See merge request !9707
2017-07-27Merge branch 'backport-ee-2456' into 'master'Robert Speicher
Skip OAuth authorization for trusted applications See merge request !13061
2017-07-27Use `empty_project` where possible in spec/features/securityRobert Speicher
2017-07-27Use `empty_project` where possible in spec/features/merge_requestsRobert Speicher
2017-07-27Use `empty_project` where possible in spec/features/issuesRobert Speicher
2017-07-27Use `empty_project` where possible in spec/features/projectsRobert Speicher
2017-07-27Use `empty_project` where possible in spec/features/issuablesRobert Speicher
(It wasn't possible.)
2017-07-27Use `empty_project` where possible in spec/features/atomRobert Speicher
2017-07-27Use `empty_project` where possible in spec/features/profilesRobert Speicher
2017-07-27Use `empty_project` where possible in spec/features/exploreRobert Speicher
2017-07-27Use `empty_project` where possible in spec/features/groupsRobert Speicher
2017-07-27Use `empty_project` where possible in spec/features/adminRobert Speicher
2017-07-27Backport gitlab-ee!2456Oswaldo Ferreira
2017-07-27Merge branch 'feature/gpg-signed-commits' into 'master'Dmitriy Zaporozhets
GPG signed commits Closes #20268 See merge request !9546
2017-07-27Use `empty_project` where possible in spec/features/dashboardRobert Speicher
2017-07-27fetch gpg signature badges by ajaxAlexis Reigel
2017-07-27use short project path helpersAlexis Reigel
2017-07-27swap user's name and the user's usernameAlexis Reigel
2017-07-27show gpg key's user info when no profile existsAlexis Reigel
2017-07-27user may now revoke a gpg keyAlexis Reigel
other than just removing a key, which doesn't affect the verified state of a commit, revoking a key unverifies all signed commits.
2017-07-27improve spacing / alignments in gpg popupAlexis Reigel
2017-07-27use sign_in instead of login_withAlexis Reigel
2017-07-27remove the :gpg rspec tagAlexis Reigel
since everything (except the CurrentKeyChain method) operates on a tempoary keychain anyway we don't need this anymore.
2017-07-27use updated gitlab-test repo for signed commitsAlexis Reigel
2017-07-27add gpg commit popover badgesAlexis Reigel
2017-07-27perform signature update in sidekiq workerAlexis Reigel
2017-07-27update features specs for gpg commitsAlexis Reigel
2017-07-27add primary keyid attribute to gpg keysAlexis Reigel
2017-07-27remove gpg from keychain when user's email changesAlexis Reigel
2017-07-27gpg email verificationAlexis Reigel
2017-07-27test with a gpg key with multiple emailsAlexis Reigel
2017-07-27use example gpg key instead of my ownAlexis Reigel
2017-07-27feature spec for gpg signed commitsAlexis Reigel
2017-07-27add profile gpg key page to manage gpg keysAlexis Reigel
2017-07-27Remove superfluous lib: true, type: redis, service: true, models: true, ↵Rémy Coutable
services: true, no_db: true, api: true Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-27Remove superfluous type defs in specsKeifer Furzland
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-27Merge branch 'rc/35599-stop-the-bleeding-of-default_url_options' into 'master'Sean McGivern
Ensure the overriding of Gitlab::Application.routes.default_url_options is only local See merge request !13125
2017-07-27Merge branch '33601-add-csrf-token-verification-to-api' into 'master'Sean McGivern
Resolve "Add CSRF token verification to API" Closes #33601 See merge request !12154
2017-07-27Merge branch '35191-prioritized-labels-for-non-member' into 'master'Rémy Coutable
Remove help message about prioritized labels for non-members Closes #35191 See merge request !12912
2017-07-27Merge branch 'rc/fix-tests-factories' into 'master'Sean McGivern
Fix the :project factory by not copying the test repo twice See merge request !13123