summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dm-meer-blauw-op-straat' into 'master' Robert Speicher2017-02-2337-87/+92
|\ | | | | | | | | Enable (and disable) more RuboCops See merge request !9432
| * Revert "Enable Style/DotPosition"Douwe Maan2017-02-2343-223/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9. # Conflicts: # .rubocop.yml # .rubocop_todo.yml # lib/gitlab/ci/config/entry/global.rb # lib/gitlab/ci/config/entry/jobs.rb # spec/lib/gitlab/ci/config/entry/factory_spec.rb # spec/lib/gitlab/ci/config/entry/global_spec.rb # spec/lib/gitlab/ci/config/entry/job_spec.rb # spec/lib/gitlab/ci/status/build/factory_spec.rb # spec/lib/gitlab/incoming_email_spec.rb
| * Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-2381-627/+627
| | | | | | | | This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
| * Revert "Enable Style/BarePercentLiterals"Douwe Maan2017-02-235-15/+15
| | | | | | | | This reverts commit 96bef54154e669f9a3e92c3a4bc76c0be3a52e48.
| * 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
|\ \ | |/ |/| | | | | Fix reprocessing skipped jobs when retrying pipeline See merge request !9436
| * 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 host See merge request !9445
| * | Allow setting of a custom connection pool hostYorick Peterse2017-02-221-3/+18
| | | | | | | | | | | | | | | | | | | | | This allows you to set a custom host when calling Gitlab::Database.create_connection_pool. This is necessary for load balancing as in this case we want to inherit all settings except for the hostname.
* | | Merge branch 'zj-fix-slash-command-labels' into 'master' Douwe Maan2017-02-221-0/+15
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Chat slash commands show labels correctly Closes #28358 See merge request !9408
| * | 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 Badges Closes #26087 See merge request !9164
| * | Add AsciiDoc snippet for CI/CD BadgesJan Christophersen2017-02-201-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds CI/CD Badges Snippets for AsciiDoc as requested in #26087. I've however run into an issue in highlighting the snippet, it seems as if AsciiDoc is currently not being highlighted properly (displayed as plaintext) Add testcase for to_asciidoc Update test case for Badges list
* | | Hash concurrent foreign key names similar to Railshash-concurrent-foreign-key-namesYorick Peterse2017-02-211-0/+10
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was initially not implemented simply because I forgot about the size limit of constraint names in PostgreSQL (63 bytes). Using the old technique we can't add foreign keys for certain tables. For example, adding a foreign key on protected_branch_merge_access_levels.protected_branch_id would lead to the following key name: fk_protected_branch_merge_access_levels_protected_branches_protected_branch_id This key is 78 bytes long, thus violating the PostgreSQL size requirements. The hashing strategy is copied from Rails' foreign_key_name() method, which unfortunately is private and subject to change without notice.
* | GitHub Importer - Find users based on their email addressDouglas Barbosa Alexandre2017-02-205-14/+102
| | | | | | | | | | | | The returned email by the GitHub API is the user's publicly visible email address (or null if the user has not specified a public email address in their profile)
* | Truncate the DB in after(:all) test for ↵rc/backport-ee-fixRémy Coutable2017-02-171-5/+1
| | | | | | | | | | | | Gitlab::ImportExport::ProjectTreeRestorer Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '26500-informative-slack-notifications' into 'master' Kamil Trzciński2017-02-171-0/+26
|\ \ | | | | | | | | | | | | | | | | | | Adding links to user & build stage in a Build message Closes #26500 See merge request !8641
| * | 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 arguments Closes #28329 See merge request !9327
| * | | Allow slashes in slash command argumentsRémy Coutable2017-02-171-0/+8
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '26200-convert-sidebar-to-dropdown' into 'master'Sean McGivern2017-02-171-48/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Resolve "Update global sidebar to dropdown" Closes #26200 See merge request !9199
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up project_tree_restorer_spec Closes #28235 See merge request !9266
| * | | | 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 import webhooks performance issue Closes #27958 See merge request !9197
| * | | | fix tmpdirfix/import-hooksJames Lopez2017-02-161-1/+1
| | | | |
| * | | | Use gitlab shell import instead of manually creating the webhooksJames Lopez2017-02-161-0/+40
| | | | | | | | | | | | | | | | | | | | Also update repo restorer to use project wiki method.
* | | | | Merge branch 'fix-rdoc-xss' into 'security' Robert Speicher2017-02-151-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | Fix XSS in rdoc and other markups See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2058
* | | | | Merge branch 'asciidoctor-xss-patch' into 'security' Robert Speicher2017-02-151-0/+23
| |/ / / |/| | | | | | | | | | | | | | | Add sanitization filter to asciidocs output to prevent XSS See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2057
* | | | Merge branch 'master' into 'dz-nested-groups-improvements-3'Dmitriy Zaporozhets2017-02-141-0/+54
|\ \ \ \ | | | | | | | | | | | | | | | # Conflicts: # doc/api/projects.md
| * \ \ \ Merge branch 'create-connection-pool' into 'master' Yorick Peterse2017-02-141-0/+48
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Introduce Gitlab::Database.with_connection_pool See merge request !9192
| | * | | | 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
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ActiveRecord connection leaks Closes #27949 and gitlab-com/infrastructure#1139 See merge request !9109
| | * | | | Don't connect in Gitlab::Database.adapter_namefix-ar-connection-leaksYorick Peterse2017-02-131-0/+6
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | We don't need to connect when requesting the name of the database adapter. This in turn should prevent us from requesting/leaking connections just by asking whether we're using PostgreSQL or MySQL.
* | | | | Use Namespace#full_path instead of Namespace#pathDmitriy Zaporozhets2017-02-141-2/+3
|/ / / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status