Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ce-6117-unify-preview-mailer' into 'master' | Sean McGivern | 2018-07-10 | 1 | -0/+11 |
|\ | |||||
| * | This test was copied from EE | Lin Jen-Shin | 2018-07-10 | 1 | -0/+11 |
* | | Merge branch 'rd-ee-backport-add-support-for-gl-com-trials' into 'master' | Sean McGivern | 2018-07-10 | 1 | -6/+6 |
|\ \ | |||||
| * | | Backport some changes made for this spec in EE | Rubén Dávila | 2018-07-02 | 1 | -6/+6 |
* | | | Update time_helper.rb to fix output for exact minutes. | Marcel Amirault | 2018-07-10 | 1 | -4/+6 |
* | | | Merge branch 'gitaly-mandatory-20180709-jv' into 'master' | Douwe Maan | 2018-07-10 | 3 | -133/+66 |
|\ \ \ | |||||
| * | | | Use Gitaly for fetches and creating bundles | Jacob Vosmaer | 2018-07-09 | 3 | -133/+66 |
* | | | | Merge branch 'improve-metadata-access-performance' into 'master' | Grzegorz Bizon | 2018-07-10 | 8 | -106/+194 |
|\ \ \ \ | |||||
| * | | | | Fix specs | Kamil Trzciński | 2018-07-09 | 2 | -8/+7 |
| * | | | | Fix and add specs for testing metadata entry | Kamil Trzciński | 2018-07-09 | 7 | -97/+168 |
| * | | | | Access metadata directly from Object Storage | Kamil Trzciński | 2018-07-09 | 5 | -8/+26 |
* | | | | | Merge branch '48537-update-avatar-only-via-api' into 'master' | Rémy Coutable | 2018-07-10 | 1 | -0/+14 |
|\ \ \ \ \ | |||||
| * | | | | | Fix #48537 - Update avatar only via the projects API | Jamie Schembri | 2018-07-09 | 1 | -0/+14 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch '42415-omit-projects-from-get-group-endpoint' into 'master' | Douwe Maan | 2018-07-10 | 1 | -4/+23 |
|\ \ \ \ \ | |||||
| * | | | | | Adds with_projects optional parameter to /groups/:id API endpoint | Tiago Botelho | 2018-07-09 | 1 | -4/+23 |
* | | | | | | Support manually stopping any environment from the UI | Winnie Hellmann | 2018-07-10 | 7 | -57/+103 |
* | | | | | | Merge branch '48951-clean-up' into 'master' | Phil Hughes | 2018-07-10 | 1 | -43/+48 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Removes unused store in diffs mr refactor | Filipa Lacerda | 2018-07-09 | 1 | -43/+48 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'od/41671' into 'master' | Mike Greiling | 2018-07-09 | 1 | -0/+22 |
|\ \ \ \ \ | |||||
| * | | | | | save current date before Pikaday init | Orlando Del Aguila | 2018-06-29 | 1 | -0/+22 |
* | | | | | | Merge branch 'update-rubocop' | Sean McGivern | 2018-07-09 | 82 | -182/+179 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Resolve Naming/UncommunicativeMethod | Lin Jen-Shin | 2018-07-09 | 3 | -5/+5 |
| * | | | | | | Use stable gitlab-styles and eliminate offenses | Lin Jen-Shin | 2018-07-09 | 4 | -6/+5 |
| * | | | | | | Updates from `rubocop -a` | Lin Jen-Shin | 2018-07-09 | 77 | -171/+169 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'rails5-mysql-fix-pr-importer-spec' into 'master' | Rémy Coutable | 2018-07-09 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Rails5 mysql fix milliseconds problem in pull request importer spec | Jasper Maes | 2018-07-08 | 1 | -3/+3 |
* | | | | | | | Merge branch 'gitaly-update-branch' into 'master' | Robert Speicher | 2018-07-09 | 1 | -0/+41 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use Gitaly's OperationService.UserUpdateBranch RPC | Alejandro Rodríguez | 2018-07-08 | 1 | -0/+41 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'rails5-fix-48977' into 'master' | Rémy Coutable | 2018-07-09 | 2 | -3/+13 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Rails5 fix mysql milliseconds problem in specs | Jasper Maes | 2018-07-07 | 2 | -3/+13 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jprovazn-upload-symlink' into 'master' | Kamil Trzciński | 2018-07-09 | 1 | -0/+27 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Added test and used Array() instead of .wrap | Jan Provaznik | 2018-07-09 | 1 | -0/+27 |
| |/ / / / / | |||||
* | | | | | | Show "Sign in" instead of "Sign in / Register" when sign up is disabled | Dustin Utecht | 2018-07-09 | 1 | -0/+24 |
* | | | | | | Merge branch 'sh-fix-issue-47797-ce' into 'master' | Douwe Maan | 2018-07-09 | 1 | -0/+26 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix handling of annotated tags when Gitaly is not in use | Stan Hu | 2018-07-09 | 1 | -0/+26 |
| |/ / / / / | |||||
* | | | | | | Call correct action in spec | Filipa Lacerda | 2018-07-09 | 1 | -1/+1 |
| |/ / / / |/| | | | | |||||
* | | | | | Resolve "MR refactor: Performance costs of main element with `v-if`" | Tim Zallmann | 2018-07-09 | 1 | -2/+2 |
| |_|/ / |/| | | | |||||
* | | | | Merge branch '48978-fix-helm-installation-on-cluster' into 'master' | Kamil Trzciński | 2018-07-09 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Include wget in apk add command | Mayra Cabrera | 2018-07-08 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Make blob and other RPC's mandatory | Jacob Vosmaer (GitLab) | 2018-07-09 | 2 | -31/+18 |
* | | | | Merge branch 'gitaly-diff-mandatory' into 'master' | Grzegorz Bizon | 2018-07-09 | 1 | -27/+15 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Make all Gitaly diff flags mandatory | Jacob Vosmaer | 2018-07-06 | 1 | -27/+15 |
* | | | | add basic export to fix timeout problem on import_file_spec.rb | James Lopez | 2018-07-07 | 1 | -0/+0 |
* | | | | Merge branch '48670-application-settings-may-not-be-invalidated-if-migrations... | Stan Hu | 2018-07-07 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Stop relying on migrations in the CacheableAttributes cache key and cache att... | Rémy Coutable | 2018-07-05 | 1 | -1/+1 |
* | | | | | Refactor rspec matchers in read_only_spec.rb | Brett Walker | 2018-07-07 | 2 | -33/+26 |
* | | | | | Redesign for mr widget info and pipelines section | Clement Ho | 2018-07-06 | 2 | -5/+5 |
* | | | | | Merge branch '46246-gitlab-project-export-should-use-object-storage' into 'ma... | Sean McGivern | 2018-07-06 | 16 | -17/+334 |
|\ \ \ \ \ | |||||
| * | | | | | fix spec | James Lopez | 2018-07-06 | 1 | -1/+0 |
| * | | | | | Update Import/Export to use object storage (based on aa feature flag) | James Lopez | 2018-07-06 | 16 | -16/+334 |