Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Updates from `rubocop -a` | Lin Jen-Shin | 2018-07-09 | 6 | -8/+8 |
| | |||||
* | Merge branch ↵ | Stan Hu | 2018-07-07 | 1 | -2/+2 |
|\ | | | | | | | | | | | | | | | | | '48670-application-settings-may-not-be-invalidated-if-migrations-are-run' into 'master' Resolve "Application settings may not be invalidated if migrations are run" Closes #48670 See merge request gitlab-org/gitlab-ce!20389 | ||||
| * | Stop relying on migrations in the CacheableAttributes cache key and cache ↵ | Rémy Coutable | 2018-07-05 | 1 | -2/+2 |
| | | | | | | | | | | | | attributes for 1 minute instead Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch '46246-gitlab-project-export-should-use-object-storage' into ↵ | Sean McGivern | 2018-07-06 | 2 | -7/+26 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "GitLab Project export should use object storage" Closes #46246 See merge request gitlab-org/gitlab-ce!20105 | ||||
| * | | Update Import/Export to use object storage (based on aa feature flag) | James Lopez | 2018-07-06 | 2 | -7/+26 |
| | | | |||||
* | | | Use proper markdown rendering for previews | Brett Walker | 2018-07-06 | 2 | -10/+14 |
| | | | |||||
* | | | Merge branch 'gitaly-dont-use-path' into 'master' | Sean McGivern | 2018-07-06 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | Remove silly use of repo disk path See merge request gitlab-org/gitlab-ce!20436 | ||||
| * | | | Remove silly use of repo disk path | Jacob Vosmaer | 2018-07-06 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'bvl-preload-parents-after-pagination' into 'master' | Douwe Maan | 2018-07-06 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Preload ancestors after pagination when filtering Closes #40785 See merge request gitlab-org/gitlab-ce!20398 | ||||
| * | | | Preload ancestors after pagination when filtering | Bob Van Landuyt | 2018-07-06 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to preload the ancestors of search results after applying pagination limits. This way the search results itself are paginated, but not the ancestors. If we don't do this, we might not preload a parent group of a search result as it has been cut off by pagination. | ||||
* | | | | Merge branch ↵ | Yorick Peterse | 2018-07-06 | 1 | -1/+2 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 'blackst0ne-rails5-activerecord-statementinvalid-mysql2-error-expression-1-of-select-list-is-not-in-group-by-clause' into 'master' [Rails5] Fix milestone GROUP BY query Closes #48428 See merge request gitlab-org/gitlab-ce!20256 | ||||
| * | | | [Rails5] Fix milestone GROUP BY query | blackst0ne | 2018-07-06 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge branch 'build-chunks-on-object-storage' into 'master' | Grzegorz Bizon | 2018-07-06 | 4 | -85/+203 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | Allow to store BuildTraceChunks on Object Storage Closes #45712 See merge request gitlab-org/gitlab-ce!19515 | ||||
| * | | | Merge branch 'master' into build-chunks-on-object-storage | Shinya Maeda | 2018-07-06 | 13 | -32/+95 |
| |\ \ \ | |||||
| * | | | | Decouple optimization for erasing trace | Shinya Maeda | 2018-07-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Rename retry_max left overs to retries | Shinya Maeda | 2018-07-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into build-chunks-on-object-storage | Shinya Maeda | 2018-07-04 | 2 | -10/+17 |
| |\ \ \ \ | |||||
| * | | | | | Add spec for ExclusiveLeaseHelpers | Shinya Maeda | 2018-07-03 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fix error message | Shinya Maeda | 2018-07-03 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Rename persistable_store instead of persist_store | Shinya Maeda | 2018-07-03 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into build-chunks-on-object-storage | Shinya Maeda | 2018-07-03 | 12 | -45/+78 |
| |\ \ \ \ \ | |||||
| * | | | | | | Support append/truncate for fog storebuild-chunks-on-object-storage | Shinya Maeda | 2018-06-25 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into build-chunks-on-object-storage | Shinya Maeda | 2018-06-25 | 11 | -11/+53 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Added spec for build trace chunk | Shinya Maeda | 2018-06-25 | 1 | -10/+11 |
| | | | | | | | | |||||
| * | | | | | | | Rename persisted? to data_persisted? | Shinya Maeda | 2018-06-18 | 1 | -11/+7 |
| | | | | | | | | |||||
| * | | | | | | | Fix dead lock by in_lock conflicts. Shared out in_lock logic. Changed ↵ | Shinya Maeda | 2018-06-15 | 3 | -37/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | key_raw path of fog store. and some bug fixes to make it functional. | ||||
| * | | | | | | | Merge branch 'master' into build-chunks-on-object-storage | Shinya Maeda | 2018-06-15 | 9 | -14/+33 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into build-chunks-on-object-storage | Shinya Maeda | 2018-06-12 | 14 | -34/+161 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Allow to store BuildTraceChunks on Object Storage | Kamil Trzciński | 2018-06-07 | 4 | -58/+186 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Remove raising error at erase_old_trace! | Shinya Maeda | 2018-07-06 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'master' into remove-trace-efficiently | Shinya Maeda | 2018-07-06 | 13 | -32/+95 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'ce-6145-unify-issuable-search-bar' into 'master' | Robert Speicher | 2018-07-05 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Unify app/views/shared/issuable/_search_bar.html.haml See merge request gitlab-org/gitlab-ce!20266 | ||||
| | * | | | | | | | | | Unify app/views/shared/issuable/_search_bar.html.haml | Lin Jen-Shin | 2018-07-05 | 1 | -0/+4 |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings some EE changes which don't hurt | ||||
| * | | | | | | | | | Merge branch 'dm-invalid-active-service-template' into 'master' | Robert Speicher | 2018-07-05 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deactivate new KubernetesService created from active template to prevent project creation from failing Closes gitlab-ee#6753 See merge request gitlab-org/gitlab-ce!20400 | ||||
| | * | | | | | | | | | Check whether new service created from template is valid after unflagging it ↵ | Douwe Maan | 2018-07-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as a template | ||||
| | * | | | | | | | | | Don't consider a new inactive KubernetesService invalid | Douwe Maan | 2018-07-05 | 1 | -1/+1 |
| | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
| * | | | | | | | | | Web Terminal Ci Build | Francisco Javier López | 2018-07-05 | 2 | -0/+39 |
| | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch '45739-add-metrics-to-operations-tab' into 'master' | Filipa Lacerda | 2018-07-04 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add Metrics to Operations Tab" Closes #45739 See merge request gitlab-org/gitlab-ce!20025 | ||||
| | * | | | | | | | | Makes production environment the default environment for a project | Tiago Botelho | 2018-07-04 | 1 | -0/+9 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'ee-5481-epic-todos' into 'master' | Sean McGivern | 2018-07-04 | 5 | -6/+27 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port of Todos for epics See merge request gitlab-org/gitlab-ce!19908 | ||||
| | * | | | | | | | | Use for_issuable? instead of for_issuable_with_ability? | Jarka Kadlecová | 2018-07-03 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | More EE->CE fixes | Jan Provaznik | 2018-07-03 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Minor syntax fix | Jan Provaznik | 2018-07-03 | 1 | -2/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | [backend] Addressed review comments | Jan Provaznik | 2018-07-03 | 4 | -6/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Group filtering now includes also issues/MRs from subgroups/subprojects * fixed due_date * Also DRYed todo controller specs | ||||
| | * | | | | | | | | Support todos for epics backport | Jarka Kadlecová | 2018-07-03 | 2 | -2/+18 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'remove-is-shared-from-ci-runners' into 'master' | Grzegorz Bizon | 2018-07-04 | 3 | -24/+14 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Remove the use of `is_shared` of `Ci::Runner` See merge request gitlab-org/gitlab-ce!20172 | ||||
| | * | | | | | | | Make deprecated scopes of Runner explicit | Kamil Trzciński | 2018-07-04 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Remove the use of `is_shared` of `Ci::Runner`remove-is-shared-from-ci-runners | Kamil Trzciński | 2018-06-26 | 3 | -24/+14 |
| | | | | | | | | | |||||
* | | | | | | | | | Remove traces efficiently | Shinya Maeda | 2018-07-04 | 1 | -0/+6 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'master' into 'web-hooks-log-pagination' | Douwe Maan | 2018-07-03 | 3 | -20/+24 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb |