summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 'gitaly-519-commit-stats' into 'master'Robert Speicher2017-09-125-3/+61
|\ | | | | | | | | | | | | Migrate Git::CommitStats to Gitaly Closes gitaly#519 See merge request !14077
| * Migrate Git::CommitStats to Gitalygitaly-519-commit-statsKim "BKC" Carlbäcker2017-09-115-3/+61
| |
* | Merge branch 'rs-dev-email-docs' into 'master'Rémy Coutable2017-09-122-0/+24
|\ \ | | | | | | | | | | | | Add developer documentation about working with sent emails and previews See merge request !14227
| * | Add developer documentation about working with sent emails and previewsRobert Speicher2017-09-122-0/+24
|/ /
* | Merge branch '37025-error-500-in-non-utf8-branch-names' into 'master'Rémy Coutable2017-09-125-2/+30
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Error 500 in non-UTF8 branch names" This could potentially "duplicate" branches on the UI, but it prevents 500 errors. The real issue here is the fact that a branch name with a invalid UTF-8 characters. Closes #37025 See merge request !14090
| * | Resolve "Error 500 in non-UTF8 branch names"Micael Bergeron2017-09-125-2/+30
|/ /
* | Merge branch 'breadcrumbs-hover-underline' into 'master'Filipa Lacerda2017-09-121-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Fixed the breadcrumbs project name not having hover style Closes #37661 See merge request !14211
| * | Fixed the breadcrumbs project name not having hover stylebreadcrumbs-hover-underlinePhil Hughes2017-09-121-0/+1
| | | | | | | | | | | | Closes #37661
* | | Merge branch 'detect-orphaned-repositories' into 'master'Douwe Maan2017-09-126-0/+285
|\ \ \ | | | | | | | | | | | | | | | | Detect orphaned repositories See merge request !14204
| * | | Changelogdetect-orphaned-repositoriesGabriel Mazetto2017-09-121-0/+5
| | | |
| * | | Refactor on namespace and repository checks and added specsGabriel Mazetto2017-09-125-33/+196
| | | |
| * | | Detect orphaned repositories and namespaces in any storageGabriel Mazetto2017-09-123-0/+117
| | | |
* | | | Merge branch 'housekeeping_settings' into 'master'Douwe Maan2017-09-124-7/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to use same periods for housekeeping tasks Closes #34981 See merge request !13711
| * | | | Allow to use same periods for housekeeping tasksAlex Lossent2017-09-114-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables skipping a lesser housekeeping task (incremental or full repack) by consistently scheduling a higher task (respectively full repack or gc) with the same period. Cf. #34981
* | | | | Merge branch 'fly-out-nav-closest-undefined' into 'master'Tim Zallmann2017-09-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix JS error in fly-out nav See merge request !14212
| * | | | | Fix JS error in fly-out navPhil Hughes2017-09-121-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'replace_project_issues_award_emoji.feature' into 'master'Rémy Coutable2017-09-124-152/+109
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Replace the 'project/issues/award_emoji.feature' spinach test with an rspec analog See merge request !14202
| * | | | | Replace the 'project/issues/award_emoji.feature' spinach test with an rspec ↵Vitaliy @blackst0ne Klachkov2017-09-124-152/+109
| | | | | | | | | | | | | | | | | | | | | | | | analog
* | | | | | 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 analog See merge request !14177
| * | | | | | 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 dashboards Closes #27376 See merge request !14188
| * | | | | | Eager load namespace owners for project dashboardsdashboards-projects-controllerYorick Peterse2017-09-112-1/+6
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | This solves an N+1 query problem where we'd run multiple queries when getting the namespace owners of the displayed projects.
* | | | | | Merge branch 'reset-events-primary-key-mysql' into 'master'Rémy Coutable2017-09-121-0/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset primary keys after swapping events tables See merge request !14182
| * | | | | | Reset primary keys after swapping events tablesreset-events-primary-key-mysqlYorick Peterse2017-09-111-0/+24
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | This is required as otherwise newly created events will start with the wrong ID.
* | | | | | 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 Dashboard Closes #36953 See merge request !14040
| * | | | | 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 instance See merge request !13314
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a `wiki_page` factory instantiation for the case when project's namespace is a group Closes #37729 See merge request !14205
| * | | | | | Use WikiPages::CreateService in ↵Rémy Coutable2017-09-121-12/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spec/features/projects/wiki/user_updates_wiki_page_spec.rb Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | 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 rspec analog See merge request !14201
| * | | | | | Replace the 'project/merge_requests/revert.feature' spinach test with an ↵Vitaliy @blackst0ne Klachkov2017-09-124-85/+65
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | rspec analog
* | | | | | Merge branch 'replace_milestone.feature' into 'master'Rémy Coutable2017-09-124-78/+45
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Replace the 'project/milestone.feature' spinach test with an rspec analog See merge request !14171
| * | | | | 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.0 [ci skip] See merge request !14135
| * | | | | | 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 bar See merge request !14196
| * | | | | | | 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 tests See merge request !14195
| * | | | | | | Reset all connection schema cache after migration tests37608-reset-all-connectionsLin Jen-Shin2017-09-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We might also want to consider reduce the number of connections in the tests. However I just tried setting it to 1 and that doesn't seem enough for feature tests.
* | | | | | | | 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 box See merge request !14128
| * | | | | | | 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 rspec analog See merge request !14176
| * | | | | | Replace the 'project/merge_requests/accept.feature' spinach test with an ↵blackst0ne2017-09-114-83/+70
| |/ / / / / | | | | | | | | | | | | | | | | | | rspec analog
* | | | | | Merge branch 'replace_spinach_wiki.feature' into 'master'Rémy Coutable2017-09-118-470/+413
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace 'project/wiki.feature' spinach test with an rspec analog See merge request !13856
| * | | | | | 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 doc Closes gitlab-ee#3389 See merge request !14184
| * | | | | | Add gitaly to patch update docAchilleas Pipinellis2017-09-111-3/+11
| |/ / / / /
View Lorry Controller Status