summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-...Lin Jen-Shin2017-08-1156-83/+93
|\
| * 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
| |/
* | Just use repository would fix the testLin Jen-Shin2017-08-111-4/+1
* | Just use the repo. Not sure why master could passLin Jen-Shin2017-08-111-2/+2
* | Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-...Lin Jen-Shin2017-08-1187-431/+499
|\ \ | |/
| * 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
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-0966-135/+135
| * | | | | Add a helper to stub storage settings with defaultsbvl-port-storage-spec-helpers-from-eeBob Van Landuyt2017-08-091-0/+11
| |/ / / /
* | | | | Fix more testsLin Jen-Shin2017-08-117-119/+120
* | | | | Don't try to create diffs if one of the branch is missingLin Jen-Shin2017-08-105-19/+16
* | | | | Introduce MergeRequest#write_ref and Repository#write_refLin Jen-Shin2017-08-103-15/+18
* | | | | Fix some tests and report the error messageLin Jen-Shin2017-08-097-10/+27
* | | | | Fake out Repository#fetch_ref for merge request ifLin Jen-Shin2017-08-092-3/+12
* | | | | Detect if we didn't create the ref soonerLin Jen-Shin2017-08-091-0/+21
|/ / / /
* | | | Restore blob fixture for JavaScript testswinh-restore-blob-fixturewinh2017-08-081-0/+29
* | | | Fix fly-out navigation not showing for active items in collapsed sidebarPhil Hughes2017-08-081-3/+53
| |/ / |/| |
* | | Merge branch '36168-fix-transient-preferences-specs' into 'master'Sean McGivern2017-08-081-12/+16
|\ \ \
| * | | Fix Profile > Preferences feature specs36168-fix-transient-preferences-specsRémy Coutable2017-08-081-12/+16
* | | | Merge branch '36169-fix-master' into 'master'Sean McGivern2017-08-081-13/+8
|\ \ \ \
| * | | | Fix a broken Events API spec36169-fix-masterRémy Coutable2017-08-081-13/+8
| | |/ / | |/| |
* | | | Merge branch 'gitaly-bundle-gemfile' into 'master'Rémy Coutable2017-08-081-1/+1
|\ \ \ \