summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix intermittent failing spec in spec/support/helpers/cycle_analytics_helpers.rbsh-fix-issue-43981Stan Hu2018-06-022-22/+21
| | | | | | | There was a race condition in the spec where if the commit is created on disk within a second of the frozen `Timecop` time, the test fails. Closes #43981
* Merge branch 'ClemMakesApps-master-patch-71268' into 'master'docs-article-cloud-foundryAnnabel Gray2018-06-021-0/+6
|\ | | | | | | | | | | | | Fix bootstrap 4 file inputs Closes #46701 See merge request gitlab-org/gitlab-ce!19333
| * Fix bootstrap 4 file inputsClement Ho2018-06-011-0/+6
|/
* Merge branch 'sh-add-ruby-2.4-comment' into 'master'Robert Speicher2018-06-011-0/+7
|\ | | | | | | | | Add comment about the need for truncating keys in Ruby 2.4 See merge request gitlab-org/gitlab-ce!19330
| * Add comment about the need for truncating keys in Ruby 2.4sh-add-ruby-2.4-commentStan Hu2018-06-011-0/+7
|/ | | | [ci skip]
* Merge branch 'fix-feature-memoization' into 'master'Stan Hu2018-06-013-3/+34
|\ | | | | | | | | Use RequestStore to memoize Flipper features so that memoized values are cleared between requests See merge request gitlab-org/gitlab-ce!19281
| * Remove ambiguity in Group class causing build failuresStan Hu2018-06-011-1/+1
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/71887977 was failing due to confusion between Ci::Group and Group. https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/71887977
| * Use RequestStore to memoize Flipper features so that memoized values are ↵Rémy Coutable2018-06-012-2/+33
| | | | | | | | | | | | cleared between requests Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'sh-bump-ruby-2.4' into 'master'Stan Hu2018-06-0115-18/+27
|\ \ | | | | | | | | | | | | Upgrade to Ruby 2.4.4 See merge request gitlab-org/gitlab-ce!19055
| * | Upgrade to Ruby 2.4.4sh-bump-ruby-2.4Stan Hu2018-05-2915-18/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes that make this work: * A change in Ruby (https://github.com/ruby/ruby/commit/ce635262f53b760284d56bb1027baebaaec175d1) requires passing in the exact required length for OpenSSL keys and IVs. * Ensure the secrets.yml is generated before any prepended modules are loaded. This is done by renaming the `secret_token.rb` initializer to `01_secret_token.rb`, which is a bit ugly but involves the least impact on other files.
* | | Merge branch 'revert-c640e579' into 'master'Clement Ho2018-06-014-3/+128
|\ \ \ | | | | | | | | | | | | | | | | Revert "Merge branch '46833-sticky-polyfill' into 'master'" See merge request gitlab-org/gitlab-ce!19322
| * | | Revert "Merge branch '46833-sticky-polyfill' into 'master'"Clement Ho2018-06-014-3/+128
| | | | | | | | | | | | This reverts merge request !19304
* | | | Merge branch '46696-branch-names-in-system-notes-have-incorrect-color' into ↵Annabel Gray2018-06-012-4/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Branch names in system notes have incorrect color" Closes #46696 See merge request gitlab-org/gitlab-ce!19296
| * | | | Resolve "Branch names in system notes have incorrect color"Clement Ho2018-06-012-4/+6
|/ / / /
* | | | Merge branch 'sh-bump-omniauth-gitlab' into 'master'Robert Speicher2018-06-012-1/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Bump omniauth-gitlab to 1.0.3 See merge request gitlab-org/gitlab-ce!19319
| * | | Bump omniauth-gitlab to 1.0.3Stan Hu2018-06-012-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | This version of the gem uses API v4 by default: https://github.com/linchus/omniauth-gitlab/commit/fd13de9f251fdaa72ba0195bda47cd2cb8731084
* | | | Merge branch 'new-label-spelling-error' into 'master'Phil Hughes2018-06-013-2/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Adds "the" to the new label page to correct the sentence. See merge request gitlab-org/gitlab-ce!19316
| * | | | Adds "the" to the new label page to correct the sentence.Sam Beckham2018-06-013-2/+7
|/ / / /
* | | | Merge branch '46833-sticky-polyfill' into 'master'Clement Ho2018-06-014-128/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Update position sticky polyfill Closes #46833 See merge request gitlab-org/gitlab-ce!19304
| * | | Update position sticky polyfillPaul Slaughter2018-06-014-128/+3
|/ / /
* | | Merge branch '47113-modal-header-styling-is-broken' into 'master'Filipa Lacerda2018-06-0118-27/+42
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Resolve "Modal header styling is broken" Closes #47113 See merge request gitlab-org/gitlab-ce!19312
| * | Adds the changelog entry for the modal header fixsamdbeckham2018-06-011-0/+5
| | |
| * | Updated the styling for modal titlessamdbeckham2018-06-017-8/+7
| | |
| * | Updates a load of modal headers to use better markupsamdbeckham2018-06-0116-21/+32
| | |
* | | Merge branch 'docs-update-fe-dependencies-guide' into 'master'Tim Zallmann2018-06-011-1/+18
|\ \ \ | | | | | | | | | | | | | | | | Update FE guides with dependency/devDependency distinction See merge request gitlab-org/gitlab-ce!19287
| * | | update the frontend dependency guide with distinction between dependencies ↵Mike Greiling2018-05-311-1/+18
| | | | | | | | | | | | | | | | and devDependencies
* | | | Merge branch 'ce-6145-extract-app-views-shared-issuable' into 'master'Robert Speicher2018-06-013-8/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE: Part of "Extract EE specific files/lines for app/views/shared/issuable" See merge request gitlab-org/gitlab-ce!19113
| * | | | Unify app/views/shared/issuable/form/_merge_params.html.hamlLin Jen-Shin2018-06-011-7/+3
| | | | |
| * | | | Unify app/views/shared/issuable/_sidebar.html.hamlLin Jen-Shin2018-06-011-1/+6
| | | | |
| * | | | Unify app/views/shared/issuable/_form.html.hamlLin Jen-Shin2018-06-011-0/+3
| | | | |
* | | | | Merge branch '46619-strong-tag-font-weight' into 'master'Clement Ho2018-06-011-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "The font is too bold in Issue events tab on Activity page" Closes #46619 See merge request gitlab-org/gitlab-ce!19291
| * | | | | Reset b and strong font weight to bold instead of bolderAnnabel Dunstone Gray2018-05-311-0/+5
| | | | | |
* | | | | | Merge branch '46478-update-updated-at-on-mr' into 'master'Douwe Maan2018-06-0111-18/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Update `updated_at` on an issue/mr on every issue/mr changes" Closes #46478 See merge request gitlab-org/gitlab-ce!19065
| * | | | | | Resolve "Update `updated_at` on an issue/mr on every issue/mr changes"🙈 jacopo beschi 🙉2018-06-0111-18/+43
|/ / / / / /
* | | | | | Merge branch '46815-monitoring-active-tab' into 'master'Clement Ho2018-06-011-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Admin area > Monitoring > Logs > No default active tab" Closes #46815 See merge request gitlab-org/gitlab-ce!19298
| * | | | | | Fix active states on monitoring logs tabsAnnabel Dunstone Gray2018-05-311-2/+2
| | | | | | |
* | | | | | | Merge branch 'fix-http-proxy' into 'master'Kamil Trzciński2018-06-012-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make http_io honor HTTP(S)_PROXY environment. Closes #46968 and #46982 See merge request gitlab-org/gitlab-ce!19282
| * | | | | | | Make http_io honor HTTP(S)_PROXY environment.NLR2018-06-012-1/+6
|/ / / / / / /
* | | | | | | Merge branch 'reactive-caching-alive-bug' into 'master'Nick Thomas2018-06-013-0/+8
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | ReactiveCaching#clear_reactive_cache! should not keep the cache alive See merge request gitlab-org/gitlab-ce!19311
| * | | | | | ReactiveCaching#clear_reactive_cache! should clear the not keep the cache aliveTiago Botelho2018-06-013-0/+8
| | | | | | |
* | | | | | | Merge branch ↵Douwe Maan2018-06-012-37/+134
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '46913-appearance-uploader-fields-and-description-html-are-missing-in-cached-version' into 'master' Resolve "Appearance uploader fields and description HTML are missing in cached version" Closes #46913 See merge request gitlab-org/gitlab-ce!19203
| * | | | | | Use RequestStore in CacheableAttributes.cached for greater performanceRémy Coutable2018-06-012-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Revert to caching the AR object in CacheableAttributesRémy Coutable2018-06-012-37/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caching the attributes as JSON and manually instantiating the record ended-up very complex since the edge-cases such as upload fields, serialized fields, and fields with custom accessors had to be handled. To ensure 3 points out of 4 are checked from https://gitlab.com/gitlab-org/gitlab-ce/issues/45175 we now include the Rails version in the cache key. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'ide-list-merge-requests' into 'master'Filipa Lacerda2018-06-0112-0/+342
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show merge requests in web IDE Closes #45184 See merge request gitlab-org/gitlab-ce!18898
| * | | | | | | set is loading in success mutationPhil Hughes2018-06-011-0/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into ide-list-merge-requestsPhil Hughes2018-06-01481-20335/+6104
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | removed CHANGELOG as their are no user facing components in this merge requestide-list-merge-requestsPhil Hughes2018-05-301-5/+0
| | | | | | | |
| * | | | | | | ability to search merge requestsPhil Hughes2018-05-304-10/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reset merge requests before fetch
| * | | | | | | improved stored dataPhil Hughes2018-05-306-3/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | created reset action to reset stored merge requests
| * | | | | | | Merge branch 'master' into ide-list-merge-requestsPhil Hughes2018-05-30989-5362/+8631
| |\ \ \ \ \ \ \