summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add missing index for getting recent push eventsindexes-for-recent-push-eventsYorick Peterse2017-09-142-2/+42
| | | | | | | | | This index is required to allow fast retrieval of recent push events without merge requests. Without this index in place the query would lead to PostgreSQL scanning over 150 000 index entries all the time, easily taking up between 200 and 500 milliseconds. This index reduces the time spent in this process to around 40 milliseconds on GitLab.com.
* Merge branch 'docs-my-reaction-filter' into 'master'Achilleas Pipinellis2017-09-141-2/+2
|\ | | | | | | | | Docs filter by my reaction See merge request gitlab-org/gitlab-ce!14197
| * Docs filter by my reactionVictor Wu2017-09-141-2/+2
|/
* Merge branch 'ci-environment-status-performance' into 'master'Stan Hu2017-09-145-3/+32
|\ | | | | | | | | | | | | Constrain environment deployments to project IDs Closes #36877 See merge request gitlab-org/gitlab-ce!14252
| * Disallow NULL values for environments.project_idci-environment-status-performanceYorick Peterse2017-09-133-2/+23
| |
| * Constrain environment deployments to project IDsYorick Peterse2017-09-132-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When querying the deployments of an environment the query Rails produces will be along the lines of the following: SELECT * FROM deployments WHERE environment_id = X For queries such as this (or queries that use this as their base and add more conditions) there is no meaningful index that can be used as long as deployments.project_id is not part of a WHERE clause. To work around this we change that "has_many :deployments" relation to always add a "WHERE project_id = X" condition. This means that queries filtering deployments can make better use of the existing indexes. For example, when filtering by deployments.iid this will result in the following query: SELECT * FROM deployments WHERE environment_id = X AND project_id = Y AND iid = Z This means PostgreSQL can use the existing index on (project_id, environment_id, iid) instead of having to use a different index (or none at all) and having to scan over a large amount of data. Query plan wise this means that instead of this query and plan: EXPLAIN (BUFFERS, ANALYZE) SELECT deployments.* FROM deployments WHERE deployments.environment_id = 5 AND deployments.iid = 225; Index Scan using index_deployments_on_project_id_and_iid on deployments (cost=0.42..14465.75 rows=1 width=117) (actual time=6.394..38.048 rows=1 loops=1) Index Cond: (iid = 225) Filter: (environment_id = 5) Rows Removed by Filter: 839 Buffers: shared hit=4534 Planning time: 0.076 ms Execution time: 38.073 ms We produce the following query and plan: EXPLAIN (BUFFERS, ANALYZE) SELECT deployments.* FROM deployments WHERE deployments.environment_id = 5 AND deployments.iid = 225 AND deployments.project_id = 1292351; Index Scan using index_deployments_on_project_id_and_iid on deployments (cost=0.42..4.45 rows=1 width=117) (actual time=0.018..0.018 rows=1 loops=1) Index Cond: ((project_id = 1292351) AND (iid = 225)) Filter: (environment_id = 5) Buffers: shared hit=4 Planning time: 0.088 ms Execution time: 0.039 ms On GitLab.com these changes result in a (roughly) 11x improvement in SQL timings for the CI environment status endpoint. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36877
* | Merge branch 'change-dashed-border-button-color' into 'master'Annabel Dunstone Gray2017-09-143-1/+8
|\ \ | | | | | | | | | | | | Changed dashed border button color to be darker See merge request gitlab-org/gitlab-ce!14041
| * | changed dashed border button color to be darkerchange-dashed-border-button-colorDimitrie Hoekstra2017-09-143-1/+8
| | |
* | | Merge branch 'uipolish-fix-remember-me-checkbox' into 'master'Annabel Dunstone Gray2017-09-143-3/+12
|\ \ \ | | | | | | | | | | | | | | | | Add missing classes to omniauth remember-me checkbox and add correct font-size See merge request gitlab-org/gitlab-ce!14111
| * | | Add missing classes to omniauth remember-me checkbox and add correct font-sizeJedidiah2017-09-143-3/+12
|/ / /
* | | Merge branch 'bvl-extend-query-recorder' into 'master'Rémy Coutable2017-09-143-7/+39
|\ \ \ | | | | | | | | | | | | | | | | Extend the QueryRecorder matcher See merge request gitlab-org/gitlab-ce!14267
| * | | 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 'gitlab-git-user' into 'master'Rémy Coutable2017-09-147-39/+45
|\ \ \ | | | | | | | | | | | | | | | | Rename Gitlab::Git::Committer to User See merge request gitlab-org/gitlab-ce!14254
| * | | Rename Gitlab::Git::Committer to UserJacob Vosmaer2017-09-147-39/+45
| | | |
* | | | Merge branch 'refactor-animate-js' into 'master'Clement Ho2017-09-144-57/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Reduce footprint of animate.js See merge request gitlab-org/gitlab-ce!14187
| * | | | Remove animate.js and the issuable label pulse animation.refactor-animate-jsBryce Johnson2017-09-134-57/+5
| | | | | | | | | | | | | | | | | | | | Nobody tell @jschatz1 :P
* | | | | Merge branch '37739-improve-nginx-ingress-configuration-docs' into 'master'Achilleas Pipinellis2017-09-141-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve nginx ingress configuration docs Closes #37739 See merge request gitlab-org/gitlab-ce!14203
| * | | | | Minor improvements37739-improve-nginx-ingress-configuration-docsJoshua Lambert2017-09-111-4/+4
| | | | | |
* | | | | | Merge branch 'docs/environment-url' into 'master'Rémy Coutable2017-09-141-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose the URL of the environment when triggering a docs review app See merge request gitlab-org/gitlab-ce!14236
| * | | | | | Use a secret variable to define the repo suffixdocs/environment-urlAchilleas Pipinellis2017-09-141-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That's a hack since we cannot inject variables that are defined in `script:` into `environments:url`, and we want to avoid maintaining two different job versions in CE and EE. Relevant discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14236/diffs#note_40140693
| * | | | | | Expose URL under environments when triggering a docs review appAchilleas Pipinellis2017-09-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Useful as it will be shown directly in the MR
* | | | | | | Merge branch '37845-fix-oauth-provider-forced-encoding' into 'master'Grzegorz Bizon2017-09-142-5/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't force the encoding of the OAuth provider in Gitlab::OAuth::AuthHash#provider Closes #37845 See merge request gitlab-org/gitlab-ce!14263
| * | | | | | | Don't force the encoding of the OAuth provider in ↵37845-fix-oauth-provider-forced-encodingRémy Coutable2017-09-142-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::OAuth::AuthHash#provider Some providers freeze their name (e.g. https://github.com/zquestz/omniauth-google-oauth2/blob/414c43ef3ffec37d473321f262e80f1e46dda89f/lib/omniauth/strategies/google_oauth2.rb#L1), so trying to modify the string would fail with a `can't modify frozen String` exception (see https://gitlab.com/gitlab-org/gitlab-ce/issues/37845#note_40308148). In this case, we can just stop trying to force the encoding of the provider name as they should always be in utf8 by default. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch '37759-also-treat-newlines-as-separator' into 'master'Kamil Trzciński2017-09-143-14/+30
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treat newlines as separators for pipeline emails service Closes #37759 See merge request gitlab-org/gitlab-ce!14250
| * | | | | | | | Add changelog entry37759-also-treat-newlines-as-separatorLin Jen-Shin2017-09-131-0/+5
| | | | | | | | |
| * | | | | | | | Also treat newlines as separator, as people would do thatLin Jen-Shin2017-09-132-14/+25
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this fix, I don't know if those emails would work having newlines in them.
* | | | | | | | Merge branch 'repo-cache-fix' into 'master'Kamil Trzciński2017-09-142-2/+8
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Restore has_visible_content? to improve performance (cache) See merge request gitlab-org/gitlab-ce!14264
| * | | | | | | Restore has_visible_content? to improve performance (cache)repo-cache-fixJarka Kadlecova2017-09-142-2/+8
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | This method was moved to ::Git but it is not cached there which causes performance problems
* | | | | | | 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
View Lorry Controller Status