summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Minor gem fixesswitch-railsJan Provaznik2018-11-143-5/+5
|
* Add ApplicationRecord model classJan Provaznik2018-11-141-0/+5
| | | | In Rails 5 all models by default inherit from ApplicationRecord.
* Addressed documentation commentsJan Provaznik2018-11-141-9/+21
|
* Address specs failing in rails 4Jan Provaznik2018-11-143-2/+16
| | | | | | | | | | | We want to run CI with rails 4 for a short-term (until we are sure that we will ship with rails 5). The problem is that rails 4 can not handle rails 5 schema.rb properly - specifically `t.index` directive can not handle multiple indexes on the same column. Because combination of rails 4 + rails 5 schema will be used only in CI for a short-term, we can just ignore these incompatibility failures. This patch adds `rails5` helper for specs.
* Fix trigerring of rails 4 tests in CIJan Provaznik2018-11-141-1/+1
|
* Add missing changelogJan Provaznik2018-11-141-0/+5
|
* Make rails5 defailt in bin/* scriptsJan Provaznik2018-11-143-3/+3
|
* Add rails5 docJan Provaznik2018-11-142-0/+16
|
* Update db/schema.rb according to Rails 5Jan Provaznik2018-11-141-535/+402
| | | | | * add_index replaced with t.index * intiger(size 8) replaced with bigint
* Fix index for mysql adapterJan Provaznik2018-11-141-16/+34
| | | | | | | | | * similar to rails 5 it assures that index length is set for blob columns also in rails 4 * it also ignores multiple definitions of indexes for mysql, for some tables we define multiple indexes on the same set of columns, but with different parameters (opclasses, where), these are not supported by mysql adapter so the second definition of index is skipped
* Switch rails 4 to 5 in gitlab-ciJan Provaznik2018-11-143-93/+93
| | | | | | | | | CI jobs will be triggered both with rails 4 and 5 to make sure we keep backward compatibility if it turns out we have to switch back to rails 4. Rails 4 jobs are not allowed to fail for now, these jobs will be removed in a follow-up MR next cycle.
* Switch to Rails 5 by defaultJan Provaznik2018-11-148-146/+153
| | | | | * updates Gemfile * uses Rails 5 unless explicitly disabled
* Merge branch '53816-empty-label-menu-if-not-logged-in' into 'master'Rémy Coutable2018-11-142-22/+28
|\ | | | | | | | | | | | | Resolve "Empty label menu if not logged in" Closes #53816 See merge request gitlab-org/gitlab-ce!23042
| * Removes promote to group label for anonymous userJacopo2018-11-142-22/+28
| |
* | Merge branch 'revert-4ff91723' into 'master'Andreas Brandl2018-11-144-32/+95
|\ \ | | | | | | | | | | | | Revert "Merge branch 'revert-drop-gcp-clusters-table' into 'master'" See merge request gitlab-org/gitlab-ce!23020
| * | Revert "Merge branch 'revert-drop-gcp-clusters-table' into 'master'"Kamil Trzciński2018-11-144-32/+95
|/ /
* | Merge branch 'fix-deployment-metrics-in-mr-widget' into 'master'Kamil Trzciński2018-11-144-4/+50
|\ \ | | | | | | | | | | | | | | | | | | Avoid returning deployment metrics url to MR widget when the deployment is not successful Closes #53870 See merge request gitlab-org/gitlab-ce!23010
| * | Avoid returning deployment metrics url to MR widget when the deployment is ↵Shinya Maeda2018-11-144-4/+50
|/ / | | | | | | not successful
* | Merge branch '53922-sentry-errors-for-k8s-integration' into 'master'Kamil Trzciński2018-11-144-3/+38
|\ \ | | | | | | | | | | | | | | | | | | Track Kubernetes errors using Sentry Closes #53922 See merge request gitlab-org/gitlab-ce!23026
| * | Track Kubernetes errors using SentryDylan Griffith2018-11-144-3/+38
|/ /
* | Merge branch 'patch-31' into 'master'Rémy Coutable2018-11-141-1/+1
|\ \ | | | | | | | | | | | | Update comment in Auto-DevOps.gitlab-ci.yml See merge request gitlab-org/gitlab-ce!23013
| * | Update Auto-DevOps.gitlab-ci.ymlTripple Moon2018-11-131-1/+1
| | | | | | | | | Typo in comment INCREMENTAL_ROLLOUT_TYPE => INCREMENTAL_ROLLOUT_MODE
* | | Merge branch 'add-documentation-for-git-operations-stack-trace' into 'master'Douwe Maan2018-11-141-0/+15
|\ \ \ | | | | | | | | | | | | | | | | Adds documentation of git trace when git push/pull times out See merge request gitlab-org/gitlab-ce!23016
| * | | Adds comma after "timings" in git troubleshooting documentationTiago Botelho2018-11-141-1/+1
| | | |
| * | | Adds documentation of git trace when git push/pull times outadd-documentation-for-git-operations-stack-traceTiago Botelho2018-11-131-0/+15
| | | | | | | | | | | | | | | | | | | | Adds a detailed explanation on what the user can expect to see in case a git pull or push operation times out on their local machines
* | | | Merge branch '52940-fix-internal-email-pattern-not-respected' into 'master'Douwe Maan2018-11-143-7/+12
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Fix a bug where internal email pattern wasn't respected Closes #52940 See merge request gitlab-org/gitlab-ce!22516
| * | | Fix a bug where internal email pattern wasn't respected52940-fix-internal-email-pattern-not-respectedRémy Coutable2018-11-133-7/+12
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'patch-31' into 'master'fix-missing-prometheus-manage-buttonAchilleas Pipinellis2018-11-141-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update events.md. See merge request gitlab-org/gitlab-ce!23021
| * | | | Update events.md.Viktor2018-11-131-2/+2
| | | | | | | | | | | | | | | "?" instead of "&" in request examples
* | | | | Merge branch 'add-prometheus-external-docs' into 'master'Achilleas Pipinellis2018-11-141-37/+84
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for setting up external Prometheus Closes #40949 and #37255 See merge request gitlab-org/gitlab-ce!22831
| * | | | | Properly indent codeblocksAchilleas Pipinellis2018-11-141-29/+32
| | | | | |
| * | | | | Incorporate feedbackadd-prometheus-external-docsJoshua Lambert2018-11-131-11/+14
| | | | | |
| * | | | | Add additional documentation for external Prometheus serverJoshua Lambert2018-11-131-9/+46
| | | | | |
| * | | | | WIP updateJoshua Lambert2018-11-061-36/+40
| | | | | |
* | | | | | Merge branch '53972-fix-fill-shards' into 'master'Stan Hu2018-11-132-6/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a race condition in the shard population logic Closes #53972 See merge request gitlab-org/gitlab-ce!23028
| * | | | | | Fix a race condition intermittently breaking GitLab startupNick Thomas2018-11-132-6/+10
| | | | | | |
* | | | | | | Merge branch 'sh-bump-ruby-2.5.3' into 'master'Rémy Coutable2018-11-134-11/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to Ruby 2.5.3 Closes #41825 See merge request gitlab-org/gitlab-ce!22555
| * | | | | | | Upgrade to Ruby 2.5.3sh-bump-ruby-2.5.3Stan Hu2018-11-134-11/+18
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempt to update google-protobuf for migration-paths Because the one we were using aren't compatible with Ruby 2.5.3, and it'll be troublesome to switch Ruby. Upgrading google-protobuf will be much easier. All of them will need to be updated for Ruby 2.5.3 We remove oj because we don't really need it and it doesn't compile on 2.5.3 with that version. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/41825
* | | | | | | Merge branch 'enable-image-comments-for-renamed-files' into 'master'Filipa Lacerda2018-11-132-2/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed image commenting on moved files See merge request gitlab-org/gitlab-ce!23023
| * | | | | | | Fixed image commenting on moved filesPhil Hughes2018-11-132-2/+25
| | | | | | | |
* | | | | | | | Merge branch '53780-commit-discussion-ui' into 'master'Fatih Acet2018-11-135-22/+40
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken UI on commit discussions Closes #53780 See merge request gitlab-org/gitlab-ce!22952
| * | | | | | | Fix broken UI on commit discussionsAnnabel Dunstone Gray2018-11-135-22/+40
|/ / / / / / /
* | | | | | | Merge branch ↵Rémy Coutable2018-11-131-6/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '53812-review-apps-check-whether-release-exists-before-attempting-stop_review' into 'master' Ensure we abort the cleanup if release is empty Closes #53812 See merge request gitlab-org/gitlab-ce!22992
| * | | | | | | Ensure we abort the cleanup if release is emptyRémy Coutable2018-11-131-6/+20
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch '_acet-discussion-redesign-fixes' into 'master'Annabel Dunstone Gray2018-11-131-4/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Border radius fixes for redesigned discussions Closes #53880 and #53767 See merge request gitlab-org/gitlab-ce!23006
| * | | | | | | Border radius fixes for redesigned discussions_acet-discussion-redesign-fixesFatih Acet2018-11-131-4/+1
| | | | | | | |
* | | | | | | | Merge branch '51259-tooltip' into 'master'Phil Hughes2018-11-131-24/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates ci header component with gitlab-ui See merge request gitlab-org/gitlab-ce!23000
| * | | | | | | | Updates ci header component with gitlab-ui51259-tooltipFilipa Lacerda2018-11-131-24/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It reuses loading button instead of creating a new loading button It uses the new gitlab-ui components
* | | | | | | | | Merge branch 'docs-jivl-update-monitoring-urls' into 'master'Clement Ho2018-11-131-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update URL for the grafana instance of sitespeed See merge request gitlab-org/gitlab-ce!23001
| * | | | | | | | | Update URL for the grafana instance of sitespeeddocs-jivl-update-monitoring-urlsJose Vargas2018-11-121-1/+1
| | | | | | | | | |
View Lorry Controller Status