summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* API: Fix archived parameter for projects APIapi-fix-archivedRobert Schilling2018-02-204-6/+52
* Merge branch 'zj-unit-test-gitaly-arrays' into 'master'Sean McGivern2018-02-202-0/+5
|\
| * Add unit tests for Gitaly typeszj-unit-test-gitaly-arraysZeger-Jan van de Weg2018-02-202-0/+5
* | Merge branch '43427-generate-ee-changelog-items-in-ee-changelogs' into 'master'Robert Speicher2018-02-202-4/+5
|\ \
| * | Generate EE changelog under ee/changelogs/unreleased/Rémy Coutable2018-02-202-4/+5
* | | Merge branch 'revert-828357fb' into 'master'Douwe Maan2018-02-201-1/+4
|\ \ \
| * | | Revert "Merge branch 'zj-n-1-root-show' into 'master'"Zeger-Jan van de Weg2018-02-201-1/+4
| |/ /
* | | Merge branch 'fix-diff-flash' into 'master'Clement Ho2018-02-201-1/+3
|\ \ \ | |/ / |/| |
| * | only show error if there is an errorfix-diff-flashSimon Knox2018-02-201-1/+3
* | | Merge branch 'docs-comm-article-phoenix-app-gitlab-ci' into 'master'Marcia Ramos2018-02-209-55/+428
|\ \ \
| * | | Docs: comm article Phoenix App with GitLab CI/CDMarcia Ramos2018-02-209-55/+428
|/ / /
* | | Merge branch 'docs-pages-refactor-article-series' into 'master'Achilleas Pipinellis2018-02-206-97/+53
|\ \ \
| * | | Docs: Pages - clean up articlesMarcia Ramos2018-02-206-97/+53
|/ / /
* | | Merge branch '43424-put_all_event_metrics_behind_feature_flags' into 'master'Douwe Maan2018-02-201-2/+3
|\ \ \
| * | | Only use features for eventsPawel Chojnacki2018-02-201-3/+3
| * | | Put all event metrics exposed to prometheus behind a feature flagPawel Chojnacki2018-02-201-0/+1
* | | | Merge branch '43376-follow-up-from-docs-update-all-articles-with-the-new-layo...Achilleas Pipinellis2018-02-201-2/+2
|\ \ \ \
| * | | | specify date format43376-follow-up-from-docs-update-all-articles-with-the-new-layout-metadata-from-the-frontmatterMarcia Ramos2018-02-191-2/+2
* | | | | Merge branch 'docs/lfs-lock' into 'master'Marcia Ramos2018-02-201-1/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add version which LFS lock was introduceddocs/lfs-lockAchilleas Pipinellis2018-02-201-1/+3
| | |_|/ | |/| |
* | | | 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