summaryrefslogtreecommitdiff
path: root/spec/features
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into sh-headless-chrome-supportStan Hu2017-08-02363-2334/+5304
|\
| * Merge branch '35643-impersonate-spec' into '9-4-stable-patch-2'cherry-pick-41db362cRémy Coutable2017-07-281-1/+3
| * Merge branch '35599-fix-uncontrolled-default_url_options-overriding' into 'ma...Robert Speicher2017-07-282-17/+5
| |\
| | * Fix a spec that was assuming to be on the wrong page35599-fix-uncontrolled-default_url_options-overridingRémy Coutable2017-07-281-6/+4
| | * Ensure Gitlab::Application.routes.default_url_options are set correctly in Ca...Rémy Coutable2017-07-281-11/+1
| * | Merge branch 'rs-fix-master' into 'master'Robert Speicher2017-07-281-3/+3
| |\ \
| | * | Fix spec/features/projects/branches_specRobert Speicher2017-07-281-3/+3
| | |/
| * | 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 MRs from forksSean McGivern2017-07-281-0/+27
| * | Merge branch 'rs-empty_project-features' into 'master'Rémy Coutable2017-07-28148-213/+217
| |\ \
| | * | 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
| | * | 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 fails32483-jira-errorJarka Kadlecova2017-07-271-1/+1
| * | | Merge branch '1827-prevent-concurrent-editing-wiki' into 'master'Robert Speicher2017-07-271-1/+11
| |\ \ \
| | * | | Remove unnecessary codeHiroyuki Sato2017-07-261-1/+0
| | * | | Merge branch 'master' into 1827-prevent-concurrent-editing-wikiHiroyuki Sato2017-07-23361-5296/+15076
| | |\ \ \
| | * | | | 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
| |\ \ \ \ \
| | * | | | | Backport gitlab-ee!2456Oswaldo Ferreira2017-07-271-0/+5
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'feature/gpg-signed-commits' into 'master'Dmitriy Zaporozhets2017-07-272-0/+159
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | 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
| | * | | | 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
| | * | | | 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
| | * | | | add primary keyid attribute to gpg keysAlexis Reigel2017-07-271-2/+2
| | * | | | remove gpg from keychain when user's email changesAlexis Reigel2017-07-271-3/+13
| | * | | | gpg email verificationAlexis Reigel2017-07-271-9/+11
| | * | | | test with a gpg key with multiple emailsAlexis Reigel2017-07-271-2/+2
| | * | | | use example gpg key instead of my ownAlexis Reigel2017-07-271-4/+4
| | * | | | feature spec for gpg signed commitsAlexis Reigel2017-07-271-0/+32
| | * | | | add profile gpg key page to manage gpg keysAlexis Reigel2017-07-271-0/+40