summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'disable-project-export' into 'master'Rémy Coutable2017-08-114-2/+131
|\
| * Add option to disable project export on instanceRobin Bobbitt2017-08-114-2/+131
* | Merge branch 'rs-coverage-updates' into 'master'Rémy Coutable2017-08-111-9/+16
|\ \
| * | Better categorize test coverage resultsrs-coverage-updatesRobert Speicher2017-08-111-9/+16
| |/
* | Merge branch '32004-use-timecop-safe-mode' into 'master'Robert Speicher2017-08-118-48/+26
|\ \
| * | Enable Timecop safe mode32004-use-timecop-safe-modeRémy Coutable2017-08-118-48/+26
* | | Merge branch 'broadcast-messages-cache' into 'master'Sean McGivern2017-08-111-1/+19
|\ \ \
| * | | Better caching and indexing of broadcast messagesYorick Peterse2017-08-111-1/+19
| | |/ | |/|
* | | Merge branch '36213-return-is_admin-in-users-api-when-current_user-is-admin' ...Sean McGivern2017-08-111-0/+10
|\ \ \
| * | | Include the `is_admin` field in the `GET /users/:id` API when current user is...Rémy Coutable2017-08-111-0/+10
* | | | Merge branch '35435-pending-delete-project-error-in-admin-interface-fix' into...Douwe Maan2017-08-112-0/+18
|\ \ \ \
| * | | | Pending delete projects no longer return 500 error in Admins projects view35435-pending-delete-project-error-in-admin-interface-fixTiago Botelho2017-08-112-0/+18
* | | | | Merge branch 'rc/32308-rspec-retry-hack' into 'master'Sean McGivern2017-08-115-12/+377
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Use a new RspecFlakyListener to detect flaky specsRémy Coutable2017-08-115-12/+377
| | |_|/ | |/| |
* | | | Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-1123-69/+1125
|\ \ \ \
| * | | | Use a specialized class for querying eventsYorick Peterse2017-08-102-0/+73
| * | | | Migrate events into a new formatYorick Peterse2017-08-1021-69/+1052
* | | | | Merge branch 'appearances-caching-and-schema' into 'master'Sean McGivern2017-08-111-0/+35
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Cache Appearance instances in Redisappearances-caching-and-schemaYorick Peterse2017-08-101-0/+35
* | | | | Merge branch '36328-deserializemergerequestdiffsandcommits-fails-due-to-null-...Yorick Peterse2017-08-111-0/+11
|\ \ \ \ \
| * | | | | Fix merge request diff deserialisation when too_large was absentSean McGivern2017-08-111-0/+11
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs-rspec-hook-argument-cop' into 'master'Rémy Coutable2017-08-1156-80/+80
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Enable the RSpec/HookArgument cop and auto-correct offensesRobert Speicher2017-08-1056-80/+80
| |/ / /
* | | | Remove an unnecessary `let` in spec/features/projects/user_edits_files_spec.rbMehdi Lahmam2017-08-111-5/+4
|/ / /
* | | Fix Layout/SpaceBeforeBlockBraces violation in bin/changelog_specRobert Speicher2017-08-101-1/+1
* | | Merge branch 'jej/security-release-2017-08-10' into 'master'Stan Hu2017-08-102-0/+39
|\ \ \
| * | | Merge branch 'rs-alphanumeric-ssh-params' into 'security-9-4'jej/security-release-2017-08-10James Edwards-Jones2017-08-101-0/+34
| * | | Merge branch 'import-symlinks-9-3' into 'security-9-3'James Edwards-Jones2017-08-101-0/+5
| | |/ | |/|
* | | Merge branch '21949-add-type-to-changelog' into 'master'Robert Speicher2017-08-101-32/+66
|\ \ \
| * | | Let's start labeling our CHANGELOG entriesJacopo2017-07-221-32/+66
* | | | Merge branch 'rc/improve-projects-factory' into 'master'Robert Speicher2017-08-106-196/+130
|\ \ \ \
| * | | | Fix and improve spec/controllers/autocomplete_controller_spec.rbrc/improve-projects-factoryRémy Coutable2017-08-101-77/+56
| * | | | Improve the Project factory to make `creator` defaults to namespace.ownerRémy Coutable2017-08-105-119/+74
* | | | | Merge branch 'breakpoint-checker-performance' into 'master'Filipa Lacerda2017-08-102-1/+16
|\ \ \ \ \
| * | | | | removed global use of breakpoint checkerbreakpoint-checker-performancePhil Hughes2017-08-101-1/+1
| * | | | | Increase performance of the breakpoint size checkerPhil Hughes2017-08-101-0/+15
| | |_|_|/ | |/| | |
* | | | | Merge branch 'rs-fix-stubbed-user-factory' into 'master'Rémy Coutable2017-08-101-0/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Manually assign `notification_email` in the User factory when stubbedrs-fix-stubbed-user-factoryRobert Speicher2017-08-081-0/+4
* | | | | Merge branch 'mk-fix-case-insensitive-redirect-matching' into 'master'Sean McGivern2017-08-102-26/+60
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix stylemk-fix-case-insensitive-redirect-matchingMichael Kozono2017-08-091-3/+3
| * | | | Fix conflicting redirect searchMichael Kozono2017-08-082-26/+60
| |/ / /
* | | | Merge branch 'fly-out-fix-hiding' into 'master'Filipa Lacerda2017-08-101-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Removed display styles when hiding the fly out navigationfly-out-fix-hidingPhil Hughes2017-08-091-1/+1
* | | | Merge branch 'gitaly-repository-exists' into 'master'32665-make-project-and-features-visibility-settings-less-confusingSean McGivern2017-08-091-19/+0
|\ \ \ \
| * | | | Rename RPC 'Exists' to 'RepositoryExists'Jacob Vosmaer2017-08-091-19/+0
* | | | | Merge branch '36003-do-not-include-to-kernel' into 'master'Robert Speicher2017-08-094-20/+25
|\ \ \ \ \
| * | | | | Properly set the expectation on the main object36003-do-not-include-to-kernelLin Jen-Shin2017-08-093-19/+23
| * | | | | We shouldn't include utility methods everywhereLin Jen-Shin2017-08-081-1/+2
* | | | | | Prevent user from changing username with container registry tagsMichael Kozono2017-08-092-1/+12
| |/ / / / |/| | | |
* | | | | Merge branch 'rc/enable-the-Layout/SpaceBeforeBlockBraces-cop' into 'master'Robert Speicher2017-08-0966-135/+135
|\ \ \ \ \ | |_|/ / / |/| | | |