Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Shows password form when signed in with linked accountfix-password-settings-regressions | Phil Hughes | 2016-03-24 | 1 | -8/+9 |
| | | | | Closes #14379 | ||||
* | Merge branch 'fix-frontend-specs' into 'master' | Rémy Coutable | 2016-03-24 | 2 | -2/+2 |
|\ | | | | | | | | | | | | | | | | | | | | | | | Fix specs broken by !3270 and !3337. To be fair: - !3270 modifies CSS but `scss-lint` job was allowed to fail in the MR, while not allowed in `master` - !3337 modifies HTML but the broken test was only in `master` at the time /cc @alfredo1 @iamphill See merge request !3378 | ||||
| * | Fix specs broken by !3270 and !3337.fix-frontend-specs | Rémy Coutable | 2016-03-24 | 2 | -2/+2 |
|/ | |||||
* | Merge branch 'dropdown-alignment-fixes' into 'master' restrict_avatar_upload_to_image_files | Jacob Schatz | 2016-03-23 | 9 | -68/+196 |
|\ | | | | | | | | | | | | | Dropdown pixel perfect :tada: Closes #14333, #14331, #14472, #14515 See merge request !3337 | ||||
| * | Disable new label form in dropdown until fields are completedropdown-alignment-fixes | Phil Hughes | 2016-03-23 | 1 | -23/+60 |
| | | |||||
| * | Fixed failing tests | Phil Hughes | 2016-03-23 | 1 | -2/+2 |
| | | |||||
| * | Changed colour of no matching results bg | Phil Hughes | 2016-03-23 | 3 | -5/+22 |
| | | | | | | | | Highlights first row when filtering | ||||
| * | Removed bold on any/unassigned authors | Phil Hughes | 2016-03-23 | 1 | -13/+22 |
| | | |||||
| * | Adjusted alignment for the new label form | Phil Hughes | 2016-03-23 | 5 | -20/+48 |
| | | |||||
| * | Added label color box in dropdown | Phil Hughes | 2016-03-23 | 2 | -7/+10 |
| | | |||||
| * | Added clear button to dropdown filter | Phil Hughes | 2016-03-23 | 3 | -5/+39 |
| | | |||||
* | | Merge branch 'scss-style-guide-fixes' into 'master' | Jacob Schatz | 2016-03-23 | 1 | -3/+24 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: SCSS Style Guide fixes Fixed a typo and added a section on ignoring issues. [ci skip] See merge request !3263 | ||||
| * | | SCSS Style Guide fixes. | connorshea | 2016-03-23 | 1 | -3/+24 |
|/ / | | | | | | | | | | | Fix a typo and add a section on ignoring issues. [ci skip] | ||||
* | | Merge branch 'issue_7959' into 'master' | Jacob Schatz | 2016-03-23 | 10 | -17/+3624 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Crop avatars on the client before upload <img src="/uploads/535d69956cc5904870ae5d95132a35af/Screen_Shot_2016-03-17_at_9.55.56_AM.png" width="700"> closes #7959 closes #600 See merge request !3270 | ||||
| * | | Update CHANGELOG | Alfredo Sumaran | 2016-03-23 | 1 | -0/+1 |
| | | | |||||
| * | | Move cropper.css to vendor folderissue_7959 | Alfredo Sumaran | 2016-03-23 | 1 | -0/+0 |
| | | | |||||
| * | | Move cropper.js to vendor folder | Alfredo Sumaran | 2016-03-23 | 2 | -0/+1 |
| | | | |||||
| * | | Clear original input after crop | Alfredo Sumaran | 2016-03-22 | 1 | -0/+1 |
| | | | | | | | | | | | | This fixes the case when the user selects the same image consecutively. It failed because no 'change' event was fired. | ||||
| * | | Remove unnecessary line | Alfredo Sumaran | 2016-03-22 | 1 | -1/+0 |
| | | | |||||
| * | | Add comment explaining why we enable form submit button | Alfredo Sumaran | 2016-03-22 | 1 | -0/+1 |
| | | | |||||
| * | | Explain regular expression | Alfredo Sumaran | 2016-03-22 | 1 | -1/+4 |
| | | | |||||
| * | | Use _this instead of self | Alfredo Sumaran | 2016-03-22 | 1 | -11/+12 |
| | | | |||||
| * | | Rename method for better understanding | Alfredo Sumaran | 2016-03-22 | 1 | -4/+4 |
| | | | |||||
| * | | Merge branch 'master' into issue_7959 | Alfredo Sumaran | 2016-03-22 | 378 | -2624/+6320 |
| |\ \ | |||||
| * | | | Make it generic | Alfredo Sumaran | 2016-03-17 | 2 | -12/+24 |
| | | | | |||||
| * | | | Fix failing spec | Alfredo Sumaran | 2016-03-17 | 2 | -4/+9 |
| | | | | |||||
| * | | | Show filename after setting a cropped image | Alfredo Sumaran | 2016-03-17 | 1 | -4/+13 |
| | | | | |||||
| * | | | Make it responsive | Alfredo Sumaran | 2016-03-17 | 1 | -2/+6 |
| | | | | |||||
| * | | | Allow to set crop box and export image dimensions | Alfredo Sumaran | 2016-03-17 | 1 | -5/+17 |
| | | | | |||||
| * | | | Add modal dialog | Alfredo Sumaran | 2016-03-17 | 2 | -1/+40 |
| | | | | |||||
| * | | | Handle form submit via ajax and crop avatar on the client | Alfredo Sumaran | 2016-03-17 | 1 | -8/+35 |
| | | | | |||||
| * | | | Add GitLabCrop class | Alfredo Sumaran | 2016-03-17 | 1 | -0/+118 |
| | | | | |||||
| * | | | Respond to json requests | Alfredo Sumaran | 2016-03-17 | 1 | -8/+9 |
| | | | | |||||
| * | | | Add cropper library | Alfredo Sumaran | 2016-03-17 | 3 | -0/+3373 |
| | | | | |||||
* | | | | Merge branch 'issue-sidebar-overlap' into 'master' | Jacob Schatz | 2016-03-23 | 2 | -83/+58 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue sidebar overlaps on tablet Closes #14180 ![Screen_Shot_2016-03-18_at_13.10.53](/uploads/d1e81778740a034aa98c881a70e55254/Screen_Shot_2016-03-18_at_13.10.53.png) See merge request !3299 | ||||
| * | | | | Removed hover background that wasn't neededissue-sidebar-overlap | Phil Hughes | 2016-03-23 | 1 | -4/+3 |
| | | | | | |||||
| * | | | | Fixed failing tests | Phil Hughes | 2016-03-23 | 2 | -75/+60 |
| | | | | | | | | | | | | | | | | | | | | Moved the scss out of a mixin as it was really confusing the hell out of the CSS | ||||
| * | | | | Issue sidebar overlaps on tablet | Phil Hughes | 2016-03-23 | 1 | -16/+7 |
| | | | | | |||||
* | | | | | Merge branch 'update-issues-tests' into 'master' | Robert Speicher | 2016-03-23 | 2 | -3/+120 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multi-update issues tests There were no tests for updating multiple issues at a time - this fixes that :thumbsup: See merge request !3357 | ||||
| * | | | | | Update milestone specupdate-issues-tests | Phil Hughes | 2016-03-23 | 2 | -12/+42 |
| | | | | | | |||||
| * | | | | | Assignee tests | Phil Hughes | 2016-03-23 | 2 | -1/+41 |
| | | | | | | |||||
| * | | | | | Added tests for setting multiple status on issues | Phil Hughes | 2016-03-23 | 2 | -1/+48 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'fix_missing_tooltip_next_to_project_title' into 'master' | Jacob Schatz | 2016-03-23 | 4 | -4/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing tooltip in project title closes #14516 ![tooltip](/uploads/121cc3676f4f32044e158cf5f3df5be5/tooltip.gif) See merge request !3351 | ||||
| * | | | | | fix missing tooltip in project titlefix_missing_tooltip_next_to_project_title | Arinde Eniola | 2016-03-22 | 4 | -4/+4 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'rs-rails-routes' into 'master' | Douwe Maan | 2016-03-23 | 1 | -0/+12 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add special cases for built-in Rails routes in development See merge request !3369 | ||||
| * | | | | | Add special cases for built-in Rails routes in development | Robert Speicher | 2016-03-22 | 1 | -0/+12 |
| | | | | | | |||||
* | | | | | | Merge branch 'fix-application-settings' into 'master' | Robert Speicher | 2016-03-23 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed error with applications delete anonymous token form Closes #14509 See merge request !3362 | ||||
| * | | | | | Fixed error with applications delete enonymous token formfix-application-settings | Phil Hughes | 2016-03-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Closes #14509 | ||||
* | | | | | | Merge branch 'issue_14453' into 'master' | Robert Speicher | 2016-03-23 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Strip commit title when creating revert commit. Fixes #14453 See merge request !3352 | ||||
| * | | | | | | Sanitize commit title when creating revert commit.issue_14453 | Rubén Dávila | 2016-03-22 | 1 | -1/+1 |
| | | | | | | |