summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* allow rspec files/options to be passed down in all casesbw-qa-rspec-optionsBrett Walker2018-03-265-12/+12
|
* Merge branch 'ab-43150-users-controller-show-query-limit' into 'master'Yorick Peterse2018-03-262-5/+10
|\ | | | | | | | | | | | | Remove N+1 query for Noteable association. Closes #43150 See merge request gitlab-org/gitlab-ce!17956
| * Remove N+1 query for Noteable association.ab-43150-users-controller-show-query-limitAndreas Brandl2018-03-232-5/+10
| | | | | | | | | | | | | | | | | | | | For each event with `Event#target_type` of "Note", we had a query to load the associated instance `noteable`. For example, if `Note` was related to an issue, we'd load each `Issue` with its own query (N+1 problem). Closes #43150.
* | Merge branch 'fix-40798-namespace-forking' into 'master'Douwe Maan2018-03-264-10/+22
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Forking with namespace doesn't work (API)" Closes #40798 See merge request gitlab-org/gitlab-ce!17815
| * | Resolve "Forking with namespace doesn't work (API)"Jan2018-03-264-10/+22
|/ /
* | Merge branch '40843-update-grape-to-v1-0-2-when-it-is-released' into 'master'Douwe Maan2018-03-262-8/+3
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Update grape to v1.0.2 when it is released" Closes #40843 See merge request gitlab-org/gitlab-ce!17983
| * | 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 'docs/rs-update-changelog' into 'master'Douwe Maan2018-03-261-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add missing changelog entries for 10.6.0 See merge request gitlab-org/gitlab-ce!17973 [ci skip]
| * | | Add missing changelog entries for 10.6.0docs/rs-update-changelogRobert Speicher2018-03-231-1/+5
| |/ /
* | | Merge branch '44581-meta-use-prettier-ignore-file-in-our-save-script' into ↵Phil Hughes2018-03-263-1/+24
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 'master' Make use of the prettier ignore file during our save script Closes #44581 See merge request gitlab-org/gitlab-ce!17960
| * | Make use of the prettier ignore file during our save scriptLukas Eipert2018-03-263-1/+24
|/ /
* | 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` See merge request gitlab-org/gitlab-ce!17828
| * | [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 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 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 button See merge request gitlab-org/gitlab-ce!17930
| * | | | Cleanup test for disabling comment submit buttonwinh-cleanup-comment-submit-testWinnie Hellmann2018-03-222-95/+228
| | | | |
* | | | | Merge branch ↵Stan Hu2018-03-237-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 editorSean McGivern2018-03-237-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 Lacerda2018-03-233-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-widgetJose Ivan Vargas2018-03-233-41/+83
| | | | | | |
* | | | | | | Merge branch '44589-problem-with-prettier-setting-trailingcomma-all' into ↵Filipa Lacerda2018-03-238-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 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 docs See merge request gitlab-org/gitlab-ce!17968
| * | | | | | | | 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.1 See merge request gitlab-org/gitlab-ce!17959
| * | | | | | | | 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 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-16beAhmad Sherif2018-03-222-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#1101
* | | | | | | | | 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 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-testStan Hu2018-03-221-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 Speicher2018-03-233-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-linkingSean McGivern2018-03-233-13/+15
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'performance-bar-vue-resource' into 'master'Filipa Lacerda2018-03-232-0/+25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Vue resource interceptor to performance bar See merge request gitlab-org/gitlab-ce!17915
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTTPS only Pages Closes #28857 See merge request gitlab-org/gitlab-ce!16273
| * | | | | | | | | | Add HTTPS-only pagesRob Watson2018-03-2224-107/+447
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #28857
* | | | | | | | | | | 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.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-loofahStan Hu2018-03-223-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-errorSean McGivern2018-03-231-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" 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 100 See merge request gitlab-org/gitlab-ce!17953
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Limit number of failed logins using LDAP for authentication" Closes #43525 See merge request gitlab-org/gitlab-ce!17886
View Lorry Controller Status