summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-meer-blauw-op-straat' into 'master' Robert Speicher2017-02-2337-87/+92
|\
| * Revert "Enable Style/DotPosition"Douwe Maan2017-02-2343-223/+223
| * Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-2381-627/+627
| * Revert "Enable Style/BarePercentLiterals"Douwe Maan2017-02-235-15/+15
| * Fix new offensesDouwe Maan2017-02-236-27/+29
| * Enable Rails/DelegateDouwe Maan2017-02-231-3/+1
| * Enable Style/WordArrayDouwe Maan2017-02-2312-39/+37
| * Enable Style/MultilineHashBraceLayoutDouwe Maan2017-02-232-2/+4
| * Enable Style/MultilineArrayBraceLayoutDouwe Maan2017-02-234-14/+17
| * Enable Style/EmptyLineBetweenDefsDouwe Maan2017-02-231-0/+2
| * Prefer leading style for Style/DotPositionDouwe Maan2017-02-2381-615/+615
| * Fix another specDouwe Maan2017-02-231-1/+1
| * Fix code for copsDouwe Maan2017-02-236-15/+15
| * Fix specsDouwe Maan2017-02-233-6/+6
| * Enable Style/ColonMethodCallDouwe Maan2017-02-238-10/+10
| * Enable Style/BarePercentLiteralsDouwe Maan2017-02-235-15/+15
| * Enable Lint/UnifiedIntegerDouwe Maan2017-02-234-7/+7
| * Enable Style/SpaceInsideBracketsDouwe Maan2017-02-236-9/+9
| * Enable Style/DotPositionDouwe Maan2017-02-2342-211/+211
* | Merge branch 'fix/gb/pipeline-retry-skipped-jobs' into 'master' Kamil Trzciński2017-02-231-3/+16
|\ \ | |/ |/|
| * Add basic specs for optimistic locking mixinGrzegorz Bizon2017-02-231-3/+16
* | Merge branch 'connection-pool-host' into 'master'Rémy Coutable2017-02-221-3/+18
|\ \
| * | Allow setting of a custom connection pool hostYorick Peterse2017-02-221-3/+18
* | | Merge branch 'zj-fix-slash-command-labels' into 'master' Douwe Maan2017-02-221-0/+15
|\ \ \ | |/ / |/| |
| * | Chat slash commands show labels correctlyzj-fix-slash-command-labelsZ.J. van de Weg2017-02-211-0/+15
* | | Merge branch '26087-asciidoc-cicd-badges-snippet' into 'master'Rémy Coutable2017-02-221-0/+10
|\ \ \ | |_|/ |/| |
| * | Add AsciiDoc snippet for CI/CD BadgesJan Christophersen2017-02-201-0/+10
* | | Hash concurrent foreign key names similar to Railshash-concurrent-foreign-key-namesYorick Peterse2017-02-211-0/+10
| |/ |/|
* | GitHub Importer - Find users based on their email addressDouglas Barbosa Alexandre2017-02-205-14/+102
* | Truncate the DB in after(:all) test for Gitlab::ImportExport::ProjectTreeRest...rc/backport-ee-fixRémy Coutable2017-02-171-5/+1
* | Merge branch '26500-informative-slack-notifications' into 'master' Kamil Trzciński2017-02-171-0/+26
|\ \
| * | Adding links to user & build in Chat NotificationsPoornima M2017-01-251-0/+26
* | | Merge branch '28329-allow-slash-in-slash-command-args' into 'master'Sean McGivern2017-02-171-0/+8
|\ \ \
| * | | Allow slashes in slash command argumentsRémy Coutable2017-02-171-0/+8
* | | | Merge branch '26200-convert-sidebar-to-dropdown' into 'master'Sean McGivern2017-02-171-48/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove all gitlab theme related codeAnnabel Dunstone Gray2017-02-151-48/+0
* | | | Merge branch 'fix/project-tree-restorer-spec-performance' into 'master' Robert Speicher2017-02-162-95/+122
|\ \ \ \
| * | | | refactored a couple of thingsfix/project-tree-restorer-spec-performanceJames Lopez2017-02-161-12/+9
| * | | | create lighter version of JSON and reuse initial restore in spec to speed up runJames Lopez2017-02-152-91/+121
* | | | | Merge branch 'fix/import-hooks' into 'master' Rémy Coutable2017-02-161-0/+40
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix tmpdirfix/import-hooksJames Lopez2017-02-161-1/+1
| * | | | Use gitlab shell import instead of manually creating the webhooksJames Lopez2017-02-161-0/+40
* | | | | Merge branch 'fix-rdoc-xss' into 'security' Robert Speicher2017-02-151-0/+22
* | | | | Merge branch 'asciidoctor-xss-patch' into 'security' Robert Speicher2017-02-151-0/+23
| |/ / / |/| | |
* | | | Merge branch 'master' into 'dz-nested-groups-improvements-3'Dmitriy Zaporozhets2017-02-141-0/+54
|\ \ \ \
| * \ \ \ Merge branch 'create-connection-pool' into 'master' Yorick Peterse2017-02-141-0/+48
| |\ \ \ \
| | * | | | Have some simple way to create connection poolLin Jen-Shin2017-02-141-0/+48
| * | | | | Merge branch 'fix-ar-connection-leaks' into 'master'Rémy Coutable2017-02-141-0/+6
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Don't connect in Gitlab::Database.adapter_namefix-ar-connection-leaksYorick Peterse2017-02-131-0/+6
| | | |_|/ | | |/| |
* | | | | Use Namespace#full_path instead of Namespace#pathDmitriy Zaporozhets2017-02-141-2/+3
|/ / / /