summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issue_4271' into 'master' Jacob Schatz2016-04-263-2/+35
|\
| * Hide button on mobileAlfredo Sumaran2016-04-261-2/+2
| * Allow to pass custom classes to buttonAlfredo Sumaran2016-04-261-6/+9
| * Hide button on mobileAlfredo Sumaran2016-04-261-1/+1
| * Syntax and code improvementsAlfredo Sumaran2016-04-261-11/+13
| * Rename methodAlfredo Sumaran2016-04-261-4/+4
| * Use new method hide_whitespaces?Alfredo Sumaran2016-04-261-1/+1
| * Update syntaxAlfredo Sumaran2016-04-261-2/+2
| * Hide whitespace toggle button for new merge requestsAlfredo Sumaran2016-04-262-5/+7
| * Add Hide/show whitespace changes button on diff and commit viewAlfredo Sumaran2016-04-262-0/+26
* | 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
* | | Allow alternative names for the CHANGELOG file.Connor Shea2016-04-261-1/+1
* | | Remove the Devise Async gem.Connor Shea2016-04-261-1/+1
* | | Merge branch 'skip-fresh-repo-fsck' into 'master' Rémy Coutable2016-04-261-2/+2
|\ \ \
| * | | Do not fsck projects less than a day oldJacob Vosmaer2016-04-261-2/+2
* | | | 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 'search-ui-update' into 'master' Robert Speicher2016-04-2613-149/+258
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Updated based on feedbacksearch-ui-updatePhil Hughes2016-04-263-13/+14
| * | | | 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-261-4/+3
| * | | | Fixed testsPhil Hughes2016-04-261-2/+6
| * | | | 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
* | | | | Merge branch '15094-throttle-update-of-last_activity_at' into 'master' Jacob Vosmaer2016-04-261-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Throttle the update of `project.last_activity_at` to 1 minute15094-throttle-update-of-last_activity_atRémy Coutable2016-04-251-1/+1
* | | | | 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 'emoji-unicode-fix' into 'master' Jacob Schatz2016-04-252-17/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Removed usage of normilizeEmojiName methodemoji-unicode-fixPhil Hughes2016-04-221-5/+0
| * | | | | Fixes issue with emoji comments not showing correct emoji imagePhil Hughes2016-04-222-13/+5
* | | | | | Merge branch 'diff-line-colors' into 'master' Jacob Schatz2016-04-253-8/+16
|\ \ \ \ \ \
| * | | | | | Update diff blue & yellow to match designdiff-line-colorsAnnabel Dunstone2016-04-223-8/+16
| |/ / / / /
* | | | | | Merge branch 'blur-award-btn' into 'master' Jacob Schatz2016-04-251-0/+2
|\ \ \ \ \ \
| * | | | | | Triggers blur after clicking award buttonblur-award-btnPhil Hughes2016-04-221-0/+2
| |/ / / / /
* | | | | | Merge branch 'issue_14904' into 'master' Jacob Schatz2016-04-257-50/+95
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-2159-369/+437
| |\ \ \ \ \ \