summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 44790: Disable the action mailer base logging when emails are disabledMarc Shaw2018-06-031-1/+4
* Merge branch 'ClemMakesApps-master-patch-71268' into 'master'docs-article-cloud-foundryAnnabel Gray2018-06-021-0/+6
|\
| * 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.4sh-add-ruby-2.4-commentStan Hu2018-06-011-0/+7
|/
* Merge branch 'fix-feature-memoization' into 'master'Stan Hu2018-06-013-3/+34
|\
| * Remove ambiguity in Group class causing build failuresStan Hu2018-06-011-1/+1
| * Use RequestStore to memoize Flipper features so that memoized values are clea...Rémy Coutable2018-06-012-2/+33
* | Merge branch 'sh-bump-ruby-2.4' into 'master'Stan Hu2018-06-0115-18/+27
|\ \
| * | Upgrade to Ruby 2.4.4sh-bump-ruby-2.4Stan Hu2018-05-2915-18/+27
* | | Merge branch 'revert-c640e579' into 'master'Clement Ho2018-06-014-3/+128
|\ \ \
| * | | Revert "Merge branch '46833-sticky-polyfill' into 'master'"Clement Ho2018-06-014-3/+128
* | | | Merge branch '46696-branch-names-in-system-notes-have-incorrect-color' into '...Annabel Gray2018-06-012-4/+6
|\ \ \ \
| * | | | 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.3Stan Hu2018-06-012-1/+6
* | | | 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.Sam Beckham2018-06-013-2/+7
|/ / / /
* | | | Merge branch '46833-sticky-polyfill' into 'master'Clement Ho2018-06-014-128/+3
|\ \ \ \ | |/ / / |/| | |
| * | | 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
|\ \ \ | |_|/ |/| |
| * | 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 the frontend dependency guide with distinction between dependencies an...Mike Greiling2018-05-311-1/+18
* | | | Merge branch 'ce-6145-extract-app-views-shared-issuable' into 'master'Robert Speicher2018-06-013-8/+12
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * | | | | 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"🙈 jacopo beschi 🙉2018-06-0111-18/+43
|/ / / / / /
* | | | | | Merge branch '46815-monitoring-active-tab' into 'master'Clement Ho2018-06-011-2/+2
|\ \ \ \ \ \
| * | | | | | 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.NLR2018-06-012-1/+6
|/ / / / / / /
* | | | | | | Merge branch 'reactive-caching-alive-bug' into 'master'Nick Thomas2018-06-013-0/+8
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | ReactiveCaching#clear_reactive_cache! should clear the not keep the cache aliveTiago Botelho2018-06-013-0/+8
* | | | | | | Merge branch '46913-appearance-uploader-fields-and-description-html-are-missi...Douwe Maan2018-06-012-37/+134
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Use RequestStore in CacheableAttributes.cached for greater performanceRémy Coutable2018-06-012-1/+14
| * | | | | | Revert to caching the AR object in CacheableAttributesRémy Coutable2018-06-012-37/+121
* | | | | | | Merge branch 'ide-list-merge-requests' into 'master'Filipa Lacerda2018-06-0112-0/+342
|\ \ \ \ \ \ \
| * | | | | | | 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
| * | | | | | | improved stored dataPhil Hughes2018-05-306-3/+45
| * | | | | | | Merge branch 'master' into ide-list-merge-requestsPhil Hughes2018-05-30989-5362/+8631
| |\ \ \ \ \ \ \