summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix schema.rb18608-lock-issues-feLuke "Jared" Bennett2017-09-121-1751/+1751
* Revert incorrect diffsLuke "Jared" Bennett2017-09-1216-1994/+1758
* Merge branch '18608-lock-issues' into 18608-lock-issues-feLuke "Jared" Bennett2017-09-12337-3029/+6154
|\
| * Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-121565-13685/+44914
| |\
| | * Merge branch 'replace_project_builds_summary.feature' into 'master'Rémy Coutable2017-09-125-73/+74
| | |\
| | | * Replace the 'project/builds/summary.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-125-73/+74
| | * | Merge branch 'dashboards-projects-controller' into 'master'Rémy Coutable2017-09-122-1/+6
| | |\ \
| | | * | Eager load namespace owners for project dashboardsdashboards-projects-controllerYorick Peterse2017-09-112-1/+6
| | * | | Merge branch 'reset-events-primary-key-mysql' into 'master'Rémy Coutable2017-09-121-0/+24
| | |\ \ \
| | | * | | Reset primary keys after swapping events tablesreset-events-primary-key-mysqlYorick Peterse2017-09-111-0/+24
| | | |/ /
| | * | | Merge branch '36953-add-gitLab-pages-version-to-admin-dashboard' into 'master'Rémy Coutable2017-09-123-0/+15
| | |\ \ \
| | | * | | Add GitLab-Pages version to Admin DashboardTravis Miller2017-09-073-0/+15
| | * | | | Merge branch 'hide-read-registry-scope-when-registry-disabled' into 'master'Kamil Trzciński2017-09-128-13/+80
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Hide read_registry scope when registry is disabled on instanceRobin Bobbitt2017-08-218-13/+80
| | * | | | Merge branch '37729-fix-wiki-page-let' into 'master'Rémy Coutable2017-09-121-12/+2
| | |\ \ \ \
| | | * | | | Use WikiPages::CreateService in spec/features/projects/wiki/user_updates_wiki...Rémy Coutable2017-09-121-12/+2
| | |/ / / /
| | * | | | Merge branch 'replace_project_merge_requests_revert.feature' into 'master'Rémy Coutable2017-09-124-85/+65
| | |\ \ \ \
| | | * | | | Replace the 'project/merge_requests/revert.feature' spinach test with an rspe...Vitaliy @blackst0ne Klachkov2017-09-124-85/+65
| | * | | | | Merge branch 'replace_milestone.feature' into 'master'Rémy Coutable2017-09-124-78/+45
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Replace the project/milestone.feature spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-124-78/+45
| | * | | | | Merge branch 'jk-update-install-guide' into 'master'Robert Speicher2017-09-118-8/+364
| | |\ \ \ \ \
| | | * | | | | update installation and update instructions for 10.0jk-update-install-guideJarka Kadlecova2017-09-118-8/+364
| | * | | | | | Merge branch 'docs-group-mrs-list-view-search-bar' into 'master'Clement Ho2017-09-112-2/+0
| | |\ \ \ \ \ \
| | | * | | | | | Docs group mrs list view search barVictor Wu2017-09-112-2/+0
| | |/ / / / / /
| | * | | | | | Merge branch '37608-reset-all-connections' into 'master'Robert Speicher2017-09-111-1/+3
| | |\ \ \ \ \ \
| | | * | | | | | Reset all connection schema cache after migration tests37608-reset-all-connectionsLin Jen-Shin2017-09-121-1/+3
| | * | | | | | | Merge branch 'consistent-tooltip-direction-on-commits' into 'master'Clement Ho2017-09-112-1/+6
| | |\ \ \ \ \ \ \
| | | * | | | | | | Make all the tooltips in the same direction on the commit info boxJedidiah2017-09-112-1/+6
| | |/ / / / / / /
| | * | | | | | | Merge branch 'replace_project_merge_requests_accept.feature' into 'master'Rémy Coutable2017-09-114-83/+70
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Replace the 'project/merge_requests/accept.feature' spinach test with an rspe...blackst0ne2017-09-114-83/+70
| | | |/ / / / /
| | * | | | | | Merge branch 'replace_spinach_wiki.feature' into 'master'Rémy Coutable2017-09-118-470/+413
| | |\ \ \ \ \ \
| | | * | | | | | Replace 'project/wiki.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-118-470/+413
| | | | |/ / / / | | | |/| | | |
| | * | | | | | Merge branch 'docs/gitaly-patch-update' into 'master'Rémy Coutable2017-09-111-3/+11
| | |\ \ \ \ \ \
| | | * | | | | | Add gitaly to patch update docAchilleas Pipinellis2017-09-111-3/+11
| | | |/ / / / /
| | * | | | | | Merge branch 'italicized_emoji' into 'master'Annabel Dunstone Gray2017-09-112-0/+6
| | |\ \ \ \ \ \
| | | * | | | | | Emoji was rendered as italicBranka Martinovic2017-09-112-0/+6
| | |/ / / / / /
| | * | | | | | Merge branch 'replace_group_links.feature' into 'master'Rémy Coutable2017-09-114-67/+46
| | |\ \ \ \ \ \
| | | * | | | | | Replace project/group_links.feature spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-104-67/+46
| | | |/ / / / /
| | * | | | | | Merge branch 'docs/document-swapping-tables' into 'master'Rémy Coutable2017-09-112-0/+54
| | |\ \ \ \ \ \
| | | * | | | | | Document how to swap database tables.docs/document-swapping-tablesYorick Peterse2017-09-112-0/+54
| | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Merge branch 'ie-event-polyfill' into 'master'Phil Hughes2017-09-114-1/+30
| | |\ \ \ \ \ \
| | | * | | | | | Adds Event polyfill for IEFilipa Lacerda2017-09-114-1/+30
| | |/ / / / / /
| | * | | | | | Merge branch 'rc/backport-workhorse-send_artifacts_entry-signature-from-ee' i...Kamil Trzciński2017-09-111-2/+2
| | |\ \ \ \ \ \
| | | * | | | | | Backport the EE signature of Gitlab::Workhorse#send_artifacts_entryrc/backport-workhorse-send_artifacts_entry-signature-from-eeRémy Coutable2017-09-081-2/+2
| | * | | | | | | Merge branch 'sh-filter-runner-token' into 'master'Robert Speicher2017-09-111-2/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | Expand filtered parameters to include `token`sh-filter-runner-tokenStan Hu2017-09-101-2/+2
| | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Merge branch '37647-follow-up-from-update-helm-chart-docs-from-ce-docs' into ...Achilleas Pipinellis2017-09-111-2/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix links37647-follow-up-from-update-helm-chart-docs-from-ce-docsJoshua Lambert2017-09-082-6/+6
| | | * | | | | | | Fix linksJoshua Lambert2017-09-083-9/+9
| | | * | | | | | | Make links relativeJoshua Lambert2017-09-084-14/+14