summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'parallel-diff-alignment' into 'master' Jacob Schatz2016-04-261-1/+10
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Break in middle of word if a span within parallel viewparallel-diff-alignmentAnnabel Dunstone2016-04-251-0/+5
| * | | | | | | | | | Reduce width of parallel diffsAnnabel Dunstone2016-04-221-1/+5
* | | | | | | | | | | Merge branch '15606-discussion-styling' into 'master' Jacob Schatz2016-04-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Increase screen width breakpoint for hide/show discussion15606-discussion-stylingAnnabel Dunstone2016-04-251-1/+1
* | | | | | | | | | | | Merge branch 'changelog-alternates' into 'master' Hannes Rosenögger2016-04-263-2/+39
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Allow alternative names for the CHANGELOG file.Connor Shea2016-04-263-2/+39
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'remove-devise-async' into 'master' Rémy Coutable2016-04-265-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove the Devise Async gem.Connor Shea2016-04-265-6/+2
* | | | | | | | | | | | | Merge branch 'patch-1' into 'master' Rémy Coutable2016-04-261-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add usage example for the Office 365 GetPersonaPhoto-service.Eirik Lygre2016-01-171-0/+13
* | | | | | | | | | | | | Merge branch 'skip-fresh-repo-fsck' into 'master' Rémy Coutable2016-04-262-6/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Do not fsck projects less than a day oldJacob Vosmaer2016-04-262-6/+13
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'master' into 'master' Jacob Schatz2016-04-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed width of .search-location-badge as it was causing issues in Safari. #15541Jedidiah Broadbent2016-04-241-1/+1
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'patch-3' into 'master' Rémy Coutable2016-04-261-11/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Emphasize that GitLab must be partially running when restoring backups. John McGehee2016-04-201-11/+24
* | | | | | | | | | | | | | Merge branch 'search-ui-update' into 'master' Robert Speicher2016-04-2616-149/+265
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Updated based on feedbacksearch-ui-updatePhil Hughes2016-04-264-14/+15
| * | | | | | | | | | | | | | Consistent border radiusPhil Hughes2016-04-263-4/+2
| * | | | | | | | | | | | | | Correctly shows no results textPhil Hughes2016-04-262-2/+2
| * | | | | | | | | | | | | | Fixed issue with dropdown option not stickingPhil Hughes2016-04-262-4/+4
| * | | | | | | | | | | | | | Fixed testsPhil Hughes2016-04-263-2/+12
| * | | | | | | | | | | | | | Humanize scope textPhil Hughes2016-04-262-3/+3
| * | | | | | | | | | | | | | Truncate issue descriptionPhil Hughes2016-04-261-1/+1
| * | | | | | | | | | | | | | Focus fieldPhil Hughes2016-04-261-0/+1
| * | | | | | | | | | | | | | Use helper methodPhil Hughes2016-04-261-8/+2
| * | | | | | | | | | | | | | Changes dropdown toggle on search dropdownsPhil Hughes2016-04-262-14/+22
| * | | | | | | | | | | | | | Removed category iconsPhil Hughes2016-04-261-66/+39
| * | | | | | | | | | | | | | icons on search barPhil Hughes2016-04-265-6/+65
| * | | | | | | | | | | | | | Mobile updates for search UIPhil Hughes2016-04-264-24/+44
| * | | | | | | | | | | | | | Loads group & projects on search page with ajaxPhil Hughes2016-04-263-24/+58
| * | | | | | | | | | | | | | Started updating search UIPhil Hughes2016-04-268-31/+49
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Revert "Merge branch 'patch-2' into 'master'"Rémy Coutable2016-04-261-39/+20
* | | | | | | | | | | | | | Merge branch 'patch-2' into 'master' Rémy Coutable2016-04-261-20/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Document that only unicorn and sidekiq should be stopped. John McGehee2016-04-201-20/+39
* | | | | | | | | | | | | | | Merge branch 'patch-1' into 'master' Rémy Coutable2016-04-261-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Update PROCESS.md Mark Pundsack2016-04-211-1/+2
* | | | | | | | | | | | | | | Merge branch '15094-throttle-update-of-last_activity_at' into 'master' Jacob Vosmaer2016-04-263-23/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Throttle the update of `project.last_activity_at` to 1 minute15094-throttle-update-of-last_activity_atRémy Coutable2016-04-253-23/+45
* | | | | | | | | | | | | | | Merge branch 'upgrade-gitlab-grit' into 'master' Robert Speicher2016-04-251-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Upgrade gitlab-grit gem to 2.8.1, loosening the mime-types gem's version depe...Connor Shea2016-04-241-3/+3
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'link_user_avatar_in_activity_page_to_profile' into 'master' Robert Speicher2016-04-251-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | link user avatar in activity page to user profilelink_user_avatar_in_activity_page_to_profileArinde Eniola2016-04-251-1/+6
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'fix-changelog' into 'master' Jacob Schatz2016-04-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Move CHANGELOG entry to 8.8Alfredo Sumaran2016-04-251-1/+1
* | | | | | | | | | | | | | | | Merge branch 'emoji-unicode-fix' into 'master' Jacob Schatz2016-04-253-17/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Removed usage of normilizeEmojiName methodemoji-unicode-fixPhil Hughes2016-04-222-7/+1
| * | | | | | | | | | | | | | | Fixes issue with emoji comments not showing correct emoji imagePhil Hughes2016-04-223-13/+10
* | | | | | | | | | | | | | | | Merge branch 'diff-line-colors' into 'master' Jacob Schatz2016-04-253-8/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \