summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use Bundler's retry option instead of our retry scriptbundler-retryRémy Coutable2016-04-151-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'master' of https://github.com/gitlabhq/gitlabhqJacob Vosmaer2016-04-151-1/+1
|\
| * Fix required gitlab-shell version.Rémy Coutable2016-04-151-1/+1
| |\ | | | | | | Fix required gitlab-shell version in the 8.5 to 8.6 update doc.
| | * fix required gitlab-shell version.lurdan2016-04-151-1/+1
| |/ | | | | Under the procedure, I've warned about gitlab-shell version, which should be 2.6.12 (may be some minor revisions introduces that).
* | Merge branch 'fix-redirect-profile-keys-new-to-profile-keys' into 'master' Rémy Coutable2016-04-154-2/+18
|\ \ | | | | | | | | | | | | | | | | | | Make /profile/keys/new redirects to /profile/keys for back-compat This addresses https://github.com/gitlabhq/gitlabhq/issues/10138. See merge request !3717
| * | Make /profile/keys/new redirects to /profile/keys for back-compatRémy Coutable2016-04-154-2/+18
| | | | | | | | | | | | | | | | | | Report: https://github.com/gitlabhq/gitlabhq/issues/10138 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'i_14431_award_emoji_count_not_in_comment_count' into 'master' Rémy Coutable2016-04-156-5/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not include award emojis in issue view comment_count ## What does this MR do? Fixes Issue #14431, changing comment_count on issues index view to not include award emoji comments. While including them is technically correct, it feel nonintuitive in the way comments are presented. ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? Improves UX of issues view ## What are the relevant issue numbers? #14431 ## Screenshots ### Before - ![Issues before](https://monosnap.com/file/cs7lcEkcChXXvAV22y2gh7gBFWCWjj.png) - ![MR before](https://monosnap.com/file/qzOawShznyXMKK3Z5cij4SKrHO4jNy.png) ### After - ![Issues after](https://monosnap.com/file/IWMedIiGnDnCly7zI5BwNTYQuCS8fH.png) - ![MR after](https://monosnap.com/file/mXJu1C2OVo5DGK0XdD67vPZGNPAw4L.png) See merge request !3610
| * | | Do not include award emojis in issue view comment_counttheoretick2016-04-146-5/+43
| | | | | | | | | | | | | | | | Fixes Issue #14431
* | | | 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` Closes #14963. See merge request !3633
| * | | | Escape the query argument provided to `git grep` by `search_files`rs-trailing-slash-in-searchRobert Speicher2016-04-092-1/+7
| | | | | | | | | | | | | | | | | | | | Closes #14963.
* | | | | Merge branch 'fix-migrate_new_notification_setting' into 'master' Robert Speicher2016-04-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix datetime format when migrating new notification settings on MySQL Closes #15264 See merge request !3733
| * | | | | 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" to "specific demand" in CI runner docs [ci skip] See merge request !3726
| * | | | | | change: "very demand" changed to "specific demand" Jamie Neubert Pedersen2016-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | This must be an error as the sentence doesn't make sense otherwise
* | | | | | | Merge branch '14176-diff-paste-data' into 'master' Jacob Schatz2016-04-147-31/+62
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copying and pasting doesn't grab line numbers or +/- Fixes #14176 See merge request !3687
| * | | | | | 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 ↵Annabel Dunstone2016-04-144-22/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to prevent white spaces in paste
| * | | | | | 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 user See merge request !3729
| * | | | | | | 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 config [ci skip] See merge request !3728
| * | | | | | | | 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 fix Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14020 See merge request !3727
| * | | | | | | | Emoji categories fixValery Sizov2016-04-143-3/+21
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'subscribe-button-fix' into 'master' Jacob Schatz2016-04-148-16/+10
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed references to subscribe-button CSS class These were being blocked by adblocks Closes #15043 See merge request !3677
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were being blocked by adblocks Closes #15043
* | | | | | | | Merge branch 'auto-fsck' into 'master' Robert Speicher2016-04-1429-8/+445
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto git fsck Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232 See merge request !3232
| * | | | | | | | 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
| | | | | | | | | | |
View Lorry Controller Status