summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix gitlab.pot generation by removing line breaks47092-fix-pot-generationPaul Slaughter2018-06-0113-76/+87
|
* Merge branch '46997-fix-fogbugz-import-form-bs4' into 'master'Annabel Gray2018-06-011-6/+6
|\ | | | | | | | | | | | | Resolve "New Project > Import Project > FogBugz Import" Closes #46997 See merge request gitlab-org/gitlab-ce!19295
| * Fix FogBugz import form col sizingPaul Slaughter2018-05-311-6/+6
| |
* | Merge branch 'bootstrap-tooltip-hover' into 'master'Annabel Gray2018-06-011-1/+3
|\ \ | | | | | | | | | | | | | | | | | | Set bootstrap tooltip vue directive to only display on hover Closes #46824 See merge request gitlab-org/gitlab-ce!19294
| * | Set bootstrap tooltip vue directive to only display on hoverClement Ho2018-05-311-1/+3
| | |
* | | Merge branch 'bootstrap-tables' into 'master'Annabel Gray2018-06-011-3/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Style bootstrap 4 markdown tables Closes #47015 See merge request gitlab-org/gitlab-ce!19283
| * | | Style bootstrap 4 markdown tablesClement Ho2018-06-011-3/+12
|/ / /
* | | Merge branch '25955/update-404-pages' into 'master'Mike Greiling2018-05-3111-91/+353
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update 404 and 403 pages Closes #25955 See merge request gitlab-org/gitlab-ce!19096
| * | | Update 404 and 403 pagesPaul Slaughter2018-05-3111-91/+353
|/ / /
* | | Merge branch 'bootstrap-squash-alignment' into 'master'Annabel Gray2018-05-311-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix bootstrap squash checkbox alignment Closes #47055 See merge request gitlab-org/gitlab-ce!19292
| * | | Fix bootstrap squash checkbox alignmentClement Ho2018-05-311-2/+2
| |/ /
* | | Merge branch 'bootstrap-pipeline-right-align' into 'master'Annabel Gray2018-05-312-2/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix bootstrap pipeline right alignment Closes #46875 See merge request gitlab-org/gitlab-ce!19284
| * | | Fix bootstrap pipeline right alignmentClement Ho2018-05-312-2/+4
| | | |
* | | | Merge branch '46817-new-application' into 'master'Clement Ho2018-05-311-3/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Resolve "Admin area > New Application form" Closes #46817 See merge request gitlab-org/gitlab-ce!19290
| * | | Fix new application layoutAnnabel Dunstone Gray2018-05-311-3/+3
| | | |
* | | | Merge branch 'jivl-update-form-horizontal-usage' into 'master'Annabel Gray2018-05-317-30/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove form-horizontal class where applicable Closes #46744 See merge request gitlab-org/gitlab-ce!19262
| * | | | Remove form-horizontal class where applicableJose2018-05-317-30/+28
| | | | |
* | | | | Merge branch 'bootstrap-checkbox' into 'master'Annabel Gray2018-05-3143-215/+205
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix checkbox/radio button structure Closes #46766 and #46719 See merge request gitlab-org/gitlab-ce!19254
| * | | | Fix checkbox/radio button structureClement Ho2018-05-3143-215/+205
|/ / / /
* | | | Merge branch 'fix-snippets-embed' into 'master'Annabel Gray2018-05-312-21/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix snippets embed form Closes #46948 See merge request gitlab-org/gitlab-ce!19219
| * | | Fix snippets embed formClement Ho2018-05-312-21/+5
|/ / /
* | | Merge branch 'rails5-active-sup-subscriber' into 'master'Rémy Coutable2018-05-312-1/+6
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Make ActiveRecordSubscriber rails 5 compatible Closes #44702 See merge request gitlab-org/gitlab-ce!19276
| * | Make ActiveRecordSubscriber rails 5 compatibleJarka Kadlecová2018-05-312-1/+6
| | |
* | | Merge branch 'issue_45082' into 'master'Douwe Maan2018-05-315-230/+452
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add merge requests list endpoint for groups Closes #45082 See merge request gitlab-org/gitlab-ce!18915
| * | | Add merge requests list endpoint for groupsFelipe Artur2018-05-315-230/+452
|/ / /
* | | Merge branch '46552-fixes-redundant-message-for-failure-reasons' into 'master'Grzegorz Bizon2018-05-315-13/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixes redudant script failure message Closes #46552 and #44271 See merge request gitlab-org/gitlab-ce!19138
| * | | Moves script_failure conditional over lambda46552-fixes-redundant-message-for-failure-reasonsMayra Cabrera2018-05-301-2/+2
| | | | | | | | | | | | | | | | So the 'failed' message can actually indicate if the build failed or not
| * | | Removes redundant error message for script failuresMayra Cabrera2018-05-245-13/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Script failure message was redundant so it was removed. Also 'check your job log' message was removed from all the error messages. Closes #44271
* | | | Merge branch '41587-osw-mr-metrics-migration-take-two' into 'master'Grzegorz Bizon2018-05-3112-5/+138
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Take two for MR metrics population background migration See merge request gitlab-org/gitlab-ce!19097
| * | | Ensure metrics regardless of being imported on MRs41587-osw-mr-metrics-migration-take-twoOswaldo Ferreira2018-05-303-2/+2
| | | |
| * | | Take two for MR metrics population background migrationOswaldo Ferreira2018-05-309-3/+136
| | | |
* | | | Merge branch 'add-yarn-clean-step' into 'master'Mike Greiling2018-05-312-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add yarn clean step, to delete production compiled assets See merge request gitlab-org/gitlab-ce!19212
| * | | | Add yarn clean step, to delete production compiled assetsadd-yarn-clean-stepJose2018-05-292-1/+8
| | | | |
* | | | | Merge branch '46799-fix-tabs-bs4' into 'master'Clement Ho2018-05-315-26/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix active tab styling Closes #46799 See merge request gitlab-org/gitlab-ce!19264
| * | | | | Fix active tab stylingAnnabel Gray2018-05-315-26/+36
|/ / / / /
* | | | | Merge branch 'winh-capybara-html-hack-docs' into 'master'Clement Ho2018-05-311-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add link to hack for styling Capybara HTML dumps See merge request gitlab-org/gitlab-ce!19205
| * | | | | Add link to hack for styling Capybara HTML dumpsWinnie Hellmann2018-05-311-0/+4
|/ / / / /
* | | | | Merge branch '44184-issues_ical_feed' into 'master'Douwe Maan2018-05-3169-186/+569
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export assigned issues in iCalendar feed Closes #44184 See merge request gitlab-org/gitlab-ce!17783
| * | | | | Export assigned issues in iCalendar feedImre Farkas2018-05-3169-186/+569
|/ / / / /
* | | | | Merge branch 'sh-fix-issue-api-perf-n-plus-one' into 'master'Nick Thomas2018-05-312-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Eliminate cached N+1 queries for projects in Issue API See merge request gitlab-org/gitlab-ce!19269
| * | | | | Eliminate cached N+1 queries for projects in Issue APIStan Hu2018-05-312-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In CE, every `Issue` entity is also a `ProjectEntity`, which calls `entity&.project.try(:id)` to show the project ID. In an API request with 100 issues, this would hit the Rails statement cache 100 times for the same project and cause unnecessary overhead as related models would also be loaded. In EE, we call `Issue#supports_weight?` for each issue, which then calls `project&.feature_available?(:issue_weights)`. If the project is not preloaded, this incurs additional overhead, as each individual Project object has to be queried. This can lead to a significant performance hit. In loading the CE project with 100 issues, this contributed to at least 22% of the load time. See https://gitlab.com/gitlab-org/gitlab-ce/issues/47031 for why testing this is a bit tricky.
* | | | | | Merge branch 'rails5-fix-46230' into 'master'Rémy Coutable2018-05-312-6/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use strings as properties key in kubernetes service spec. See merge request gitlab-org/gitlab-ce!19265
| * | | | | | Use strings as properties key in kubernetes service spec.Jasper Maes2018-05-302-6/+11
| | | | | | |
* | | | | | | Merge branch 'gitignore-vendor-gitaly-ruby' into 'master'Rémy Coutable2018-05-311-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add /vendor/gitaly-ruby to gitignore See merge request gitlab-org/gitlab-ce!19261
| * | | | | | | Add /vendor/gitaly-ruby to gitignoreJacob Vosmaer2018-05-301-0/+1
| |/ / / / / /
* | | | | | | Merge branch 'rails5-calendar' into 'master'Yorick Peterse2018-05-311-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace .having with .where in calendar query Closes #46964 See merge request gitlab-org/gitlab-ce!19230
| * | | | | | | Replace .having with .where in calendar queryJan Provaznik2018-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the current syntax doesn't work properly in Rails 5, the resulting query looks like: HAVING "events"."project_id" IN (0) instead of: HAVING "events"."project_id" IN (SELECT "projects"."id" FROM... Also we should not use ActiveRecord internal methods. In this case we can filter projects in WHERE clause instead of doing this in HAVING clause. Usage of WHERE should be also more efficient because grouping is then done on much smaller subset of records.
* | | | | | | | Merge branch 'rails5-exists-query' into 'master'Yorick Peterse2018-05-311-5/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace `.exists` with `EXISTS ()` Closes #46277 See merge request gitlab-org/gitlab-ce!19178
| * | | | | | | | Replace `.exists` with `EXISTS ()`Jan Provaznik2018-05-281-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `.exists` should not be used because it's an internal ActiveRecord method, but we can easily generate the same sql query with `EXISTS`.
* | | | | | | | | Merge branch 'gitaly-0.104.0' into 'master'Douwe Maan2018-05-311-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Gitaly 0.104.0 See merge request gitlab-org/gitlab-ce!19258
View Lorry Controller Status