summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Don't persist ApplicationSetting in test envdont-persist-application-settings-in-test-envRémy Coutable2017-01-151-20/+48
* Merge branch '25018-gitlab-checks-changeaccess-looks-for-user-permissions-tha...Douwe Maan2017-01-141-3/+0
|\
| * Remove useless permission checks in Gitlab::Checks::ChangeAccess25018-gitlab-checks-changeaccess-looks-for-user-permissions-that-don-t-existRémy Coutable2017-01-121-3/+0
* | Merge branch '26587-metrics-middleware-endpoint-is-nil' into 'master' Yorick Peterse2017-01-141-0/+11
|\ \
| * | Check for env[Grape::Env::GRAPE_ROUTING_ARGS] instead of endpoint.route26587-metrics-middleware-endpoint-is-nilRémy Coutable2017-01-121-0/+11
| |/
* | Allow to use ENV variables in redis configSemyon Pupkov2017-01-131-1/+15
|/
* Merge branch 'zj-unadressable-url-variables' into 'master' Douwe Maan2017-01-122-17/+13
|\
| * Do not check for valid url for .gitlab-ci.ymlZ.J. van de Weg2017-01-052-17/+13
* | Add support for PlantUML diagrams in Asciidoc.Horacio Sanson2017-01-121-0/+4
* | Fix Rubocop offenses in LDAP related code and specGrzegorz Bizon2017-01-101-2/+2
* | Merge branch 'restore-backup-when-env-variable-is-passed' into 'master' Sean McGivern2017-01-101-16/+98
|\ \
| * | Restore backup correctly when "BACKUP" environment variable is passedrestore-backup-when-env-variable-is-passedAdam Niedzielski2017-01-091-16/+98
* | | Merge branch 'master' into auto-pipelines-vueRegis2017-01-095-13/+94
|\ \ \
| * \ \ Merge branch '19086-double-newline' into 'master' Sean McGivern2017-01-091-0/+8
| |\ \ \ | | |/ / | |/| |
| | * | Test newline and carraige return groupsJared Deckard2016-12-281-0/+8
| * | | Merge branch 'feature/log-ldap-to-application-log' into 'master' Rémy Coutable2017-01-091-8/+55
| |\ \ \
| | * | | fixup! Log messages when blocking/unblocking LDAP accountsMarkus Koller2016-12-201-1/+1
| | * | | Log messages when blocking/unblocking LDAP accountsMarkus Koller2016-12-201-8/+55
| * | | | Merge branch 'track_last_used_date_of_ssh_keys' into 'master' Sean McGivern2017-01-091-0/+1
| |\ \ \ \
| | * | | | Record and show last used date of SSH KeysVincent Wong2017-01-091-0/+1
| | | |/ / | | |/| |
| * | | | LDAP attributes needs default valuesDrew Blessing2017-01-062-5/+30
| | |_|/ | |/| |
* | | | Merge branch 'master' into auto-pipelines-vueFilipa Lacerda2017-01-0514-0/+3404
|\ \ \ \ | |/ / /
| * | | Ensure internal Gitlab::Git references use the namespacers-absorb-gitlab_gitRobert Speicher2017-01-042-2/+2
| * | | Absorb gitlab_gitRobert Speicher2017-01-0414-0/+3404
* | | | Merge branch 'master' into auto-pipelines-vueRegis2017-01-041-0/+44
|\ \ \ \ | |/ / /
| * | | Gitlab::LDAP::Person uses LDAP attributes configurationDrew Blessing2017-01-031-0/+44
* | | | fix pipelines/index.html.haml merge conflictRegis2017-01-027-22/+55
|\ \ \ \ | |/ / /
| * | | Merge branch 'issue_25682' into 'master' Sean McGivern2016-12-291-1/+11
| |\ \ \ | | |/ / | |/| |
| | * | Parse JIRA issue references even if Issue Tracker is disabledFelipe Artur2016-12-291-1/+11
| * | | Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' Douwe Maan2016-12-273-14/+29
| |\ \ \
| | * | | Use consistent names and move checks to the method,Lin Jen-Shin2016-12-202-4/+4
| | * | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-2063-369/+2212
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge CSSFilipa Lacerda2016-12-1222-6/+550
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-0629-208/+1043
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-2229-44/+1184
| | |\ \ \ \ \
| | * | | | | | Fix an old copypasta: internal -> privateLin Jen-Shin2016-11-181-1/+1
| | * | | | | | We never check user privilege if it's a deploy keyLin Jen-Shin2016-11-181-18/+0
| | * | | | | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-1731-120/+317
| | |\ \ \ \ \ \
| | * | | | | | | Introduce no_user_or_blocked? and fix tests due toLin Jen-Shin2016-11-161-2/+10
| | * | | | | | | Fix a typo: acccess -> accessLin Jen-Shin2016-11-111-1/+1
| | * | | | | | | Add more tests and fix write to project checkLin Jen-Shin2016-11-111-7/+31
| | * | | | | | | Correct the test. Not sure why change it in the first placeLin Jen-Shin2016-11-111-1/+1
| | * | | | | | | Mark DeployKey#can_push a safe attributeLin Jen-Shin2016-11-111-1/+2
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-10121-625/+5677
| | |\ \ \ \ \ \ \
| | * | | | | | | | Allow to add deploy keys with write-accessAli Ibrahim2016-08-171-4/+7
| * | | | | | | | | Merge branch 'bugfix/outlook-language-parsing' into 'master' Douwe Maan2016-12-271-2/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Revert "allow empty-quotes"http://jneen.net/2016-12-211-17/+2
| | * | | | | | | | | allow empty-quoteshttp://jneen.net/2016-12-211-2/+17
| | * | | | | | | | | remove trailing whitespace from email bodieshttp://jneen.net/2016-12-211-1/+1
| | * | | | | | | | | switch to email_reply_trimmer from discoursehttp://jneen.net/2016-12-211-3/+1