summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Updated label links to work correctly for filteringsidebar-label-linkPhil Hughes2016-04-262-2/+2
* 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
| |\ \ \
| * | | | Use gon.shortcuts_path directlyAlfredo Sumaran2016-04-211-2/+1
| * | | | Move event handlers to methodsAlfredo Sumaran2016-04-211-10/+14
| * | | | Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-2042-181/+655
| |\ \ \ \
| * | | | | Make shortcuts work when sidebar is collapsedAlfredo Sumaran2016-04-203-35/+54
| * | | | | Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-2097-377/+758
| |\ \ \ \ \
| * | | | | | Expose shortcuts url from the backend via gonAlfredo Sumaran2016-04-181-2/+1
| * | | | | | Use proper methodAlfredo Sumaran2016-04-181-1/+1
| * | | | | | Fix specsAlfredo Sumaran2016-04-181-1/+1
| * | | | | | Update shortcuts dialogAlfredo Sumaran2016-04-181-1/+13
| * | | | | | Set `i` as a shortcut for creating a new issueAlfredo Sumaran2016-04-182-0/+6
| * | | | | | Toggle help modalAlfredo Sumaran2016-04-181-20/+23
| * | | | | | Set "l" for Label shortcutAlfredo Sumaran2016-04-181-1/+4
* | | | | | | Merge branch 'project-dropdown-link-click-fix' into 'master' Jacob Schatz2016-04-251-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fixed issue with project dropdown links not being clickableproject-dropdown-link-click-fixPhil Hughes2016-04-221-2/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'word-break' into 'master' Jacob Schatz2016-04-253-1/+6
|\ \ \ \ \ \ \
| * | | | | | | Don't break line in middle of wordword-breakAnnabel Dunstone2016-04-213-1/+6
* | | | | | | | Fix error on commit builds page when no builds yetGrzegorz Bizon2016-04-251-1/+1
* | | | | | | | Fix Error 500 due to stale cache when projects are renamed or transferredStan Hu2016-04-252-4/+4
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'scss-empty-rule' into 'master' Jacob Schatz2016-04-254-12/+0
|\ \ \ \ \ \ \
| * | | | | | | Enable the EmptyRule SCSS Linter.Connor Shea2016-04-164-12/+0
* | | | | | | | Fix license detection to detect all license files, not only known licensesRémy Coutable2016-04-252-15/+15
* | | | | | | | Merge branch 'feature/snumb130/hide-future-blocks-on-graph' into 'master' Robert Speicher2016-04-241-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Updating cal-heatmap-rails gem to 3.6.0 and hiding future dates.Luke Howell2016-04-241-0/+4
* | | | | | | | | Allow middle-click on a Todo row to open in a new tabRobert Speicher2016-04-241-1/+2
|/ / / / / / / /
* | | | | | | | Merge branch '15513-fix-undefined-can-method' into 'master' Robert Speicher2016-04-221-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Use the `can?` helper instead of `current_user.can?`15513-fix-undefined-can-methodRémy Coutable2016-04-221-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'escape-label-title' into 'master' Jacob Schatz2016-04-221-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Escapes label title in filtersescape-label-titlePhil Hughes2016-04-221-1/+1
| |/ / / / / / /
* | | | | | | | Fixed issue with assignee object not being returnedPhil Hughes2016-04-222-2/+2
|/ / / / / / /
* | | | | | | Merge branch 'issue_3799' into 'master' Rémy Coutable2016-04-222-1/+12
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into issue_3799Alfredo Sumaran2016-04-21176-980/+1880
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Do not display filters if user if there's no current_userAlfredo Sumaran2016-04-211-7/+8
| * | | | | | | Use compact syntaxAlfredo Sumaran2016-04-211-4/+1
| * | | | | | | Allow filtering by Owned projectsAlfredo Sumaran2016-04-182-1/+14
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'confirmation-screen' into 'master' Robert Speicher2016-04-226-2/+60
|\ \ \ \ \ \ \
| * | | | | | | Improved confirmation UXconfirmation-screenPhil Hughes2016-04-216-2/+60
* | | | | | | | Merge branch 'rs-diff_view' into 'master' Rémy Coutable2016-04-223-4/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Clarify that the diff view setting always comes from the cookiers-diff_viewRobert Speicher2016-04-191-2/+1