summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix malformed LDAP DNs in specmk-clean-ldap-user-dnsMichael Kozono2017-09-131-8/+8
* Trim extraneous spaces from DNsMichael Kozono2017-09-132-4/+171
* Merge branch 'rs-remove-bad-foreground-migration' into 'master'Stan Hu2017-09-121-57/+0
|\
| * Remove db/migrate/20170828135939_migrate_user_external_mail_data.rbRobert Speicher2017-09-121-57/+0
* | Merge branch 'patch-25' into 'master'Stan Hu2017-09-121-0/+2
|\ \ | |/ |/|
| * Improve formatting of pgloader lineStan Hu2017-09-121-1/+1
| * Update mysql_to_postgresql.md to deprecate these docs in favor of PGLoaderLee Matos2017-09-121-0/+2
* | Merge branch '37730-image-onion-skin-does-not-work-anymore' into 'master'Clement Ho2017-09-122-4/+9
|\ \ | |/ |/|
| * Resolve "Image onion skin + swipe does not work anymore"Tim Zallmann2017-09-122-4/+9
|/
* Merge branch 'revert-2f46c3a8' into 'master'Robert Speicher2017-09-1233-111/+648
|\
| * Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-1133-111/+648
* | Merge branch 'docs/autodevops-fixes' into 'master'Achilleas Pipinellis2017-09-121-19/+61
|\ \
| * | Fix Auto DevOps quick start guideAchilleas Pipinellis2017-09-121-19/+61
|/ /
* | Merge branch '31358_decrease_perceived_complexity_threshold_step2' into 'master'Robert Speicher2017-09-123-13/+26
|\ \
| * | Decrease Perceived Complexity threshold to 15Maxim Rydkin2017-09-123-13/+26
|/ /
* | Merge branch '31362_decrease_cyclomatic_complexity_threshold_step4' into 'mas...Robert Speicher2017-09-124-20/+42
|\ \
| * | Decrease Cyclomatic Complexity threshold to 13Maxim Rydkin2017-09-124-20/+42
|/ /
* | Merge branch 'gitaly-519-commit-stats' into 'master'Robert Speicher2017-09-125-3/+61
|\ \
| * | 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 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"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 stylebreadcrumbs-hover-underlinePhil Hughes2017-09-121-0/+1
* | | | Merge branch 'detect-orphaned-repositories' into 'master'Douwe Maan2017-09-126-0/+285
|\ \ \ \
| * | | | 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 tasksAlex Lossent2017-09-114-7/+27
* | | | | | Merge branch 'fly-out-nav-closest-undefined' into 'master'Tim Zallmann2017-09-121-1/+1
|\ \ \ \ \ \
| * | | | | | 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 a...Vitaliy @blackst0ne Klachkov2017-09-124-152/+109
* | | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |