summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Avoid setting Gitlab::Session on Git HTTP requestsce-jej/fix-git-http-with-sso-enforcementJames Edwards-Jones2019-06-051-0/+1
|
* Avoid setting Gitlab::Session on sessionless requestsJames Edwards-Jones2019-06-053-0/+41
|
* Merge branch 'qa-allow-review-jobs-to-fail' into 'master'Rémy Coutable2019-06-051-2/+2
|\ | | | | | | | | Allow the review-deploy and review-qa-* jobs to fail for now See merge request gitlab-org/gitlab-ce!29208
| * Allow the review-deploy and review-qa-* jobs to fail for nowRémy Coutable2019-06-051-2/+2
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'vzagorodny-fix-broken-link-insights-default-config-ce' into ↵Mike Lewis2019-06-051-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 'master' [CE backport] Fix broken link to default insights config in docs See merge request gitlab-org/gitlab-ce!29190
| * | [CE backport] Fix broken link to default insights config in docsVictor Zagorodny2019-06-051-1/+1
|/ /
* | Merge branch '10403-harden-against-gitlab-assets-compile-transient-failures' ↵Stan Hu2019-06-051-4/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Harden gitlab:assets:compile against transient network failures Closes gitlab-ee#10403 See merge request gitlab-org/gitlab-ce!29211
| * | Harden gitlab:assets:compile against transient network failuresNick Thomas2019-06-051-4/+4
| | |
* | | Merge branch '60819_yamllint_gitlabci' into 'master'Rémy Coutable2019-06-0554-348/+372
|\ \ \ | | | | | | | | | | | | | | | | 60819 yamllint gitlabci See merge request gitlab-org/gitlab-ce!29124
| * | | Add yaml lintKamil Trzciński2019-06-0554-348/+372
|/ / / | | | | | | | | | | | | | | | | | | This commit adds CI job that validates all `*.yml` with `yamllint`. This commit fixes all offenses present in repository.
* | | Merge branch '54140-non-ar-cache-commit-markdown' into 'master'Douwe Maan2019-06-0521-406/+758
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use Redis for CacheMarkDownField on non AR models Closes #54140 See merge request gitlab-org/gitlab-ce!29054
| * | | Cleanup #attributes method54140-non-ar-cache-commit-markdownPatrick Bajao2019-06-051-20/+14
| | | | | | | | | | | | | | | | | | | | | | | | Since we're prepending the ActiveRecord::Extension module, we can take advantage of it and avoid using an alias to extend the original #attributes method.
| * | | Use markdown_field helper to display full_titlePatrick Bajao2019-06-051-1/+2
| | | |
| * | | Remove requirement for id for #markdown_cache_keyPatrick Bajao2019-06-054-14/+2
| | | | | | | | | | | | | | | | It's not needed anymore as we require `#cache_key` instead.
| * | | Use #cache_key of subject for generated redis keyPatrick Bajao2019-06-055-28/+42
| | | | | | | | | | | | | | | | | | | | This commit also includes some changes in specs to use `Class.new` approach.
| * | | Use Redis for CacheMarkDownField on non AR modelsPatrick Bajao2019-06-0520-405/+760
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows using `CacheMarkdownField` for models that are not backed by ActiveRecord. When the including class inherits `ActiveRecord::Base` we include `Gitlab::MarkdownCache::ActiveRecord::Extension`. This will cause the markdown fields to be rendered and the generated HTML stored in a `<field>_html` attribute on the record. We also store the version used for generating the markdown. All other classes that include this model will include the `Gitlab::MarkdownCache::Redis::Extension`. This add the `<field>_html` attributes to that model and will generate the html in them. The generated HTML will be cached in redis under the key `markdown_cache:<class>:<id>`. The class this included in must therefore respond to `id`.
* | | | Merge branch 'snowplow-attrs-helper' into 'master'Mayra Cabrera2019-06-053-11/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add snowplow haml attr helper See merge request gitlab-org/gitlab-ce!28724
| * | | | Add snowplow haml attr helperLuke Bennett2019-06-053-11/+28
|/ / / / | | | | | | | | | | | | | | | | Helps build a hash of snowplow tracking data attrs. Updates import project pane to use new helper.
* | | | Merge branch 'graphql-file-entry-url' into 'master'Nick Thomas2019-06-0515-5/+129
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add web_url to tree entry in GraphQL API See merge request gitlab-org/gitlab-ce!28646
| * | | | Add web_url to tree entry in GraphQL APIPhil Hughes2019-06-0515-5/+129
| | | | |
* | | | | Merge branch 'ce-10446-resolve-ee-diff-repository-check-mailer-notify' into ↵Phil Hughes2019-06-051-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [CE] Resolve CE/EE in repo check mailer notify html See merge request gitlab-org/gitlab-ce!29195
| * | | | | Resolve CE/EE in repo check mailer notify htmlPaul Slaughter2019-06-051-0/+2
| | | | | |
* | | | | | Merge branch '61246-fix-label-click-scroll-to-top' into 'master'Fatih Acet2019-06-052-0/+10
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix label click scrolling to top Closes #61246 See merge request gitlab-org/gitlab-ce!29202
| * | | | | Fix label click scrolling to topPaul Slaughter2019-06-052-0/+10
| |/ / / /
* | | | | Merge branch '11126-fix-repository-size-check-ce' into 'master'Stan Hu2019-06-057-4/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add client code to call GetObjectDirectorySize RPC See merge request gitlab-org/gitlab-ce!28918
| * | | | | Add client code to call GetObjectDirectorySize RPC11126-fix-repository-size-check-cePatrick Bajao2019-06-057-4/+39
| | |_|/ / | |/| | | | | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13460
* | | | | Merge branch 'add_codeowners_for_security_templates' into 'master'Sean McGivern2019-06-051-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Add code owners for security templates See merge request gitlab-org/gitlab-ce!26948
| * | | | Add code owners for security templatesOlivier Gonzalez2019-06-051-0/+1
|/ / / /
* | | | Merge branch ↵Nick Thomas2019-06-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '62760-persistent-failure-in-spec-models-ci-pipeline_schedule_spec-rb' into 'master' Resolve "Persistent failure in spec/models/ci/pipeline_schedule_spec.rb" Closes #62760 See merge request gitlab-org/gitlab-ce!29191
| * | | | Prefer Time.zone.now to pair with Time.zone.nameLin Jen-Shin2019-06-051-1/+1
|/ / / / | | | | | | | | | | | | | | | | `Time.now` is local time, yet `Time.zone.now` is application configuration time. They can be different.
* | | | Merge branch '28996-create-mvc-ui-in-haml' into 'master'Filipa Lacerda2019-06-0512-21/+305
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add Let's Encrypt option in Pages domain new/edit Haml form See merge request gitlab-org/gitlab-ce!26438
| * | | | Add auto SSL toggle to Pages domain settings page28996-create-mvc-ui-in-hamlNathan Friend2019-06-0312-21/+305
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds an auto SSL toggle switch to the settings page of GitLab Pages domains. This toggle enable or disabled auto SSL management via Let's Encrypt. Toggling the button dynamically updates the form using client-side JavaScript. All changes are behind feature flags.
* | | | | Merge branch 'osw-avoid-500-on-suggestions-check' into 'master'Lin Jen-Shin2019-06-053-1/+14
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Avoid 500 when evaluating `DiffNote#supports_suggestion?` and commit is not reachable Closes #57570 See merge request gitlab-org/gitlab-ce!25408
| * | | | Avoid 500's when commit is not reachableOswaldo Ferreira2019-06-053-1/+14
| | | | |
* | | | | Merge branch 'patch-67' into 'master'Marcia Ramos2019-06-051-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update code_quality.md to fix grammatical errors. See merge request gitlab-org/gitlab-ce!29161
| * | | | | Update code_quality.md to fix grammatical errors.PatOnTheBack2019-06-041-2/+2
| | | | | |
* | | | | | Merge branch 'winh-issue-boards-setListDetail' into 'master'Fatih Acet2019-06-054-2/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract setListDetail() into issue boards store See merge request gitlab-org/gitlab-ce!29063
| * | | | | | Extract setListDetail() into issue boards storeWinnie Hellmann2019-06-054-2/+17
|/ / / / / /
* | | | | | Merge branch 'docs/ssot_group_clusters' into 'master'Marcia Ramos2019-06-051-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edited "Group cluster" for SSOT guidelines See merge request gitlab-org/gitlab-ce!29176
| * | | | | | Edited "Group cluster" for SSOT guidelinesRussell Dickenson2019-06-051-0/+4
|/ / / / / /
* | | | | | Merge branch 'docs/ssot_groups_index' into 'master'Marcia Ramos2019-06-051-1/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit *Groups index* for SSOT guidelines See merge request gitlab-org/gitlab-ce!29173
| * | | | | | Edit *Groups index* for SSOT guidelinesRussell Dickenson2019-06-051-1/+17
|/ / / / / /
* | | | | | Merge branch 'docs/ssot_admin_area_terms_of_service' into 'master'Marcia Ramos2019-06-051-14/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edited `Terms of Service` for SSOT guidelines See merge request gitlab-org/gitlab-ce!29107
| * | | | | | Edited `Terms of Service` for SSOT guidelinesRussell Dickenson2019-06-051-14/+32
|/ / / / / /
* | | | | | Merge branch 'clarify-ce-first-docs' into 'master'Achilleas Pipinellis2019-06-051-3/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify the process for CE-first documentation See merge request gitlab-org/gitlab-ce!29197
| * | | | | | Clarify the process for CE-first documentationMarkus Koller2019-06-051-3/+8
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was unclear if the docs changes should be included in the MR as well, and adding a changelog entry in the CE MR also triggers the ee-specific-lines-check job in CI.
* | | | | | Merge branch ↵Jan Provaznik2019-06-054-0/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '11925-geo-sidekiq-nodes-try-to-run-jobs-even-thought-db-is-readonly' into 'master' Ensure DB is writable before continuing jobs See merge request gitlab-org/gitlab-ce!29134
| * | | | | | Ensure DB is writable before continuing jobs11925-geo-sidekiq-nodes-try-to-run-jobs-even-thought-db-is-readonlyAsh McKenzie2019-06-054-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the context of a Geo setup, some jobs can be running on a Geo secondary where the database is read-only and therefore we should guard against various jobs attempting to write.
* | | | | | | Merge branch 'master' into 'master'Marcia Ramos2019-06-051-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: fix grammar in getting_started_part_three.md See merge request gitlab-org/gitlab-ce!29024
| * | | | | | | Docs: fix grammar in getting_started_part_three.mdDaniel Tam2019-06-051-1/+1
|/ / / / / / /
View Lorry Controller Status