summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix MembersFinder to never include group invitees.41461-project-members-slow-due-to-sqlAndreas Brandl2018-02-201-1/+1
* Fix N+1 query problem for users on members view.Andreas Brandl2018-02-201-1/+1
* Add changelog.Andreas Brandl2018-02-201-0/+5
* Use DISTINCT ON and translate to MySQL.Andreas Brandl2018-02-201-16/+34
* Simplify database queries in MembersFinder.Andreas Brandl2018-02-201-11/+22
* Merge branch 'move-spintach-project-network-graph-to-rspec' into 'master'Rémy Coutable2018-02-203-162/+108
|\
| * Move spinach project network graph tests to RSpecSemyon Pupkov2018-02-163-162/+108
* | Merge branch 'remove-unnecessary-validate-project' into 'master'Kamil Trzciński2018-02-203-3/+8
|\ \
| * | Remove unecessary validate: true from belongs_to :projectremove-unnecessary-validate-projectDylan Griffith2018-02-203-3/+8
* | | Merge branch 'remove-chart-show-bundle' into 'master'Phil Hughes2018-02-2011-29/+9
|\ \ \
| * | | fix broken specsremove-chart-show-bundleMike Greiling2018-02-194-5/+5
| * | | remove common_d3 bundleMike Greiling2018-02-193-15/+0
| * | | remove graphs_show webpack bundleMike Greiling2018-02-196-9/+4
* | | | Merge branch 'rs-over-testing' into 'master'Rémy Coutable2018-02-192-50/+2
|\ \ \ \
| * | | | Remove extraneous tests from Issues API specrs-over-testingRobert Speicher2018-02-192-50/+2
* | | | | Merge branch 'docs/rs-changelog-doc-links' into 'master'Rémy Coutable2018-02-191-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update two links in the changelog developer docsdocs/rs-changelog-doc-linksRobert Speicher2018-02-181-2/+2
* | | | | Merge branch 'chart.html.haml-refactor' into 'master'43411-update-postgresql-ha-docsClement Ho2018-02-1937-3533/+51
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Chart.html.haml refactorJacob Schatz2018-02-1937-3533/+51
|/ / / /
* | | | Merge branch '4826-github-import-wiki-fix-1' into 'master'Nick Thomas2018-02-193-2/+12
|\ \ \ \
| * | | | [GH Import] Create an empty wiki if wiki import failedValery Sizov2018-02-193-2/+12
|/ / / /
* | | | Merge branch '42274-group-request-membership-long-too' into 'master'Rémy Coutable2018-02-195-78/+114
|\ \ \ \
| * | | | Resolve "group request membership mail with too long list of "To:""🙈 jacopo beschi 🙉2018-02-195-78/+114
|/ / / /
* | | | Merge branch 'kp-fix-stacked-bar-progress-value-clipping' into 'master'Filipa Lacerda2018-02-192-1/+6
|\ \ \ \
| * | | | Add changelog entrykp-fix-stacked-bar-progress-value-clippingKushal Pandya2018-02-191-0/+5
| * | | | Fix single digit value clippingKushal Pandya2018-02-191-1/+1
|/ / / /
* | | | Merge branch 'jej/avoid-slow-file-lock-checks' into 'master'Sean McGivern2018-02-193-5/+10
|\ \ \ \
| * | | | Avoid slow File Lock checks when not usedJames Edwards-Jones2018-02-193-5/+10
* | | | | Merge branch 'flipper-caching' into 'master'Douwe Maan2018-02-192-1/+6
|\ \ \ \ \
| * | | | | Increase feature flag cache TTL to one hourYorick Peterse2018-02-192-1/+6
* | | | | | Merge branch 'qa/gb/fix-tests-for-hidden-secret-variables' into 'master'Rémy Coutable2018-02-195-40/+34
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove useless assignment in secret variables specsqa/gb/fix-tests-for-hidden-secret-variablesGrzegorz Bizon2018-02-161-1/+1
| * | | | | Fix and simplify end-to-end tests for secret variablesGrzegorz Bizon2018-02-165-39/+33
| | |_|/ / | |/| | |
* | | | | Merge branch '32564-fix-double-system-closing-notes' into 'master'Sean McGivern2018-02-195-25/+51
|\ \ \ \ \
| * | | | | Convert Gitaly commit parent IDs to array as early as possibleSean McGivern2018-02-191-10/+1
| * | | | | applying feedback32564-fix-double-system-closing-notesMicaël Bergeron2018-02-163-5/+6
| * | | | | fix specsMicaël Bergeron2018-02-162-13/+18
| * | | | | add changelogMicaël Bergeron2018-02-161-0/+5
| * | | | | stop ProcessCommitWorker from processing MR merge commitMicaël Bergeron2018-02-163-17/+41
* | | | | | Merge branch 'sh-guard-read-only-user-updates' into 'master'Nick Thomas2018-02-193-0/+15
|\ \ \ \ \ \
| * | | | | | Don't attempt to update user tracked fields if database is in read-onlysh-guard-read-only-user-updatesStan Hu2018-02-173-0/+15
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'docs-articles-layout-frontmatter' into 'master'Achilleas Pipinellis2018-02-1911-63/+90
|\ \ \ \ \ \
| * | | | | | Update all articles with the new layout (meta data from the frontmatter)docs-articles-layout-frontmatterMarcia Ramos2018-02-1611-63/+90
* | | | | | | Merge branch 'sh-fix-squash-rebase-utf8-data' into 'master'Sean McGivern2018-02-193-0/+18
|\ \ \ \ \ \ \
| * | | | | | | Clarify changelog for squash encoding fixSean McGivern2018-02-191-1/+1
| * | | | | | | Fix squash rebase not working when diff contained encoded datash-fix-squash-rebase-utf8-dataStan Hu2018-02-183-0/+18
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'ee-webpack-backport' into 'master'Filipa Lacerda2018-02-191-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Backport webpack.config.js changes from EEee-webpack-backportPhil Hughes2018-02-161-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'sh-fix-geo-error-500-gpg-commit' into 'master'Douwe Maan2018-02-193-2/+33
|\ \ \ \ \ \ \
| * | | | | | | Fix Error 500 when viewing a commit with a GPG signature in GeoStan Hu2018-02-193-2/+33
| | |/ / / / / | |/| | | | |