summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '42290-pass-BUNDLE_PATH' into 'master'Rémy Coutable2018-01-291-1/+5
|\
| * Pass BUNDLE_PATH to install to the same path for test42290-pass-BUNDLE_PATHLin Jen-Shin2018-01-261-1/+5
* | Merge branch 'generalize-js-toggle-buttons' into 'master'Filipa Lacerda2018-01-267-86/+141
|\ \
| * | Generalize toggle_buttons.jsgeneralize-js-toggle-buttonsEric Eastwood2018-01-267-86/+141
* | | Fix spec failures in issues_spec.rbAhmad Sherif2018-01-261-2/+2
* | | update code based on feedback42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-errorJames Lopez2018-01-261-2/+2
* | | fix specJames Lopez2018-01-261-1/+1
* | | add specJames Lopez2018-01-261-0/+13
* | | add an extra specJames Lopez2018-01-261-1/+5
* | | fix validation error on servicesJames Lopez2018-01-261-1/+1
| |/ |/|
* | Merge branch 'fl-mr-widget-components' into 'master'Phil Hughes2018-01-262-151/+103
|\ \
| * \ Merge branch 'master' into fl-mr-widget-componentsFilipa Lacerda2018-01-2517-89/+188
| |\ \
| * | | Moves components into vue files:fl-mr-widget-componentsFilipa Lacerda2018-01-252-151/+103
* | | | Merge branch 'winh-check-axios-restore' into 'master'Filipa Lacerda2018-01-261-0/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | Make sure that axios adapater is restored after mockingwinh-check-axios-restoreWinnie Hellmann2018-01-251-0/+10
* | | | Fix rubocop offenses introduced in !16623Ahmad Sherif2018-01-251-2/+7
* | | | Merge branch 'feature/migrate-repo-restorer-to-gitaly' into 'master'Robert Speicher2018-01-251-0/+36
|\ \ \ \
| * | | | Migrate restoring repo from bundle to Gitalyfeature/migrate-repo-restorer-to-gitalyAhmad Sherif2018-01-241-0/+36
* | | | | Merge branch 'move-users-spinach-tests-to-rspec' into 'master'Robert Speicher2018-01-251-0/+107
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Move user page spinach tests to RSpecSemyon Pupkov2018-01-251-0/+107
* | | | | Merge branch 'lint-rugged' into 'master'Rémy Coutable2018-01-252-21/+13
|\ \ \ \ \
| * | | | | Look for rugged with static analysislint-ruggedJacob Vosmaer2018-01-252-21/+13
* | | | | | Merge branch '40028-special-characters-on-issuable-templates' into 'master'Rémy Coutable2018-01-251-2/+2
|\ \ \ \ \ \
| * | | | | | Handle special characters on API request of issuable templatesTakuya Noguchi2018-01-251-2/+2
* | | | | | | Merge branch 'update-secret-values-to-support-dynamic-elements' into 'master'Filipa Lacerda2018-01-251-14/+96
|\ \ \ \ \ \ \
| * | | | | | | Update secret_values to support dynamic elements within parentupdate-secret-values-to-support-dynamic-elementsEric Eastwood2018-01-241-14/+96
| |/ / / / / /
* | | | | | | Merge branch 'fix/batch-lfs-pointers-accepting-lazy-enum' into 'master'Grzegorz Bizon2018-01-251-0/+15
|\ \ \ \ \ \ \
| * | | | | | | Fix .batch_lfs_pointers accepting a lazy enumeratorfix/batch-lfs-pointers-accepting-lazy-enumAhmad Sherif2018-01-251-0/+15
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '42377-fix-merge-request-can-be-reverted' into 'master'Rémy Coutable2018-01-251-2/+12
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Look at notes created just before merge when deciding if an MR can be revertedNick Thomas2018-01-251-2/+12
* | | | | | | Merge branch 'default-to-https-for-gravatar-urls' into 'master'Rémy Coutable2018-01-2511-50/+50
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Default to HTTPS for all Gravatar URLsdefault-to-https-for-gravatar-urlsAchilleas Pipinellis2018-01-2511-50/+50
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'fl-more-mr-widget' into 'master'Phil Hughes2018-01-253-33/+78
|\ \ \ \ \ \
| * | | | | | Update missing pathsfl-more-mr-widgetFilipa Lacerda2018-01-251-2/+2
| * | | | | | Merge branch 'master' into fl-more-mr-widgetFilipa Lacerda2018-01-2544-235/+511
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Moves status icon into a vue file and adds testsFilipa Lacerda2018-01-243-33/+78
* | | | | | | Merge branch 'winh-delete-milestone-modal' into 'master'Phil Hughes2018-01-251-0/+95
|\ \ \ \ \ \ \
| * | | | | | | Add modal for deleting a milestonewinh-delete-milestone-modalWinnie Hellmann2018-01-251-0/+95
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'revert-430b3f0e' into 'master'Douwe Maan2018-01-251-0/+38
|\ \ \ \ \ \ \
| * | | | | | | Revert "Merge branch 'remove-rugged-walk' into 'master'"revert-430b3f0eJacob Vosmaer (GitLab)2018-01-251-0/+38
| |/ / / / / /
* | | | | | | Merge branch 'jej/gitattributes-check-at-ref' into 'master'Rémy Coutable2018-01-254-26/+100
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Can parse root .gitattributes file for a refjej/gitattributes-check-at-refJames Edwards-Jones2018-01-244-26/+100
* | | | | | | Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service"Fabio Busatto2018-01-251-4/+4
* | | | | | | Merge branch '42161-gitaly-commitservice-encoding-undefinedconversionerror-u-...Rémy Coutable2018-01-251-0/+23
|\ \ \ \ \ \ \
| * | | | | | | Make sure we're passing ASCII-8BIT to Gitaly42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bitLin Jen-Shin2018-01-231-0/+23
* | | | | | | | Merge branch 'fl-mr-widget-refactor' into 'master'Phil Hughes2018-01-253-153/+127
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Moves more mr widget components into vue filesfl-mr-widget-refactorFilipa Lacerda2018-01-243-153/+127
| | |_|_|/ / / | |/| | | | |
* | | | | | | Add a gRPC health check to ensure Gitaly is upsh-add-gitaly-health-checkStan Hu2018-01-243-0/+123
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'fix/add-formatted-data-to-wiki-page' into 'master'Robert Speicher2018-01-241-0/+11
|\ \ \ \ \ \
| * | | | | | Add formatted_data attribute to Git::WikiPageAhmad Sherif2018-01-241-0/+11
| | |_|_|_|/ | |/| | | |