summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Rename commit to pipeline in TriggerRequestKamil Trzcinski2016-06-092-2/+2
* Merge branch 'saml-ldap-link-flow' into 'master' Douwe Maan2016-06-091-0/+18
|\
| * Syntax fixes and better logging around the `ldap_person` method.saml-ldap-link-flowPatricio Cano2016-06-081-2/+1
| * Moved `find_or_create_ldap_user` method to parent class and added logging.Patricio Cano2016-06-071-1/+1
| * Adjust the SAML control flow to allow LDAP identities to be added to an exist...Patricio Cano2016-06-061-0/+19
* | Merge branch 'make-omniauth-tests-to-not-modify-global-state' into 'master' Yorick Peterse2016-06-0911-11/+11
|\ \
| * | Remove require_relative 'import_spec_helper'make-omniauth-tests-to-not-modify-global-stateKamil Trzcinski2016-06-086-6/+0
| * | Move ImportSpecHelper to spec/support/Kamil Trzcinski2016-06-081-0/+0
| * | Make Omniauth providers specs to not modify global configurationKamil Trzcinski2016-06-085-5/+11
* | | Merge branch '18019-fix-wiki-linking' into 'master' Rémy Coutable2016-06-096-88/+117
|\ \ \
| * | | Hook up the updated `WikiLinkFilter` to the wiki controllers.Timothy Andrew2016-06-093-2/+8
| * | | Implement the correct linking behaviour in `WikiLinkFilter`.Timothy Andrew2016-06-093-86/+109
* | | | Combine tests for internal linksAlfredo Sumaran2016-06-081-4/+4
* | | | Set target="_blank" for external linksAlfredo Sumaran2016-06-082-1/+11
* | | | Merge branch '17960-issues-api-endpoint-performs-poorly' into 'master' Yorick Peterse2016-06-081-0/+26
|\ \ \ \
| * | | | Fix pseudo n+1 queries with Note and Note Authors in issuables APIsAlejandro Rodríguez2016-06-081-0/+26
| | |/ / | |/| |
* | | | Merge branch 'remove-labels-from-filter' into 'master' Jacob Schatz2016-06-081-0/+35
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed issue with dropdown toggle not updatingremove-labels-from-filterPhil Hughes2016-06-081-0/+25
| * | | Removable labels from filtered issuables label barPhil Hughes2016-06-081-0/+10
* | | | Merge branch 'git-http-controller' into 'master' Rémy Coutable2016-06-084-219/+362
|\ \ \ \
| * | | | Add parenthesesJacob Vosmaer2016-06-081-4/+4
| * | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt...Jacob Vosmaer2016-06-08104-1038/+4117
| |\ \ \ \ | | |/ / /
| * | | | Fix testsJacob Vosmaer2016-06-061-1/+1
| * | | | Changes after more review from RémyJacob Vosmaer2016-06-031-4/+4
| * | | | Rename finder to find_in_gitlab_or_ldapJacob Vosmaer2016-06-021-8/+8
| * | | | Merge branch 'master' into git-http-controllerJacob Vosmaer2016-06-02339-2818/+11507
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Rubocop and whitespaceJacob Vosmaer2016-05-021-1/+1
| * | | | Make CI/Oauth/rate limiting reusableJacob Vosmaer2016-04-291-9/+47
| * | | | Specify that oauth cannot push codeJacob Vosmaer2016-04-291-0/+19
| * | | | Remove trivial 'let'Jacob Vosmaer2016-04-221-6/+5
| * | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt...Jacob Vosmaer2016-04-1544-267/+1456
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt...Jacob Vosmaer2016-04-1289-375/+2727
| |\ \ \ \ \
| * | | | | | More tests, better descriptionsJacob Vosmaer2016-04-061-12/+27
| * | | | | | RubocopJacob Vosmaer2016-04-061-2/+2
| * | | | | | Add some upload specsJacob Vosmaer2016-03-241-3/+60
| * | | | | | Whitespace!Jacob Vosmaer2016-03-241-2/+2
| * | | | | | Spec Www-AuthenticateJacob Vosmaer2016-03-241-0/+6
| * | | | | | Remove useless "describe"Jacob Vosmaer2016-03-241-120/+117
| * | | | | | Add test for gitlab_shell.upload_pack config settingJacob Vosmaer2016-03-241-1/+14
| * | | | | | Whitespace, remove unused methodJacob Vosmaer2016-03-241-14/+10
| * | | | | | Test both GET and POST for git-upload-packJacob Vosmaer2016-03-241-45/+67
| * | | | | | Test Grack::Auth via a request specJacob Vosmaer2016-03-231-90/+71
* | | | | | | Merge branch 'fix-endless-redirect' into 'master' Rémy Coutable2016-06-081-0/+29
|\ \ \ \ \ \ \
| * | | | | | | Fix endless redirections when accessing user OAuth applications when they are...Stan Hu2016-06-081-0/+29
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'fix-markdown-spec' into 'master' Stan Hu2016-06-081-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix markdown_spec to not use `before(:all)` in order to properly cleanup data...Kamil Trzcinski2016-06-071-2/+2
* | | | | | | | Merge branch 'test-for-ci_authorized_runners' into 'master' Douwe Maan2016-06-081-4/+84
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a blank line between before and it:Lin Jen-Shin2016-06-071-0/+3
| * | | | | | | | Avoid using subject and is_expected.to:Lin Jen-Shin2016-06-071-5/+8
| * | | | | | | | Prefer do and end for before/after:Lin Jen-Shin2016-06-071-7/+21