summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use the new query-recorder features as a PoCbvl-extend-query-recorderBob Van Landuyt2017-09-142-5/+5
|
* Extend the QueryRecorder matcherBob Van Landuyt2017-09-141-2/+34
| | | | | So it can report the queries that we're run more compared to the control point.
* Merge branch '35978-milestone-title' into 'master'Phil Hughes2017-09-144-3/+15
|\ | | | | | | | | | | | | Truncate milestone text on collapse; add tooltip for title Closes #35978 See merge request gitlab-org/gitlab-ce!14123
| * Truncate milestone text on collapse; add tooltip for titleAnnabel Dunstone Gray2017-09-144-3/+15
|/
* Merge branch '37573-fix-sidebar-active-color' into 'master'Phil Hughes2017-09-142-16/+18
|\ | | | | | | | | | | | | Update badge color to match theme; lighten active color in sidebar Closes #37573 See merge request gitlab-org/gitlab-ce!14116
| * Update badge color to match theme; lighten active color in sidebarAnnabel Dunstone Gray2017-09-142-16/+18
|/
* Merge branch '34510-board-issues-sql-speedup' into 'master'Douwe Maan2017-09-144-5/+31
|\ | | | | | | | | | | | | fix #34510 add association preloading for issue boards Closes #34510 See merge request gitlab-org/gitlab-ce!14198
| * fix another N+1 query for label priorities34510-board-issues-sql-speedupmicael.bergeron2017-09-123-3/+19
| | | | | | | | added a QueryRecorder for IssuesController#index.json
| * add changelog entrymicael.bergeron2017-09-121-0/+5
| |
| * add association preloading for issue boardsmicael.bergeron2017-09-121-4/+9
| |
* | Merge branch ↵Douwe Maan2017-09-144-3/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-header' into 'master' Resolve "Renamed files have escaped HTML for the inline diff in the header" Closes #37576 See merge request gitlab-org/gitlab-ce!14121
| * | changed InlineDiffMarker to make it html_safe its output37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-headermicael.bergeron2017-09-123-4/+5
| | | | | | | | | | | | updated the spec
| * | rework the html_safe not to use haml's auto escapingmicael.bergeron2017-09-113-3/+21
| | | | | | | | | | | | add feature test for inline diff in file header
| * | make diff file header html safe when file is renamedmicael.bergeron2017-09-111-2/+2
| | |
* | | Merge branch 'sub-group-dropdown-width' into 'master'Annabel Dunstone Gray2017-09-141-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed width of sub-group in breadcrumb dropdown Closes #37745 See merge request !14210
| * | | Fixed width of sub-group in breadcrumb dropdownsub-group-dropdown-widthPhil Hughes2017-09-131-3/+3
| | | | | | | | | | | | | | | | Closes #37745
* | | | Merge branch 'fix_default_navigation_theme_selection' into 'master'Robert Speicher2017-09-131-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix default navigation theme selection Closes #37777 See merge request !14260
| * | | | Fix the default navigation theme selection on invalid idVitaliy @blackst0ne Klachkov2017-09-141-1/+1
|/ / / /
* | | | Merge branch 'repo-editor-ui-fix' into 'master'Jacob Schatz2017-09-132-2/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several repo editor fixes Closes #36128, #36240, and #37733 See merge request !14126
| * | | | RepoEditor: Fix markdown preview rendering.Fatih Acet2017-09-131-2/+2
| | | | |
| * | | | RepoEditor: Fix active line hilite color.Fatih Acet2017-09-131-0/+5
| | | | |
| * | | | RepoEditor: Fix empty state for image blob view.Fatih Acet2017-09-132-1/+8
|/ / / /
* | | | Merge branch 'backport-ee-changes-to-url-sanitizer' into 'master'Rémy Coutable2017-09-132-4/+30
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Backport more EE changes to Gitlab::UrlSanitizer See merge request !14150
| * | | Backport more EE changes to Gitlab::UrlSanitizerNick Thomas2017-09-112-4/+30
| | | |
* | | | Merge branch 'revert-373ff978' into 'master'Stan Hu2017-09-131-0/+57
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'rs-remove-bad-foreground-migration' into 'master'" See merge request !14253
| * | | | Revert "Merge branch 'rs-remove-bad-foreground-migration' into 'master'"Robert Speicher2017-09-131-0/+57
| | | | | | | | | | | | | | | This reverts merge request !14240
* | | | | Merge branch 'docs-gitaly-client-config' into 'master'Achilleas Pipinellis2017-09-131-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix Ruby syntax error in Gitaly config example See merge request !14208
| * | | | | Fix Ruby syntax error in Gitaly config exampledocs-gitaly-client-configJacob Vosmaer2017-09-121-2/+2
| | | | | |
* | | | | | Merge branch 'ce-backport-new-sidebar-boards' into 'master'Filipa Lacerda2017-09-133-8/+24
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | CE backport of new-sidebar-boards See merge request !14246
| * | | | | CE backport of new-sidebar-boardsce-backport-new-sidebar-boardsPhil Hughes2017-09-133-8/+24
| | | | | |
* | | | | | Merge branch 'sh-exclude-api-responses' into 'master'Robert Speicher2017-09-131-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude logging of API responses to prevent leakage of confidential data See merge request !14245
| * | | | | | Exclude logging of API responses to prevent leakage of confidential datash-exclude-api-responsesStan Hu2017-09-131-1/+0
| | | | | | |
* | | | | | | Merge branch 'backstage/gb/optimize-some-specs-with-rspec-set' into 'master'Rémy Coutable2017-09-138-41/+59
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize some tests with RSpec Set See merge request !14047
| * | | | | | | Fix job coverage specsbackstage/gb/optimize-some-specs-with-rspec-setGrzegorz Bizon2017-09-131-1/+1
| | | | | | | |
| * | | | | | | Fix build specs after using `set` instead of `let`Grzegorz Bizon2017-09-131-13/+22
| | | | | | | |
| * | | | | | | Fix syntax error in LFS objects specsGrzegorz Bizon2017-09-131-1/+1
| | | | | | | |
| * | | | | | | Optimize CI/CD build retry service specsGrzegorz Bizon2017-09-131-4/+5
| | | | | | | |
| * | | | | | | Optimize CI/CD build model specsGrzegorz Bizon2017-09-131-8/+5
| | | | | | | |
| * | | | | | | Optimize generic specs for servicesGrzegorz Bizon2017-09-131-6/+7
| | | | | | | |
| * | | | | | | Optimize a few simple spec files by using `set`Grzegorz Bizon2017-09-134-6/+9
| | | | | | | |
| * | | | | | | Optimize LFS objects specsGrzegorz Bizon2017-09-131-4/+11
| | | | | | | |
* | | | | | | | Merge branch 'refactor-monitoring-service' into 'master'Phil Hughes2017-09-133-54/+61
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor MonitoringService class See merge request !14003
| * | | | | | | | Refactor MonitoringService classMike Greiling2017-09-133-54/+61
|/ / / / / / / /
* | | | | | | | Merge branch 'patch-26' into 'master'Rémy Coutable2017-09-131-3/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete duplicated lines. See merge request !14180
| * | | | | | | | Delete duplicated lines.Shinichi Maeshima2017-09-111-3/+0
| | | | | | | | |
* | | | | | | | | Merge branch '18308-escape-characters' into 'master'Rémy Coutable2017-09-133-1/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Escape characters in git user name Closes #18308 See merge request !14020
| * | | | | | | | | escape characters in git user nameBrandon Everett2017-09-133-1/+17
|/ / / / / / / / /
* | | | | | | | | Merge branch ↵Kamil Trzciński2017-09-133-1/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/sm/37559-pipeline-triggered-through-api-not-showing-trigger-variables' into 'master' Fix `ci_builds` to have an associated `trigger_request_id` See merge request !14244
| * | | | | | | | | Add change log. Fix spec.fix/sm/37559-pipeline-triggered-through-api-not-showing-trigger-variablesShinya Maeda2017-09-132-1/+7
| | | | | | | | | |
| * | | | | | | | | Fix PipelineTriggerService to associate trigger_request with buildsShinya Maeda2017-09-132-1/+3
| | | | | | | | | |
View Lorry Controller Status