summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Updated triggers UIupdated-triggers-uiPhil Hughes2016-04-272-65/+62
* 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-251-2/+2
|\ \
| * | Fixes issue with emoji comments not showing correct emoji imagePhil Hughes2016-04-221-2/+2
* | | Merge branch 'issue_14904' into 'master' Jacob Schatz2016-04-253-2/+19
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-2132-133/+129
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-2010-20/+69
| |\ \ \ \
| * | | | | Make shortcuts work when sidebar is collapsedAlfredo Sumaran2016-04-201-1/+1
| * | | | | Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-2037-72/+157
| |\ \ \ \ \
| * | | | | | 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-181-0/+5
* | | | | | | Fix error on commit builds page when no builds yetGrzegorz Bizon2016-04-251-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Use the `can?` helper instead of `current_user.can?`15513-fix-undefined-can-methodRémy Coutable2016-04-221-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'issue_3799' into 'master' Rémy Coutable2016-04-221-1/+10
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into issue_3799Alfredo Sumaran2016-04-2176-276/+396
| |\ \ \ \ \
| * | | | | | Do not display filters if user if there's no current_userAlfredo Sumaran2016-04-211-7/+8
| * | | | | | Allow filtering by Owned projectsAlfredo Sumaran2016-04-181-1/+9
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'confirmation-screen' into 'master' Robert Speicher2016-04-222-0/+27
|\ \ \ \ \ \
| * | | | | | Improved confirmation UXconfirmation-screenPhil Hughes2016-04-212-0/+27
* | | | | | | Merge branch 'rs-diff_view' into 'master' Rémy Coutable2016-04-221-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Always read diff_view setting from the cookieRobert Speicher2016-04-141-1/+1
* | | | | | | Merge branch 'remove-update-files' into 'master' Yorick Peterse2016-04-213-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Removed JS update templatesremove-update-filesPhil Hughes2016-04-193-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceRémy Coutable2016-04-214-52/+42
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'label-dropdown-fix' into 'master' Jacob Schatz2016-04-214-52/+42
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Merge remote-tracking branch 'origin/master' into label-dropdown-fixlabel-dropdown-fixAlfredo Sumaran2016-04-2010-20/+69
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge remote-tracking branch 'origin/master' into label-dropdown-fixAlfredo Sumaran2016-04-2061-270/+381
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Move shared html to a partialAlfredo Sumaran2016-04-183-34/+21
| | * | | | | Add is-link attribute to know if a menu item should not be stoppedAlfredo Sumaran2016-04-181-1/+1
| | * | | | | Fix Label dropdown and organize codeAlfredo Sumaran2016-04-152-3/+3
| | * | | | | Render proper partialAlfredo Sumaran2016-04-152-2/+2
| | * | | | | Add spacesAlfredo Sumaran2016-04-151-3/+3
| | * | | | | Reuse partial for Create Label pageAlfredo Sumaran2016-04-153-18/+21
* | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRémy Coutable2016-04-211-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'issue_15434' into 'master' Jacob Schatz2016-04-211-1/+1
| |\ \ \ \ \ \
| | * | | | | | Remove unnecessary provided paramAlfredo Sumaran2016-04-211-1/+1
| | | |_|/ / / | | |/| | | |
* | | | | | | Merge branch 'rs-issue-15408' into 'master' Robert Speicher2016-04-211-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix undefined local variable error in Invalid MR templaters-issue-15408Robert Speicher2016-04-211-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'diff-link-fix' into 'master' Jacob Schatz2016-04-211-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Put back removed line numberdiff-link-fixPhil Hughes2016-04-201-1/+1
| * | | | | | Fixed issue with lines not being selectable when expanding diffPhil Hughes2016-04-201-5/+5
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'top-navigation-concept' into 'master' Dmitriy Zaporozhets2016-04-2113-24/+10
|\ \ \ \ \ \
| * | | | | | Layout navigation should respect layout width settingstop-navigation-conceptDmitriy Zaporozhets2016-04-201-1/+2
| * | | | | | Fix tests and remove countersDmitriy Zaporozhets2016-04-191-2/+0
| * | | | | | Implement top navigation concept for profile areaDmitriy Zaporozhets2016-04-1913-22/+9
* | | | | | | Merge branch 'issue_5838' into 'master' Rémy Coutable2016-04-211-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Show project members only for membersFelipe Artur2016-04-181-1/+1
| | |_|_|_|/ / | |/| | | | |
View Lorry Controller Status