summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Explain why we mangle blob content typessafe-content-typeJacob Vosmaer2016-02-243-12/+23
* Merge branch 'issue_13301_emoji-menu' into 'master' Robert Speicher2016-02-244-12/+28
|\
| * Update award_emoji testAnnabel Dunstone2016-02-231-1/+2
| * Create EmojisControllerAnnabel Dunstone2016-02-224-5/+6
| * Add timeout for ajax call in award emoji steps; update focus in award pickerAnnabel Dunstone2016-02-191-1/+2
| * Load award emoji picker with ajax requestAnnabel Dunstone2016-02-184-11/+24
* | Merge branch 'issue_13510' into 'master' Jacob Schatz2016-02-232-0/+16
|\ \
| * | Add "e" shortcut to help modalAlfredo Sumaran2016-02-231-0/+8
| * | Add "e" shortcut to edit issuableissue_13510Alfredo Sumaran2016-02-231-0/+8
* | | Merge branch 'hudecof/show-crowd-login-form-when-signin-disabled' into 'master' Robert Speicher2016-02-231-1/+1
|\ \ \
| * | | Show Crowd login even when sign-in is disabledPeter Hudec2016-02-231-1/+1
* | | | Merge branch 'fix-todos' into 'master' Robert Speicher2016-02-232-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Does not raise an error when Todo is already marked as doneDouglas Barbosa Alexandre2016-02-232-2/+2
* | | | Merge branch 'dz-small-ui-fixes' into 'master' Jacob Schatz2016-02-2319-88/+90
|\ \ \ \
| * | | | Update tests to match new wiki headerDmitriy Zaporozhets2016-02-091-1/+1
| * | | | Set of small improvements to wiki frontendDmitriy Zaporozhets2016-02-0710-54/+64
| * | | | Set of small UI fixes to project and profile pagesDmitriy Zaporozhets2016-02-079-34/+26
* | | | | Merge branch 'files-view-row-click' into 'master' Jacob Schatz2016-02-233-8/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Correctly checks if tree view is on screenPhil Hughes2016-02-232-2/+2
| * | | | Fixes issue with file view rows not clickable on project main viewfiles-view-row-clickPhil Hughes2016-02-233-8/+7
* | | | | Merge branch 'empty-repo-instructions-fix' into 'master' Jacob Schatz2016-02-231-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Users don't get instructions to push to other users empty projectsPhil Hughes2016-02-221-1/+1
* | | | | Merge branch 'milestone-drag-empty-list' into 'master' Jacob Schatz2016-02-231-9/+21
|\ \ \ \ \
| * | | | | Issues can be dragged & dropped into empty milestone listsPhil Hughes2016-02-231-9/+21
| | |/ / / | |/| | |
* | | | | Merge branch 'dashboard-misaligned-buttons' into 'master' Jacob Schatz2016-02-231-0/+1
|\ \ \ \ \
| * | | | | Fixed mis-aligned buttons on dashboard/issuesdashboard-misaligned-buttonsPhil Hughes2016-02-231-0/+1
| |/ / / /
* | | | | Merge branch 'issue_11874' into 'master' Jacob Schatz2016-02-236-56/+127
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Do not use calc and fix background spinner for high density displaysissue_11874Alfredo Sumaran2016-02-221-3/+5
| * | | | Use or create variablesAlfredo Sumaran2016-02-223-8/+9
| * | | | Simpler way to place arrowAlfredo Sumaran2016-02-221-3/+2
| * | | | Delete unused CSS ruleAlfredo Sumaran2016-02-221-7/+0
| * | | | Update dropdown menu styleAlfredo Sumaran2016-02-225-37/+85
| * | | | Make select2 design consistentAlfredo Sumaran2016-02-215-29/+57
* | | | | Merge branch 'project-type-icon-your-projects' into 'master' Jacob Schatz2016-02-221-0/+3
|\ \ \ \ \
| * | | | | Show project visibility level on project listproject-type-icon-your-projectsPhil Hughes2016-02-221-0/+3
* | | | | | Merge branch 'blame-line-link' into 'master' Jacob Schatz2016-02-223-4/+8
|\ \ \ \ \ \
| * | | | | | Added line links to blame tableblame-line-linkPhil Hughes2016-02-223-4/+8
* | | | | | | Merge branch 'fix/13631-error-with-merged-mr' into 'master' Rémy Coutable2016-02-221-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Ensure we don't check a commit's description for revert message if it has no ...Rémy Coutable2016-02-221-1/+1
* | | | | | | | Merge branch 'fix-moving-revert-button' into 'master' Jacob Schatz2016-02-221-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fixed revert button tooltip placement causing movementfix-moving-revert-buttonPhil Hughes2016-02-221-2/+2
| |/ / / / / /
* | | | | | | Merge branch 'status-indicator-size' into 'master' Jacob Schatz2016-02-221-6/+3
|\ \ \ \ \ \ \
| * | | | | | | Changed the size of status indicatorsstatus-indicator-sizePhil Hughes2016-02-221-6/+3
| |/ / / / / /
* | | | | | | Merge branch 'header-overflow-small-devices' into 'master' Jacob Schatz2016-02-222-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixed issue with header overflowheader-overflow-small-devicesPhil Hughes2016-02-222-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'improve-merge-when-succeeded' into 'master' Douwe Maan2016-02-221-3/+9
|\ \ \ \ \ \ \
| * | | | | | | Check the HEAD of branch when doing Merge When Succeededimprove-merge-when-succeededKamil Trzcinski2016-02-221-3/+9
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'rs-mask-icon' into 'master' Robert Speicher2016-02-221-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Add a Pinned Tab icon for Safarirs-mask-iconRobert Speicher2016-02-181-0/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Fixed issue with content in the issue sidebar disappearingissue-sidebar-content-scrollingPhil Hughes2016-02-221-28/+23
| |_|/ / / / |/| | | | |