summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* resolve merge conflictfix/project-import_urlJames Lopez2016-04-151-5/+1
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-imp...James Lopez2016-04-1553-98/+558
|\
| * Merge branch 'rs-trailing-slash-in-search' into 'master' Douwe Maan2016-04-152-1/+7
| |\
| | * Escape the query argument provided to `git grep` by `search_files`rs-trailing-slash-in-searchRobert Speicher2016-04-092-1/+7
| * | Merge branch 'fix-migrate_new_notification_setting' into 'master' Robert Speicher2016-04-141-1/+1
| |\ \
| | * | Fix datetime format when migrating new notification settings on MySQLDouglas Barbosa Alexandre2016-04-141-1/+1
| * | | Merge branch 'patch-1' into 'master' Robert Speicher2016-04-141-1/+1
| |\ \ \
| | * | | change: "very demand" changed to "specific demand" Jamie Neubert Pedersen2016-04-141-1/+1
| * | | | Merge branch '14176-diff-paste-data' into 'master' Jacob Schatz2016-04-147-31/+62
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Syntax & style updates14176-diff-paste-dataAnnabel Dunstone2016-04-145-29/+31
| | * | | Update click_diff_lineAnnabel Dunstone2016-04-141-1/+1
| | * | | Add line type conditional to diff line helperAnnabel Dunstone2016-04-144-11/+17
| | * | | Add content attributes to discussion diffs; change styling of add-note icon t...Annabel Dunstone2016-04-144-22/+24
| | * | | Copying and pasting doesn't grab line numbers or +/-Annabel Dunstone2016-04-144-6/+27
| * | | | Merge branch 'rs-sentry-contexts' into 'master' Stan Hu2016-04-141-8/+10
| |\ \ \ \
| | * | | | Add Sentry program context even without a current userRobert Speicher2016-04-141-8/+10
| * | | | | Merge branch 'remove-ci-nginx-config' into 'master' Robert Speicher2016-04-141-29/+0
| |\ \ \ \ \
| | * | | | | Remove deprecated NGINX CI configAchilleas Pipinellis2016-04-141-29/+0
| * | | | | | Merge branch 'emoji_category_fix' into 'master' Robert Speicher2016-04-143-3/+21
| |\ \ \ \ \ \
| | * | | | | | Emoji categories fixValery Sizov2016-04-143-3/+21
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'subscribe-button-fix' into 'master' Jacob Schatz2016-04-148-16/+10
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Fixed style issuessubscribe-button-fixPhil Hughes2016-04-141-1/+1
| | * | | | | Fixed haml style issuesPhil Hughes2016-04-141-1/+1
| | * | | | | Fixed issue with failing testsPhil Hughes2016-04-123-3/+3
| | * | | | | Removed references to subscribe-button CSS classPhil Hughes2016-04-128-16/+10
| * | | | | | Merge branch 'auto-fsck' into 'master' Robert Speicher2016-04-1429-8/+445
| |\ \ \ \ \ \
| | * | | | | | Update CHANGELOG for "Auto git fsck"Robert Speicher2016-04-141-0/+1
| | * | | | | | Shut up, RubocopRobert Speicher2016-04-141-3/+3
| | * | | | | | More create_listauto-fsckJacob Vosmaer2016-04-141-1/+1
| | * | | | | | Documentation / help improvementsJacob Vosmaer2016-04-143-5/+7
| | * | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-13124-491/+4249
| | |\ \ \ \ \ \
| | * | | | | | | Use more conservative limitsJacob Vosmaer2016-04-133-9/+9
| | * | | | | | | Schema improvements suggested by YorickJacob Vosmaer2016-04-132-2/+5
| | * | | | | | | Clear repository check columns asynchronouslyJacob Vosmaer2016-04-1311-121/+150
| | * | | | | | | Remove \f. WT\F ??Jacob Vosmaer2016-04-131-1/+1
| | * | | | | | | Use new "clear all" button in testsJacob Vosmaer2016-04-132-36/+49
| | * | | | | | | Always check the wiki tooJacob Vosmaer2016-04-131-2/+3
| | * | | | | | | Make check result staleness more obviousJacob Vosmaer2016-04-131-1/+3
| | * | | | | | | Improve English, thanks RobertJacob Vosmaer2016-04-131-3/+3
| | * | | | | | | More code changes, thanks RobertJacob Vosmaer2016-04-132-20/+24
| | * | | | | | | Changes suggested by RobertJacob Vosmaer2016-04-124-7/+5
| | * | | | | | | BastaJacob Vosmaer2016-04-122-2/+2
| | * | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-12291-1391/+4124
| | |\ \ \ \ \ \ \
| | * | | | | | | | Move 'clear checks' button to applicatoin settingsJacob Vosmaer2016-04-126-43/+32
| | * | | | | | | | Add a 'circuit breaker' for repo checksJacob Vosmaer2016-04-124-1/+31
| | * | | | | | | | Add repository_checks_enabled settingJacob Vosmaer2016-04-123-2/+9
| | * | | | | | | | Increase fsck lock timeout to 24 hoursJacob Vosmaer2016-04-121-1/+3
| | * | | | | | | | Rename almost all the thingsJacob Vosmaer2016-04-0623-112/+112
| | * | | | | | | | Document how to disable repo checksJacob Vosmaer2016-04-061-0/+16
| | * | | | | | | | Rebase repo check MRJacob Vosmaer2016-04-0420-6/+346