Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | update code based on feedback42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-error | James Lopez | 2018-01-26 | 7 | -7/+16 |
* | add changelog | James Lopez | 2018-01-26 | 1 | -0/+6 |
* | fix spec | James Lopez | 2018-01-26 | 1 | -1/+1 |
* | add spec | James Lopez | 2018-01-26 | 3 | -1/+14 |
* | disable retry attempts for Import/Export until that is fixed | James Lopez | 2018-01-26 | 3 | -2/+13 |
* | add an extra spec | James Lopez | 2018-01-26 | 1 | -1/+5 |
* | fix validation error on services | James Lopez | 2018-01-26 | 5 | -4/+6 |
* | Merge branch 'fl-mr-widget-components' into 'master' | Phil Hughes | 2018-01-26 | 7 | -355/+357 |
|\ | |||||
| * | Adds missing i18n | Filipa Lacerda | 2018-01-26 | 1 | -2/+2 |
| * | Merge branch 'master' into fl-mr-widget-components | Filipa Lacerda | 2018-01-25 | 56 | -272/+451 |
| |\ | |||||
| * | | Moves components into vue files:fl-mr-widget-components | Filipa Lacerda | 2018-01-25 | 7 | -355/+357 |
* | | | Merge branch '42420-follow-up-from-resolve-asset-was-not-declared-to-be-preco... | Grzegorz Bizon | 2018-01-26 | 6 | -13/+29 |
|\ \ \ | |||||
| * | | | Port some non-EE-specific config/ changes to CE42420-follow-up-from-resolve-asset-was-not-declared-to-be-precompiled-in-production-favicon-green-ico | Rémy Coutable | 2018-01-25 | 6 | -13/+29 |
* | | | | Merge branch 'qa/ee-4698-backport' into 'master' | Grzegorz Bizon | 2018-01-26 | 8 | -15/+92 |
|\ \ \ \ | |||||
| * | | | | Pick EE for qa/qa/page/menu/side.rbqa/ee-4698-backport | Lin Jen-Shin | 2018-01-26 | 1 | -0/+1 |
| * | | | | Pick the EE version for this file | Lin Jen-Shin | 2018-01-26 | 1 | -5/+5 |
| * | | | | Merge remote-tracking branch 'upstream/master' into qa/ee-4698-backport | Lin Jen-Shin | 2018-01-26 | 9 | -4/+139 |
| |\ \ \ \ | |||||
| * | | | | | Backport QA changes from EE | Gabriel Mazetto | 2018-01-26 | 8 | -11/+87 |
* | | | | | | Merge branch 'filipefreire_155' into 'master' | Rémy Coutable | 2018-01-26 | 4 | -0/+43 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into filip... | Filipe Freire | 2018-01-25 | 1 | -2/+7 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into filip... | Filipe Freire | 2018-01-25 | 969 | -9131/+15572 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | improve push events selector in activity.rb | Filipe Freire | 2018-01-18 | 1 | -5/+1 |
| * | | | | | | | improve interaction with activity on side.rb | Filipe Freire | 2018-01-18 | 1 | -1/+3 |
| * | | | | | | | improvements after CR | Filipe Freire | 2018-01-16 | 5 | -28/+14 |
| * | | | | | | | Merge branch 'filipefreire_155' of https://gitlab.com/filipefreire/gitlab-ce ... | Filipe Freire | 2018-01-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into filip... | Filipe Freire | 2018-01-16 | 256 | -2086/+4021 |
| | |\ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ | Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into filip... | Filipe Freire | 2018-01-16 | 256 | -2086/+4021 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| / / / / / / / | | |/ / / / / / / | |||||
| * | | | | | | | | improvement after CR | Filipe Freire | 2018-01-12 | 4 | -8/+29 |
| * | | | | | | | | improvements after CR | Filipe Freire | 2018-01-12 | 2 | -9/+8 |
| * | | | | | | | | Add relevant element for push event button | Filipe Freire | 2018-01-12 | 1 | -7/+4 |
| * | | | | | | | | gitlab-qa !155 push creates event on activity page | Filipe Freire | 2018-01-12 | 2 | -0/+42 |
* | | | | | | | | | Merge branch 'winh-check-axios-restore' into 'master' | Filipa Lacerda | 2018-01-26 | 2 | -0/+18 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Make sure that axios adapater is restored after mockingwinh-check-axios-restore | Winnie Hellmann | 2018-01-25 | 2 | -0/+18 |
* | | | | | | | | | Merge branch 'qa-secret-variables-scenario' into 'master' | Grzegorz Bizon | 2018-01-26 | 7 | -1/+131 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Just don't expand if it's already expanded | Lin Jen-Shin | 2018-01-26 | 1 | -4/+2 |
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into qa-secret-variables-scenario | Lin Jen-Shin | 2018-01-26 | 46 | -355/+542 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'fix-local-rspec-tests' into 'master' | Mike Greiling | 2018-01-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | fix bug in webpack_helper in which force_same_domain argument was ignored bre...fix-local-rspec-tests | Mike Greiling | 2018-01-25 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'fix/rubocop-offenses-in-repo-spec' into 'master' | Robert Speicher | 2018-01-25 | 1 | -2/+7 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Fix rubocop offenses introduced in !16623 | Ahmad Sherif | 2018-01-25 | 1 | -2/+7 |
* | | | | | | | | | | Merge branch 'update-node-docs' into 'master' | Jacob Schatz | 2018-01-25 | 3 | -8/+11 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | fix documentation about node version | Tobias Gurtzick | 2018-01-25 | 3 | -8/+11 |
* | | | | | | | | | | Merge branch 'feature/migrate-repo-restorer-to-gitaly' into 'master' | Robert Speicher | 2018-01-25 | 9 | -11/+80 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Migrate restoring repo from bundle to Gitalyfeature/migrate-repo-restorer-to-gitaly | Ahmad Sherif | 2018-01-24 | 9 | -11/+80 |
* | | | | | | | | | | | Merge branch '34952-only-tags-is-not-taken-in-account-in-the-cache-gems-job' ... | Robert Speicher | 2018-01-25 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Ensure the job also run for tags | Rémy Coutable | 2018-01-25 | 1 | -2/+1 |
* | | | | | | | | | | | | Merge branch 'move-users-spinach-tests-to-rspec' into 'master' | Robert Speicher | 2018-01-25 | 3 | -124/+107 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Move user page spinach tests to RSpec | Semyon Pupkov | 2018-01-25 | 3 | -124/+107 |
* | | | | | | | | | | | | Merge branch '42338-rubocop-cache' into 'master' | Robert Speicher | 2018-01-25 | 2 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Cache rubocop cache for CI42338-rubocop-cache | Lin Jen-Shin | 2018-01-25 | 2 | -1/+7 |