summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Restore backup correctly when "BACKUP" environment variable is passedrestore-backup-when-env-variable-is-passedAdam Niedzielski2017-01-091-16/+98
* 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
* | | Ensure internal Gitlab::Git references use the namespacers-absorb-gitlab_gitRobert Speicher2017-01-042-2/+2
* | | Absorb gitlab_gitRobert Speicher2017-01-0414-0/+3404
* | | Gitlab::LDAP::Person uses LDAP attributes configurationDrew Blessing2017-01-031-0/+44
|/ /
* | 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-2050-357/+1641
| |\ \ | | |/
| * | Merge CSSFilipa Lacerda2016-12-1219-2/+530
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-0616-48/+224
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-2227-42/+1063
| |\ \ \ \
| * | | | | 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-1079-401/+4574
| |\ \ \ \ \ \
| * | | | | | | 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
* | | | | | | | | Fix MR with files hidden by .gitattributes25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourcemap-fileSean McGivern2016-12-261-5/+14
* | | | | | | | | Merge branch 'feature/more-storage-statistics' into 'master' Sean McGivern2016-12-261-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add more storage statisticsMarkus Koller2016-12-211-0/+1
* | | | | | | | | | Fix errorcode 500 on slash commandszj-fix-issue-search-chat-commandZ.J. van de Weg2016-12-231-0/+24
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch '25908-fix-grape-after-update' into 'master' Yorick Peterse2016-12-211-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Use Grape's new Route methods25908-fix-grape-after-updateRémy Coutable2016-12-211-2/+2
* | | | | | | | | Merge branch 'multipart-uploaded-file' into 'master' Rémy Coutable2016-12-211-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Inject ::UploadedFile from Multipart middlewareJacob Vosmaer2016-12-211-3/+3
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Fix error importing label priorities and added relevant specJames Lopez2016-12-211-0/+22
* | | | | | | | Rename MattermostNotificationService back to MattermostServicefix/25843Douglas Barbosa Alexandre2016-12-201-1/+1
* | | | | | | | Rename SlackNotificationService back to SlackServiceDouglas Barbosa Alexandre2016-12-201-1/+1
|/ / / / / / /
* | | | | | | Merge branch '22348-gitea-importer' into 'master' Rémy Coutable2016-12-207-180/+450
|\ \ \ \ \ \ \
| * | | | | | | Add Project#gitea_import?22348-gitea-importerRémy Coutable2016-12-191-1/+1
| * | | | | | | Improve Gitlab::ImportSourcesRémy Coutable2016-12-191-0/+94
| * | | | | | | Modify GithubImport to support GiteaRémy Coutable2016-12-196-180/+356
* | | | | | | | Merge branch '22864-kubernetes-deploy-with-terminal' into 'master' Kamil Trzciński2016-12-202-0/+75
|\ \ \ \ \ \ \ \
| * | | | | | | | Add terminals to the Kubernetes deployment serviceNick Thomas2016-12-192-0/+75
* | | | | | | | | Merge branch '25848-fix-git-rev-list-env-parsing' into 'master' Sean McGivern2016-12-201-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Reject blank environment vcariables in Gitlab::Git::RevList25848-fix-git-rev-list-env-parsingRémy Coutable2016-12-201-0/+7