summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Move the tests to repository_spec.rbuse-gitaly-commit-is-ancestorKim "BKC" Carlbäcker2017-03-152-11/+13
|
* Real tests :DKim "BKC" Carlbäcker2017-03-141-0/+11
|
* That apparently made no senseKim "BKC" Carlbäcker2017-03-141-2/+2
|
* ChangelogKim "BKC" Carlbäcker2017-03-141-0/+4
|
* One more testKim "BKC" Carlbäcker2017-03-141-1/+1
|
* Tests?Kim "BKC" Carlbäcker2017-03-142-2/+1
|
* Make GitLab use Gitaly for commit_is_ancestorKim "BKC" Carlbäcker2017-03-102-1/+22
|
* Use Gitaly for CommitController#showAhmad Sherif2017-03-0911-4/+184
|
* Merge branch 'storage-validation-improvement' into 'master' Sean McGivern2017-03-092-45/+63
|\ | | | | | | | | Improve storage validation after configuration structure update See merge request !9811
| * Improve storage validation after configuration structure updatestorage-validation-improvementAlejandro Rodríguez2017-03-082-45/+63
| | | | | | | | | | | | | | | | | | | | Besides improving the error message to specify what exactly you need to do to solve the error, we now don't skip all storage validations on the test environment, so that you also get a nice error message if you're running tests. Now if conditions are met to skip valitaions (test env or env variable) we still make sure the settings _look_ sane, we just skip verifying the paths exists and meet the given conditions.
* | Merge branch 'feature/gb/verbosify-blocked-pipeline-status' into 'master' Kamil Trzciński2017-03-097-4/+102
|\ \ | | | | | | | | | | | | | | | | | | Verbosify blocked pipeline status description Closes #29134 See merge request !9800
| * | Add specs for an extended blocked pipeline statusfeature/gb/verbosify-blocked-pipeline-statusGrzegorz Bizon2017-03-082-0/+50
| | |
| * | Adjust specs for core pipeline detailed statusesGrzegorz Bizon2017-03-082-3/+25
| | |
| * | Verbosify blocked pipeline status descriptionGrzegorz Bizon2017-03-083-1/+27
| | |
* | | Merge branch 'change-activity-view-wording' into 'master' Dmitriy Zaporozhets2017-03-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Change activity view wording See merge request !9777
| * | | Change activity view wordingchange-activity-view-wordingAnnabel Dunstone Gray2017-03-071-1/+1
| | | |
* | | | Merge branch 'move-u2f-bundle' into 'master' Alfredo Sumaran2017-03-094-4/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move u2f javascript library to webpack config See merge request !9755
| * | | | move u2f library to webpackmove-u2f-bundleMike Greiling2017-03-074-4/+3
| | | | |
* | | | | Merge branch '28402-fix-starred-projects-filter-wrong-message-on-no-results' ↵Rémy Coutable2017-03-093-10/+33
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix wrong message on starred projects filtering Closes #28402 See merge request !9488
| * | | | | Fix wrong message on starred projects filteringGeorge Andrinopoulos2017-03-093-10/+33
|/ / / / /
* | | | | Merge branch 'update-templates-9-0' into 'master' Robert Speicher2017-03-0929-51/+299
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update the gitignore and gitlab-ci templates for 9.0 See merge request !9824
| * | | | | Update the gitignore and gitlab-ci templates for 9.0DJ Mountney2017-03-0829-51/+299
| | | | | |
* | | | | | Merge branch 'remove-awards-handler-spec-timeout' into 'master' Clement Ho2017-03-091-3/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Remove timeout from awards_handler_spec.js See merge request !9822
| * | | | | Remove timeout from awards_handler_spec.jsremove-awards-handler-spec-timeout💃 Winnie 💃2017-03-081-3/+0
| | | | | |
* | | | | | Merge branch 'patch-13' into 'master' Rémy Coutable2017-03-081-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | specify where to finish database HA setup See merge request !9731
| * | | | | | specify where to finish database HA setupBen Bodenmiller2017-03-061-1/+3
| | | | | | |
* | | | | | | Merge branch 'patch-15' into 'master' Rémy Coutable2017-03-081-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed typo with project service documentation link See merge request !9708
| * | | | | | | Fixed typo with project service documentation linkMiguel2017-03-051-1/+1
| | | | | | | |
* | | | | | | | Merge branch '29034-fix-github-importer' into 'master' Douwe Maan2017-03-083-1/+41
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix name colision when importing GitHub pull requests from forked repositories Closes #29034 See merge request !9719
| * | | | | | | | Refactor some code29034-fix-github-importerGabriel Mazetto2017-03-082-2/+24
| | | | | | | | |
| * | | | | | | | ChangelogGabriel Mazetto2017-03-081-0/+4
| | | | | | | | |
| * | | | | | | | Fix name colision when importing GitHub pull requests from forked repositoriesGabriel Mazetto2017-03-082-1/+15
| | | | | | | | |
* | | | | | | | | Merge branch '29162-refactor-dropdown-milestone-spec' into 'master' Rémy Coutable2017-03-082-27/+35
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor dropdown_milestone_spec.rb Closes #29162 See merge request !9814
| * | | | | | | | | Refactor dropdown_milestone_spec.rbGeorge Andrinopoulos2017-03-082-27/+35
| | | | | | | | | |
* | | | | | | | | | Merge branch 'es6-class-issue' into 'master' Clement Ho2017-03-084-140/+135
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert Issue into ES6 class See merge request !9636
| * | | | | | | | | | Convert Issue into ES6 class (!9636)winniehell2017-03-084-140/+135
| |/ / / / / / / / /
* | | | | | | | | | Merge branch '29165-subscribe-btn' into 'master' Alfredo Sumaran2017-03-082-4/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove hidden text from subscribe button Closes #29165 See merge request !9790
| * | | | | | | | | | Remove hidden text from subscribe buttonAnnabel Dunstone Gray2017-03-082-4/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'rs-lower-capybara-timeout' into 'master' Rémy Coutable2017-03-082-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decrease Capybara timeout for CI environment Closes #29091 See merge request !9816
| * | | | | | | | | | Decrease Capybara timeout for CI environmentrs-lower-capybara-timeoutRobert Speicher2017-03-082-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'patch-14' into 'master' Rémy Coutable2017-03-081-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spell out what VIP is See merge request !9733
| * | | | | | | | | | spell out what VIP isBen Bodenmiller2017-03-061-3/+3
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix-scrolling-settings-tab' into 'master' Filipa Lacerda2017-03-081-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove extra space for settings dropdown See merge request !9788
| * | | | | | | | | | Remove extra space for settings dropdownfix-scrolling-settings-tabAnnabel Dunstone Gray2017-03-081-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '23220-fail-add-repo-explicitly' into 'master'Robert Speicher2017-03-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Raise an exception if creating a test repository fails See merge request !9815
| * | | | | | | | | | Raise an exception if creating a test repository failsNick Thomas2017-03-081-2/+2
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '29192-fix-emoji-node-modules-reference-for-unicode-versions' ↵Douwe Maan2017-03-083-2/+2382
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix reference to node_modules for emoji unicode versions Closes #29192 See merge request !9810
| * | | | | | | | | | Fix reference to node_modules in built packageEric Eastwood2017-03-083-2/+2382
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29192 See https://gitlab.slack.com/archives/frontend/p1488973548024005
* | | | | | | | | | | Merge branch 'patch-15' into 'master' Rémy Coutable2017-03-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update container_registry.md: fix private-docker link See merge request !9686
| * | | | | | | | | | Update container_registry.md: fix private-docker linkNeroBurner2017-03-031-1/+1
| | | | | | | | | | |