Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '15094-throttle-update-of-last_activity_at' into 'master' | Jacob Vosmaer | 2016-04-26 | 1 | -1/+1 |
|\ | |||||
| * | Throttle the update of `project.last_activity_at` to 1 minute15094-throttle-update-of-last_activity_at | Rémy Coutable | 2016-04-25 | 1 | -1/+1 |
* | | Merge branch 'link_user_avatar_in_activity_page_to_profile' into 'master' | Robert Speicher | 2016-04-25 | 1 | -1/+6 |
|\ \ | |||||
| * | | link user avatar in activity page to user profilelink_user_avatar_in_activity_page_to_profile | Arinde Eniola | 2016-04-25 | 1 | -1/+6 |
* | | | Merge branch 'emoji-unicode-fix' into 'master' | Jacob Schatz | 2016-04-25 | 2 | -17/+4 |
|\ \ \ | |||||
| * | | | Removed usage of normilizeEmojiName methodemoji-unicode-fix | Phil Hughes | 2016-04-22 | 1 | -5/+0 |
| * | | | Fixes issue with emoji comments not showing correct emoji image | Phil Hughes | 2016-04-22 | 2 | -13/+5 |
* | | | | Merge branch 'diff-line-colors' into 'master' | Jacob Schatz | 2016-04-25 | 3 | -8/+16 |
|\ \ \ \ | |||||
| * | | | | Update diff blue & yellow to match designdiff-line-colors | Annabel Dunstone | 2016-04-22 | 3 | -8/+16 |
| |/ / / | |||||
* | | | | Merge branch 'blur-award-btn' into 'master' | Jacob Schatz | 2016-04-25 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | Triggers blur after clicking award buttonblur-award-btn | Phil Hughes | 2016-04-22 | 1 | -0/+2 |
| |/ / / | |||||
* | | | | Merge branch 'issue_14904' into 'master' | Jacob Schatz | 2016-04-25 | 7 | -50/+95 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/master' into issue_14904 | Alfredo Sumaran | 2016-04-21 | 59 | -369/+437 |
| |\ \ \ \ | |||||
| * | | | | | Use gon.shortcuts_path directly | Alfredo Sumaran | 2016-04-21 | 1 | -2/+1 |
| * | | | | | Move event handlers to methods | Alfredo Sumaran | 2016-04-21 | 1 | -10/+14 |
| * | | | | | Merge remote-tracking branch 'origin/master' into issue_14904 | Alfredo Sumaran | 2016-04-20 | 42 | -181/+655 |
| |\ \ \ \ \ | |||||
| * | | | | | | Make shortcuts work when sidebar is collapsed | Alfredo Sumaran | 2016-04-20 | 3 | -35/+54 |
| * | | | | | | Merge remote-tracking branch 'origin/master' into issue_14904 | Alfredo Sumaran | 2016-04-20 | 97 | -377/+758 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Expose shortcuts url from the backend via gon | Alfredo Sumaran | 2016-04-18 | 1 | -2/+1 |
| * | | | | | | | Use proper method | Alfredo Sumaran | 2016-04-18 | 1 | -1/+1 |
| * | | | | | | | Fix specs | Alfredo Sumaran | 2016-04-18 | 1 | -1/+1 |
| * | | | | | | | Update shortcuts dialog | Alfredo Sumaran | 2016-04-18 | 1 | -1/+13 |
| * | | | | | | | Set `i` as a shortcut for creating a new issue | Alfredo Sumaran | 2016-04-18 | 2 | -0/+6 |
| * | | | | | | | Toggle help modal | Alfredo Sumaran | 2016-04-18 | 1 | -20/+23 |
| * | | | | | | | Set "l" for Label shortcut | Alfredo Sumaran | 2016-04-18 | 1 | -1/+4 |
* | | | | | | | | Merge branch 'project-dropdown-link-click-fix' into 'master' | Jacob Schatz | 2016-04-25 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixed issue with project dropdown links not being clickableproject-dropdown-link-click-fix | Phil Hughes | 2016-04-22 | 1 | -2/+2 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'word-break' into 'master' | Jacob Schatz | 2016-04-25 | 3 | -1/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Don't break line in middle of wordword-break | Annabel Dunstone | 2016-04-21 | 3 | -1/+6 |
* | | | | | | | | | Fix error on commit builds page when no builds yet | Grzegorz Bizon | 2016-04-25 | 1 | -1/+1 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Fix Error 500 due to stale cache when projects are renamed or transferred | Stan Hu | 2016-04-25 | 2 | -4/+4 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge branch 'scss-empty-rule' into 'master' | Jacob Schatz | 2016-04-25 | 4 | -12/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Enable the EmptyRule SCSS Linter. | Connor Shea | 2016-04-16 | 4 | -12/+0 |
* | | | | | | | | Fix license detection to detect all license files, not only known licenses | Rémy Coutable | 2016-04-25 | 2 | -15/+15 |
* | | | | | | | | Merge branch 'feature/snumb130/hide-future-blocks-on-graph' into 'master' | Robert Speicher | 2016-04-24 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Updating cal-heatmap-rails gem to 3.6.0 and hiding future dates. | Luke Howell | 2016-04-24 | 1 | -0/+4 |
* | | | | | | | | | Allow middle-click on a Todo row to open in a new tab | Robert Speicher | 2016-04-24 | 1 | -1/+2 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch '15513-fix-undefined-can-method' into 'master' | Robert Speicher | 2016-04-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use the `can?` helper instead of `current_user.can?`15513-fix-undefined-can-method | Rémy Coutable | 2016-04-22 | 1 | -1/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'escape-label-title' into 'master' | Jacob Schatz | 2016-04-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Escapes label title in filtersescape-label-title | Phil Hughes | 2016-04-22 | 1 | -1/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Fixed issue with assignee object not being returned | Phil Hughes | 2016-04-22 | 2 | -2/+2 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'issue_3799' into 'master' | Rémy Coutable | 2016-04-22 | 2 | -1/+12 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into issue_3799 | Alfredo Sumaran | 2016-04-21 | 176 | -980/+1880 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Do not display filters if user if there's no current_user | Alfredo Sumaran | 2016-04-21 | 1 | -7/+8 |
| * | | | | | | | Use compact syntax | Alfredo Sumaran | 2016-04-21 | 1 | -4/+1 |
| * | | | | | | | Allow filtering by Owned projects | Alfredo Sumaran | 2016-04-18 | 2 | -1/+14 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'confirmation-screen' into 'master' | Robert Speicher | 2016-04-22 | 6 | -2/+60 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Improved confirmation UXconfirmation-screen | Phil Hughes | 2016-04-21 | 6 | -2/+60 |
* | | | | | | | | Merge branch 'rs-diff_view' into 'master' | Rémy Coutable | 2016-04-22 | 3 | -4/+9 |
|\ \ \ \ \ \ \ \ |