Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add missing changelog entries for 10.6.0docs/rs-update-changelog | Robert Speicher | 2018-03-23 | 1 | -1/+5 |
* | Merge branch 'blackst0ne-rails5-update-files-by-rails-app-update' into 'master'43098-controller-projects-issuescontroller-show-executes-more-than-100-sql-queries | Robert Speicher | 2018-03-23 | 11 | -24/+163 |
|\ | |||||
| * | [Rails5] Update files by `rails app:update`blackst0ne-rails5-update-files-by-rails-app-update | blackst0ne | 2018-03-22 | 11 | -24/+163 |
* | | Merge branch '28857-followup-fix-pages-test' into 'master' | Robert Speicher | 2018-03-23 | 1 | -3/+4 |
|\ \ | |||||
| * | | Fix a spec that will break in EE | Nick Thomas | 2018-03-23 | 1 | -3/+4 |
* | | | Merge branch 'winh-cleanup-comment-submit-test' into 'master' | Clement Ho | 2018-03-23 | 2 | -95/+228 |
|\ \ \ | |||||
| * | | | Cleanup test for disabling comment submit buttonwinh-cleanup-comment-submit-test | Winnie Hellmann | 2018-03-22 | 2 | -95/+228 |
* | | | | Merge branch '44564-error-500-while-attempting-to-resolve-conflicts-due-to-ut... | Stan Hu | 2018-03-23 | 7 | -17/+73 |
|\ \ \ \ | |||||
| * | | | | Fix 500 error when trying to resolve non-ASCII conflicts in editor | Sean McGivern | 2018-03-23 | 7 | -17/+73 |
* | | | | | Merge branch '44218-add-internationalization-support-for-the-prometheus-merge... | Filipa Lacerda | 2018-03-23 | 3 | -41/+83 |
|\ \ \ \ \ | |||||
| * | | | | | Add i18n support for the mrWidget prometheus memory widget44218-add-internationalization-support-for-the-prometheus-merge-request-widget | Jose Ivan Vargas | 2018-03-23 | 3 | -41/+83 |
* | | | | | | Merge branch '44589-problem-with-prettier-setting-trailingcomma-all' into 'ma... | Filipa Lacerda | 2018-03-23 | 8 | -87/+88 |
|\ \ \ \ \ \ | |||||
| * | | | | | | ensure stylesheets are included as well, make prettierrc even more inclusive | Mike Greiling | 2018-03-23 | 2 | -1/+2 |
| * | | | | | | make babel-transpiled overrides more inclusive and reduce conflicts with EE | Mike Greiling | 2018-03-23 | 1 | -1/+1 |
| * | | | | | | update eslintignore for node scripts | Mike Greiling | 2018-03-23 | 3 | -4/+3 |
| * | | | | | | prettify all node scripts | Mike Greiling | 2018-03-23 | 5 | -79/+74 |
| * | | | | | | ignore generated locale files with prettier | Mike Greiling | 2018-03-23 | 1 | -0/+1 |
| * | | | | | | update prettier config to differentiate node scripts from babel compiled modules | Mike Greiling | 2018-03-23 | 2 | -4/+9 |
* | | | | | | | Merge branch 'docs/gitlab-com-settings' into 'master' | Marcia Ramos | 2018-03-23 | 1 | -0/+262 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Move GitLab.com settings under main docs | Achilleas Pipinellis | 2018-03-23 | 1 | -0/+262 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'gitlab-shell-7.1.1' into 'master' | Douwe Maan | 2018-03-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use gitlab-shell 7.1.1gitlab-shell-7.1.1 | Jacob Vosmaer | 2018-03-23 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'fix/encoding-helper-clean-blowing-up-on-utf-16be' into 'master' | Robert Speicher | 2018-03-23 | 2 | -1/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix EncodingHelper#clean blowing up on UTF-16BE stringsfix/encoding-helper-clean-blowing-up-on-utf-16be | Ahmad Sherif | 2018-03-22 | 2 | -1/+6 |
* | | | | | | | | | Merge branch 'sh-improve-rollback-test' into 'master' | Robert Speicher | 2018-03-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Rollback to a set version instead of an arbitrary number of stepssh-improve-rollback-test | Stan Hu | 2018-03-22 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch '44587-autolinking-includes-trailing-exclamation-marks' into 'ma... | Robert Speicher | 2018-03-23 | 3 | -13/+15 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Add ?, !, and : to trailing puncutation excluded from auto-linking | Sean McGivern | 2018-03-23 | 3 | -13/+15 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'performance-bar-vue-resource' into 'master' | Filipa Lacerda | 2018-03-23 | 2 | -0/+25 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fixed eslintperformance-bar-vue-resource | Phil Hughes | 2018-03-21 | 1 | -1/+0 |
| * | | | | | | | | | Add Vue resource interceptor to performance bar | Phil Hughes | 2018-03-21 | 2 | -0/+26 |
* | | | | | | | | | | Merge branch 'pages_force_https' into 'master' | Nick Thomas | 2018-03-23 | 24 | -107/+447 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add HTTPS-only pages | Rob Watson | 2018-03-22 | 24 | -107/+447 |
* | | | | | | | | | | | Merge branch 'sh-update-loofah' into 'master' | Robert Speicher | 2018-03-23 | 3 | -5/+12 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Bump loofah to 2.2.2 and rails-html-sanitizer to 1.0.4sh-update-loofah | Stan Hu | 2018-03-22 | 3 | -5/+12 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'patch-28' into 'master'44564-error-500-while-attempting-to-resolve-conflicts-due-to-utf-8-conversion-error | Sean McGivern | 2018-03-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Update the menu information to access "Schedules" page | Bertrand Jamin | 2018-03-23 | 1 | -1/+1 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'tz-prettier-print-width-100' into 'master' | Clement Ho | 2018-03-23 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update Prettier Print WIdth to 100 | Tim Zallmann | 2018-03-23 | 1 | -0/+1 |
* | | | | | | | | | | Merge branch '43525-limit-number-of-failed-logins-using-ldap' into 'master' | Douwe Maan | 2018-03-23 | 3 | -43/+96 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Writes specs43525-limit-number-of-failed-logins-using-ldap | Tiago Botelho | 2018-03-22 | 3 | -45/+88 |
| * | | | | | | | | | | Tracks the number of failed attempts made by a user trying to authenticate wi... | Tiago Botelho | 2018-03-22 | 1 | -0/+10 |
* | | | | | | | | | | | Merge branch 'patch-1' into 'master' | Sean McGivern | 2018-03-23 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Reques Chinese Traditional proofreader permissions. | d.weizhe@gmail.com | 2018-03-15 | 1 | -0/+1 |
* | | | | | | | | | | | Merge branch 'storage-dropdown' into 'master' | Sean McGivern | 2018-03-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Show gitaly address instead of disk path | Jacob Vosmaer | 2018-03-23 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'jprovazn-issueref' into 'master' | Douwe Maan | 2018-03-23 | 3 | -1/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix issuable state indicator | Jan Provaznik | 2018-03-23 | 3 | -1/+23 |
* | | | | | | | | | | | | Merge branch '43771-improve-avatar-error-message' into 'master' | Sean McGivern | 2018-03-23 | 6 | -10/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Change avatar error message to include allowed file formats | Fabian Schneider | 2018-03-22 | 6 | -10/+9 |