summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updated grape to `1.0.2` to remove workaround40843-update-grape-to-v1-0-2-when-it-is-releasedJames Edwards-Jones2018-03-262-8/+3
* Merge branch 'blackst0ne-rails5-update-files-by-rails-app-update' into 'master'43098-controller-projects-issuescontroller-show-executes-more-than-100-sql-queriesRobert Speicher2018-03-2311-24/+163
|\
| * [Rails5] Update files by `rails app:update`blackst0ne-rails5-update-files-by-rails-app-updateblackst0ne2018-03-2211-24/+163
* | Merge branch '28857-followup-fix-pages-test' into 'master'Robert Speicher2018-03-231-3/+4
|\ \
| * | Fix a spec that will break in EENick Thomas2018-03-231-3/+4
* | | Merge branch 'winh-cleanup-comment-submit-test' into 'master'Clement Ho2018-03-232-95/+228
|\ \ \
| * | | Cleanup test for disabling comment submit buttonwinh-cleanup-comment-submit-testWinnie Hellmann2018-03-222-95/+228
* | | | Merge branch '44564-error-500-while-attempting-to-resolve-conflicts-due-to-ut...Stan Hu2018-03-237-17/+73
|\ \ \ \
| * | | | Fix 500 error when trying to resolve non-ASCII conflicts in editorSean McGivern2018-03-237-17/+73
* | | | | Merge branch '44218-add-internationalization-support-for-the-prometheus-merge...Filipa Lacerda2018-03-233-41/+83
|\ \ \ \ \
| * | | | | Add i18n support for the mrWidget prometheus memory widget44218-add-internationalization-support-for-the-prometheus-merge-request-widgetJose Ivan Vargas2018-03-233-41/+83
* | | | | | Merge branch '44589-problem-with-prettier-setting-trailingcomma-all' into 'ma...Filipa Lacerda2018-03-238-87/+88
|\ \ \ \ \ \
| * | | | | | ensure stylesheets are included as well, make prettierrc even more inclusiveMike Greiling2018-03-232-1/+2
| * | | | | | make babel-transpiled overrides more inclusive and reduce conflicts with EEMike Greiling2018-03-231-1/+1
| * | | | | | update eslintignore for node scriptsMike Greiling2018-03-233-4/+3
| * | | | | | prettify all node scriptsMike Greiling2018-03-235-79/+74
| * | | | | | ignore generated locale files with prettierMike Greiling2018-03-231-0/+1
| * | | | | | update prettier config to differentiate node scripts from babel compiled modulesMike Greiling2018-03-232-4/+9
* | | | | | | Merge branch 'docs/gitlab-com-settings' into 'master'Marcia Ramos2018-03-231-0/+262
|\ \ \ \ \ \ \
| * | | | | | | Move GitLab.com settings under main docsAchilleas Pipinellis2018-03-231-0/+262
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'gitlab-shell-7.1.1' into 'master'Douwe Maan2018-03-231-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use gitlab-shell 7.1.1gitlab-shell-7.1.1Jacob Vosmaer2018-03-231-1/+1
* | | | | | | | Merge branch 'fix/encoding-helper-clean-blowing-up-on-utf-16be' into 'master'Robert Speicher2018-03-232-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix EncodingHelper#clean blowing up on UTF-16BE stringsfix/encoding-helper-clean-blowing-up-on-utf-16beAhmad Sherif2018-03-222-1/+6
* | | | | | | | | Merge branch 'sh-improve-rollback-test' into 'master'Robert Speicher2018-03-231-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rollback to a set version instead of an arbitrary number of stepssh-improve-rollback-testStan Hu2018-03-221-1/+1
* | | | | | | | | | Merge branch '44587-autolinking-includes-trailing-exclamation-marks' into 'ma...Robert Speicher2018-03-233-13/+15
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Add ?, !, and : to trailing puncutation excluded from auto-linkingSean McGivern2018-03-233-13/+15
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'performance-bar-vue-resource' into 'master'Filipa Lacerda2018-03-232-0/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fixed eslintperformance-bar-vue-resourcePhil Hughes2018-03-211-1/+0
| * | | | | | | | | Add Vue resource interceptor to performance barPhil Hughes2018-03-212-0/+26
* | | | | | | | | | Merge branch 'pages_force_https' into 'master'Nick Thomas2018-03-2324-107/+447
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add HTTPS-only pagesRob Watson2018-03-2224-107/+447
* | | | | | | | | | | Merge branch 'sh-update-loofah' into 'master'Robert Speicher2018-03-233-5/+12
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Bump loofah to 2.2.2 and rails-html-sanitizer to 1.0.4sh-update-loofahStan Hu2018-03-223-5/+12
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'patch-28' into 'master'44564-error-500-while-attempting-to-resolve-conflicts-due-to-utf-8-conversion-errorSean McGivern2018-03-231-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Update the menu information to access "Schedules" pageBertrand Jamin2018-03-231-1/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'tz-prettier-print-width-100' into 'master'Clement Ho2018-03-231-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update Prettier Print WIdth to 100Tim Zallmann2018-03-231-0/+1
* | | | | | | | | | Merge branch '43525-limit-number-of-failed-logins-using-ldap' into 'master'Douwe Maan2018-03-233-43/+96
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Writes specs43525-limit-number-of-failed-logins-using-ldapTiago Botelho2018-03-223-45/+88
| * | | | | | | | | | Tracks the number of failed attempts made by a user trying to authenticate wi...Tiago Botelho2018-03-221-0/+10
* | | | | | | | | | | Merge branch 'patch-1' into 'master'Sean McGivern2018-03-231-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Reques Chinese Traditional proofreader permissions.d.weizhe@gmail.com2018-03-151-0/+1
* | | | | | | | | | | Merge branch 'storage-dropdown' into 'master'Sean McGivern2018-03-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Show gitaly address instead of disk pathJacob Vosmaer2018-03-231-1/+1
* | | | | | | | | | | | Merge branch 'jprovazn-issueref' into 'master'Douwe Maan2018-03-233-1/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix issuable state indicatorJan Provaznik2018-03-233-1/+23
* | | | | | | | | | | | Merge branch '43771-improve-avatar-error-message' into 'master'Sean McGivern2018-03-236-10/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Change avatar error message to include allowed file formatsFabian Schneider2018-03-226-10/+9
View Lorry Controller Status