summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update redis-rack to 2.0.4update-redis-rackYorick Peterse2018-01-052-1/+6
| | | | | | | Up until version 2.0.3 redis-rack included a "rake" binary that would overwrite/hijack the one provided by Rake itself. Unfortunately the binary provided by redis-rack would produce errors in many cases. See https://github.com/redis-store/redis-rack/pull/34 for more info.
* Merge branch 'refactor-cluster-show-page-conservative' into 'master'Filipa Lacerda2018-01-0511-49/+50
|\ | | | | | | | | | | | | Refactor cluster show page Closes #41335 See merge request gitlab-org/gitlab-ce!16089
| * Add back bottom margins for integration formrefactor-cluster-show-page-conservativeMatija Čupić2018-01-051-2/+2
| |
| * Update Remove cluster subtitle and alertMatija Čupić2018-01-041-2/+2
| |
| * Update Advanced cluster settings subtitleMatija Čupić2018-01-041-1/+1
| |
| * Rename enabled partial to integration_formMatija Čupić2017-12-213-2/+3
| |
| * Environment pattern -> Environment scopeMatija Čupić2017-12-212-2/+2
| |
| * Match updated clusters/show in feature specsMatija Čupić2017-12-212-7/+7
| |
| * Add environment_scope to enabled partialMatija Čupić2017-12-213-17/+25
| |
| * Remove environment_scope in user/gcp show partialMatija Čupić2017-12-212-8/+0
| |
* | Merge branch 'test-with-local-gitaly' into 'master'Rémy Coutable2018-01-054-55/+93
|\ \ | | | | | | | | | | | | | | | | | | Allow local tests to use a modified Gitaly Closes gitaly#833 See merge request gitlab-org/gitlab-ce!16220
| * | Allow local tests to use a modified GitalyJacob Vosmaer (GitLab)2018-01-054-55/+93
|/ /
* | Merge branch '40228-verify-integrity-of-repositories' into 'master'Sean McGivern2018-01-056-42/+92
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Verify integrity of repositories" Closes #40228 See merge request gitlab-org/gitlab-ce!15931
| * | Update check.mdJames Lopez2018-01-051-1/+1
| | |
| * | add deprecation and removal issue to docsJames Lopez2018-01-051-0/+9
| | |
| * | add missing changelog40228-verify-integrity-of-repositoriesJames Lopez2018-01-041-0/+5
| | |
| * | refactor spec, add docsJames Lopez2018-01-043-10/+11
| | |
| * | deprecate check integrity taskJames Lopez2018-01-041-39/+2
| | |
| * | add lock specsJames Lopez2018-01-041-0/+13
| | |
| * | add locks chekJames Lopez2018-01-042-2/+28
| | |
| * | remove max-depth flag so it works with subgroupsJames Lopez2018-01-041-1/+1
| | |
| * | fix specJames Lopez2018-01-041-9/+5
| | |
| * | add new git fsck rake task and specJames Lopez2018-01-042-0/+37
| | |
* | | Merge branch 'feature/api_runners_online' into 'master'Rémy Coutable2018-01-053-9/+38
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add online attribute to runner api entity Closes #25774 See merge request gitlab-org/gitlab-ce!11750
| * | | Add status attribute to runner api entityAlessio Caiazza2018-01-053-8/+21
| | | |
| * | | Add online attribute to runner api entityAlessio Caiazza2018-01-033-9/+25
| | | |
* | | | Merge branch 'zj-blob-batch' into 'master'Douwe Maan2018-01-052-17/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Reroute batch blobs to single blob RPC See merge request gitlab-org/gitlab-ce!16082
| * | | | Fix typos in a code commentZeger-Jan van de Weg2018-01-051-2/+2
| | | | |
| * | | | Reroute batch blobs to single blob RPCZeger-Jan van de Weg2018-01-022-17/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given the priorities shifted for the Gitaly team, this endpoint does not get a dedicated endpoint yet. To make it work in a cloud native environment the request needs to go to Gitaly, not rugged. This is achieved by rerouting to the generic TreeEntry endpoint.
* | | | | Merge branch 'fix/prepare-rebase-to-be-migrated-to-gitaly' into 'master'Sean McGivern2018-01-052-1/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Prepare Gitlab::Git::Repository#rebase for Gitaly migration See merge request gitlab-org/gitlab-ce!16192
| * | | | | Prepare Gitlab::Git::Repository#rebase for Gitaly migrationfix/prepare-rebase-to-be-migrated-to-gitalyAhmad Sherif2018-01-042-1/+13
| | | | | |
* | | | | | Merge branch '40533-fix-item-stats-props' into 'master'Filipa Lacerda2018-01-051-7/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enclose props in double quotes for Item Stats in Groups tree app See merge request gitlab-org/gitlab-ce!16231
| * | | | | | Use `__` instead of `s__` when context is not required40533-fix-item-stats-propsKushal Pandya2018-01-041-3/+3
| | | | | | |
| * | | | | | Enclose props in quotesKushal Pandya2018-01-041-4/+4
| | | | | | |
* | | | | | | Merge branch 'gitaly-annotations-20180104' into 'master'Sean McGivern2018-01-051-9/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update some Gitaly annotations in Gitlab::Shell See merge request gitlab-org/gitlab-ce!16226
| * | | | | | | Update some Gitaly annotations in Gitlab::Shellgitaly-annotations-20180104Jacob Vosmaer2018-01-041-9/+4
| |/ / / / / /
* | | | | | | Merge branch 'ldap_username_attributes' into 'master'Douwe Maan2018-01-057-13/+135
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify `LDAP::Person` to return username value based on attributes Closes #39691 See merge request gitlab-org/gitlab-ce!15286
| * | | | | | | Modify `LDAP::Person` to return username value based on attributesDrew Blessing2018-01-047-13/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Gitlab::LDAP::Person` did not respect the LDAP attributes username configuration and would simply return the uid value. There are cases where users would like to specify a different username field to allow more friendly GitLab usernames. For example, it's common in AD to have sAMAccountName be an employee ID like `A12345` while the local part of the email address is more human-friendly.
* | | | | | | | Merge branch '41695-use-simple-assignment' into 'master'Stan Hu2018-01-051-3/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Master failure due to static-analysis job in app/models/concerns/deployment_platform.rb" Closes #41695 See merge request gitlab-org/gitlab-ce!16246
| * | | | | | | | Just try to detect and assign onceLin Jen-Shin2018-01-051-3/+4
|/ / / / / / / /
* | | | | | | | Merge branch ↵Stan Hu2018-01-053-11/+35
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41677-branch-name-omitted-due-to-bad-utf-8-conversion-by-gitaly-ref-handler' into 'master' Resolve "Branch name omitted due to bad UTF-8 conversion by Gitaly ref handler" Closes #41677 See merge request gitlab-org/gitlab-ce!16243
| * | | | | | | | Fix a bug where charlock_holmes was used needlessly to encode strings41677-branch-name-omitted-due-to-bad-utf-8-conversion-by-gitaly-ref-handlerAlejandro Rodríguez2018-01-043-11/+35
| | | | | | | | |
* | | | | | | | | Merge branch '41685-broken-master-due-to-static-analysis' into 'master'Robert Speicher2018-01-051-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Broken master due to `static-analysis`" Closes #41685 See merge request gitlab-org/gitlab-ce!16240
| * | | | | | | | | Ignore the Migration/Datetime cop in a migration that fix a column type to ↵Rémy Coutable2018-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | datetime_with_timezone Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch ↵Kamil Trzciński2018-01-048-26/+140
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41056-create-cluster-from-kubernetes-integration-application-template' into 'master' Create Kubernetes based on Application Templates Closes #41056 See merge request gitlab-org/gitlab-ce!16104
| * | | | | | | | | Create Kubernetes based on Application TemplatesMayra Cabrera2018-01-048-26/+140
|/ / / / / / / / /
* | | | | | | | | Merge branch 'issue-boards-scroll' into 'master'Jacob Schatz2018-01-041-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scroll to top/bottom in issue board when reach to edges Closes #39709 See merge request gitlab-org/gitlab-ce!16239
| * | | | | | | | | Fix issue boards scroll config.issue-boards-scrollFatih Acet2018-01-041-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix-missing-d3-import' into 'master'Jacob Schatz2018-01-041-2/+12
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing d3 timeWeek import in prometheus graph Closes #41644 See merge request gitlab-org/gitlab-ce!16216
| * | | | | | | | | fix missing import of timeWeek which would cause errors in prometheus graphs ↵fix-missing-d3-importMike Greiling2018-01-041-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with deployments
View Lorry Controller Status