summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issue_7959' into 'master' Jacob Schatz2016-03-237-17/+251
|\
| * Move cropper.css to vendor folderissue_7959Alfredo Sumaran2016-03-231-379/+0
| * Move cropper.js to vendor folderAlfredo Sumaran2016-03-232-2993/+1
| * Clear original input after cropAlfredo Sumaran2016-03-221-0/+1
| * Remove unnecessary lineAlfredo Sumaran2016-03-221-1/+0
| * Add comment explaining why we enable form submit buttonAlfredo Sumaran2016-03-221-0/+1
| * Explain regular expressionAlfredo Sumaran2016-03-221-1/+4
| * Use _this instead of selfAlfredo Sumaran2016-03-221-11/+12
| * Rename method for better understandingAlfredo Sumaran2016-03-221-4/+4
| * Merge branch 'master' into issue_7959Alfredo Sumaran2016-03-22229-1274/+2171
| |\
| * | Make it genericAlfredo Sumaran2016-03-172-12/+24
| * | Fix failing specAlfredo Sumaran2016-03-172-4/+9
| * | Show filename after setting a cropped imageAlfredo Sumaran2016-03-171-4/+13
| * | Make it responsiveAlfredo Sumaran2016-03-171-2/+6
| * | Allow to set crop box and export image dimensionsAlfredo Sumaran2016-03-171-5/+17
| * | Add modal dialogAlfredo Sumaran2016-03-172-1/+40
| * | Handle form submit via ajax and crop avatar on the clientAlfredo Sumaran2016-03-171-8/+35
| * | Add GitLabCrop classAlfredo Sumaran2016-03-171-0/+118
| * | Respond to json requestsAlfredo Sumaran2016-03-171-8/+9
| * | Add cropper libraryAlfredo Sumaran2016-03-173-0/+3373
* | | Merge branch 'issue-sidebar-overlap' into 'master' Jacob Schatz2016-03-232-83/+58
|\ \ \
| * | | Removed hover background that wasn't neededissue-sidebar-overlapPhil Hughes2016-03-231-4/+3
| * | | Fixed failing testsPhil Hughes2016-03-232-75/+60
| * | | Issue sidebar overlaps on tabletPhil Hughes2016-03-231-16/+7
* | | | Merge branch 'update-issues-tests' into 'master' Robert Speicher2016-03-231-3/+3
|\ \ \ \
| * | | | Update milestone specupdate-issues-testsPhil Hughes2016-03-231-1/+1
| * | | | Assignee testsPhil Hughes2016-03-231-1/+1
| * | | | Added tests for setting multiple status on issuesPhil Hughes2016-03-231-1/+1
* | | | | Merge branch 'fix_missing_tooltip_next_to_project_title' into 'master' Jacob Schatz2016-03-234-4/+4
|\ \ \ \ \
| * | | | | fix missing tooltip in project titlefix_missing_tooltip_next_to_project_titleArinde Eniola2016-03-224-4/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix-application-settings' into 'master' Robert Speicher2016-03-231-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fixed error with applications delete enonymous token formfix-application-settingsPhil Hughes2016-03-231-1/+1
* | | | | Merge branch 'issue_14453' into 'master' Robert Speicher2016-03-231-1/+1
|\ \ \ \ \
| * | | | | Sanitize commit title when creating revert commit.issue_14453Rubén Dávila2016-03-221-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'fix-milestone-upcoming' into 'master' Robert Speicher2016-03-231-1/+1
|\ \ \ \ \
| * | | | | Fix Milestone.upcomingDouwe Maan2016-03-231-1/+1
* | | | | | Merge branch 'dropdown-right-align' into 'master' Jacob Schatz2016-03-232-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Removed dropdown JS to align instead favours HTML classdropdown-right-alignPhil Hughes2016-03-223-12/+2
| * | | | | Added JS to fix dropdown alignmentPhil Hughes2016-03-181-0/+10
* | | | | | Merge branch 'split-with-2' into 'master' Douwe Maan2016-03-231-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Make sure we get only two returnsLin Jen-Shin2016-03-231-1/+1
* | | | | | Merge branch 'fix/issue-move-preserve-update-time' into 'master' Douwe Maan2016-03-231-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Preserve time notes has been updated at when moving issueGrzegorz Bizon2016-03-231-1/+2
| | |_|/ / | |/| | |
* | | | | Add missing Dashboard::LabelsControllerRémy Coutable2016-03-231-0/+9
* | | | | Use respond_to instead of a conditional to paginate milestonesRémy Coutable2016-03-233-8/+9
* | | | | Fix an issue causing the Dashboard/Milestones page to be blankRémy Coutable2016-03-236-37/+19
|/ / / /
* | | | Merge branch 'fix-sorting-by-votes-on-groups-page' into 'master' Douwe Maan2016-03-231-1/+1
|\ \ \ \
| * | | | Fix sorting issues/mrs by votes on the groups pagefix-sorting-by-votes-on-groups-pageDouglas Barbosa Alexandre2016-03-211-1/+1
* | | | | Merge branch 'notifications-for-subscribers-confidential-issue-labels' into '...Douwe Maan2016-03-233-6/+16
|\ \ \ \ \
| * | | | | Fix issues count on labels pagenotifications-for-subscribers-confidential-issue-labelsDouglas Barbosa Alexandre2016-03-222-5/+5