| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fixes for ESLint Errorstz-ide-open-mr | Tim Zallmann | 2018-03-27 | 2 | -4/+12 |
| | | |||||
| * | Fixed Path to tooltip directive | Tim Zallmann | 2018-03-27 | 1 | -1/+1 |
| | | |||||
| * | Added Changes based on UX Review | Tim Zallmann | 2018-03-27 | 10 | -64/+101 |
| | | |||||
| * | Updated MR Widget Header Test | Tim Zallmann | 2018-03-26 | 1 | -106/+138 |
| | | |||||
| * | Re added The Web IDE Button | Tim Zallmann | 2018-03-26 | 1 | -43/+54 |
| | | |||||
| * | Added Tests for all new functionality | Tim Zallmann | 2018-03-26 | 11 | -94/+496 |
| | | |||||
| * | Fixes for Tests on file.js and tabs tests | Tim Zallmann | 2018-03-25 | 2 | -23/+21 |
| | | |||||
| * | Fix for MR Widget Header reset | Tim Zallmann | 2018-03-25 | 1 | -43/+43 |
| | | |||||
| * | Fixes to Formatting to all Files | Tim Zallmann | 2018-03-25 | 14 | -202/+32 |
| | | |||||
| * | ESLint + Karma fixes | Tim Zallmann | 2018-03-25 | 7 | -83/+40 |
| | | |||||
| * | Fixed new Additions | Tim Zallmann | 2018-03-25 | 7 | -11/+15 |
| | | | | | Automatic Diff Navigation | ||||
| * | Actual MR diff displayed | Tim Zallmann | 2018-03-25 | 16 | -339/+195 |
| | | |||||
| * | Basic Setup for MR Showing | Tim Zallmann | 2018-03-25 | 23 | -314/+1006 |
| | | |||||
| * | 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` See merge request gitlab-org/gitlab-ce!17828 | ||||
| | * | [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 test that is going to break, that has not broken yet See merge request gitlab-org/gitlab-ce!17966 | ||||
| | * | | 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 button See merge request gitlab-org/gitlab-ce!17930 | ||||
| | * | | | Cleanup test for disabling comment submit buttonwinh-cleanup-comment-submit-test | Winnie Hellmann | 2018-03-22 | 2 | -95/+228 |
| | | | | | |||||
| * | | | | Merge branch ↵ | Stan Hu | 2018-03-23 | 7 | -17/+73 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '44564-error-500-while-attempting-to-resolve-conflicts-due-to-utf-8-conversion-error' into 'master' Resolve "Error 500 while attempting to resolve conflicts due to UTF-8 conversion error" Closes #44564 See merge request gitlab-org/gitlab-ce!17962 | ||||
| | * | | | | Fix 500 error when trying to resolve non-ASCII conflicts in editor | Sean McGivern | 2018-03-23 | 7 | -17/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we added caching, this meant that calling `can_be_resolved_in_ui?` didn't always call `lines`, which meant that we didn't get the benefit of the side-effect from that, where it forced the conflict data itself to UTF-8. To fix that, make this explicit by separating the `raw_content` (any encoding) from the `content` (which is either UTF-8, or an exception is raised). | ||||
| * | | | | | Merge branch ↵ | Filipa Lacerda | 2018-03-23 | 3 | -41/+83 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '44218-add-internationalization-support-for-the-prometheus-merge-request-widget' into 'master' Resolve "Add internationalization support for the Prometheus Merge Request widget" Closes #44218 See merge request gitlab-org/gitlab-ce!17753 | ||||
| | * | | | | | 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 ↵ | Filipa Lacerda | 2018-03-23 | 8 | -87/+88 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Problem with prettier setting trailingComma: all" Closes #44589 See merge request gitlab-org/gitlab-ce!17967 | ||||
| | * | | | | | | 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 See merge request gitlab-org/gitlab-ce!17968 | ||||
| | * | | | | | | | 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.1 See merge request gitlab-org/gitlab-ce!17959 | ||||
| | * | | | | | | | 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 strings Closes gitaly#1101 See merge request gitlab-org/gitlab-ce!17943 | ||||
| | * | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#1101 | ||||
| * | | | | | | | | | 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 steps Closes #40302 See merge request gitlab-org/gitlab-ce!17947 | ||||
| | * | | | | | | | | | Rollback to a set version instead of an arbitrary number of stepssh-improve-rollback-test | Stan Hu | 2018-03-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previously hard-coded value can fail when new migrations are introduced since multiple migrations may need to be rolled back atomically. Closes #40302 | ||||
| * | | | | | | | | | | Merge branch '44587-autolinking-includes-trailing-exclamation-marks' into ↵ | Robert Speicher | 2018-03-23 | 3 | -13/+15 |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Autolinking includes trailing exclamation marks" Closes #44587 See merge request gitlab-org/gitlab-ce!17965 | ||||
| | * | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Vue resource interceptor to performance bar See merge request gitlab-org/gitlab-ce!17915 | ||||
| | * | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTTPS only Pages Closes #28857 See merge request gitlab-org/gitlab-ce!16273 | ||||
| | * | | | | | | | | | | Add HTTPS-only pages | Rob Watson | 2018-03-22 | 24 | -107/+447 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #28857 | ||||
| * | | | | | | | | | | | 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.4 Closes #44554 See merge request gitlab-org/gitlab-ce!17945 | ||||
| | * | | | | | | | | | | Bump loofah to 2.2.2 and rails-html-sanitizer to 1.0.4sh-update-loofah | Stan Hu | 2018-03-22 | 3 | -5/+12 |
| | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See: * https://github.com/rails/rails-html-sanitizer/releases * https://github.com/flavorjones/loofah/releases | ||||
| * | | | | | | | | | | 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 See merge request gitlab-org/gitlab-ce!17957 | ||||
| | * | | | | | | | | | 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 See merge request gitlab-org/gitlab-ce!17953 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |