summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-06-02130-417/+1479
|\
| * Fix bootstrap 4 file inputsClement Ho2018-06-011-0/+6
| |
| * Merge branch 'fix-feature-memoization' into 'master'Stan Hu2018-06-011-1/+1
| |\ | | | | | | | | | | | | 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
| * | Merge branch 'sh-bump-ruby-2.4' into 'master'Stan Hu2018-06-016-7/+7
| |\ \ | | | | | | | | | | | | | | | | 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-296-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-013-3/+49
| |\ \ \ | | | | | | | | | | | | | | | | | | | | 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-013-3/+49
| | | | | | | | | | | | | | | This reverts merge request !19304
| * | | | Resolve "Branch names in system notes have incorrect color"Clement Ho2018-06-012-4/+6
| |/ / /
| * | | Adds "the" to the new label page to correct the sentence.Sam Beckham2018-06-012-2/+2
| | | |
| * | | Update position sticky polyfillPaul Slaughter2018-06-013-49/+3
| | | |
| * | | Merge branch '47113-modal-header-styling-is-broken' into 'master'Filipa Lacerda2018-06-0117-27/+37
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Resolve "Modal header styling is broken" Closes #47113 See merge request gitlab-org/gitlab-ce!19312
| | * | 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 '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
| | | | | |
| * | | | | Resolve "Update `updated_at` on an issue/mr on every issue/mr changes"🙈 jacopo beschi 🙉2018-06-013-9/+6
| | | | | |
| * | | | | 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 'reactive-caching-alive-bug' into 'master'Nick Thomas2018-06-011-0/+1
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | 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-011-0/+1
| | | | | | |
| * | | | | | Merge branch ↔Douwe Maan2018-06-011-9/+29
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-011-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: RĂ©my Coutable <remy@rymai.me>
| | * | | | | Revert to caching the AR object in CacheableAttributesRĂ©my Coutable2018-06-011-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-018-0/+93
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-01184-1010/+1999
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | ability to search merge requestsPhil Hughes2018-05-303-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reset merge requests before fetch
| | * | | | | | improved stored dataPhil Hughes2018-05-303-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | created reset action to reset stored merge requests
| | * | | | | | Merge branch 'master' into ide-list-merge-requestsPhil Hughes2018-05-30733-3566/+4518
| | |\ \ \ \ \ \
| | * | | | | | | fixed tests failing caused by rewirePhil Hughes2018-05-251-0/+2
| | | | | | | | |
| | * | | | | | | Show merge requests in web IDEPhil Hughes2018-05-258-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #45184
| * | | | | | | | Merge branch '46010-add-more-validations-for-runners-and-runner-type' into ↔Kamil TrzciƄski2018-06-019-24/+59
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Improve validations for Ci::Runner#runner_type See merge request gitlab-org/gitlab-ce!18901
| | * | | | | | | | Run `Ci::Runner#assign_to` in transactionKamil TrzciƄski2018-05-311-2/+9
| | | | | | | | | |
| | * | | | | | | | Add uniqueness for RunnerNamespaceKamil TrzciƄski2018-05-311-0/+2
| | | | | | | | | |
| | * | | | | | | | Add `Ci::Runner` inverse_of'sKamil TrzciƄski2018-05-315-8/+8
| | | | | | | | | |
| | * | | | | | | | Fix static analysisKamil TrzciƄski2018-05-311-2/+2
| | | | | | | | | |
| | * | | | | | | | Improve `Ci::Runner#assign_to` to return a flag whether it succeeded or notKamil TrzciƄski2018-05-313-8/+4
| | | | | | | | | |
| | * | | | | | | | Make Ci::Runner#assign_to keep returning RunnerProjectDylan Griffith2018-05-311-1/+2
| | | | | | | | | |
| | * | | | | | | | Fix some failuresKamil TrzciƄski2018-05-311-2/+3
| | | | | | | | | |
| | * | | | | | | | Fix `register_job_service_spec` failuresKamil TrzciƄski2018-05-311-1/+2
| | | | | | | | | |
| | * | | | | | | | Fix weird Rails bug that leads to `runner_id=null` in SQL queryKamil TrzciƄski2018-05-311-1/+1
| | | | | | | | | |
| | * | | | | | | | Refactor validations and make runner factory by default to be instance-wide ↔Kamil TrzciƄski2018-05-311-10/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | runner
| | * | | | | | | | Fix weird Rails bug that leads to `runner_id=null` in SQL queryDylan Griffith2018-05-311-1/+3
| | | | | | | | | |
| | * | | | | | | | Ensure we validate Runner#runner_type when persisting RunnerNamespaceDylan Griffith2018-05-311-1/+1
| | | | | | | | | |
| | * | | | | | | | Improve runner_type validations for Ci::RunnerDylan Griffith2018-05-311-6/+16
| | | | | | | | | |
View Lorry Controller Status