Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Redirect to root path when visiting `/ci`fix/nomethod-error-on-ci | Grzegorz Bizon | 2016-03-29 | 3 | -25/+20 |
| | |||||
* | Add definition of before action that has been moved | Grzegorz Bizon | 2016-03-25 | 3 | -1/+16 |
| | | | | Closes #14528 | ||||
* | Merge branch 'clarify_lfs' into 'master' | Achilleas Pipinellis | 2016-03-25 | 1 | -0/+4 |
|\ | | | | | | | | | | | | | Clarify LFS configuration A user on Twitter was confused (rightfully so) because LFS admin docs suggest you must set a storage path. In fact, Omnibus defaults to a very sane location. Add a comment to the snippet outlining the default. See merge request !3388 | ||||
| * | Clarify LFS configuration | Drew Blessing | 2016-03-24 | 1 | -0/+4 |
| | | |||||
* | | Describe CI stuff. | Sytse Sijbrandij | 2016-03-24 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'issue_14610' into 'master' | Robert Speicher | 2016-03-24 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | Fix cancel button on issuable edit form See merge request !3392 | ||||
| * | | Fix link when issuable is new | Alfredo Sumaran | 2016-03-24 | 1 | -1/+1 |
| | | | |||||
| * | | Fix cancel link on issuable edit formissue_14610 | Alfredo Sumaran | 2016-03-24 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch ↵ | Douwe Maan | 2016-03-24 | 5 | -31/+64 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix-comments-on-confidential-issues-show-activity-feed-for-non-members' into 'master' Comments on confidential issues doesn't show in activity feed to non-members Closes #14568 See merge request !3375 | ||||
| * | | Rename `Event#proper?` to `Event#visible_to_user?` | Douglas Barbosa Alexandre | 2016-03-24 | 4 | -25/+25 |
| | | | |||||
| * | | Comments on confidential issues doesn't show in activity feed to non-members | Douglas Barbosa Alexandre | 2016-03-24 | 3 | -16/+49 |
|/ / | |||||
* | | Merge branch 'project-dropdown-width' into 'master' | Jacob Schatz | 2016-03-24 | 1 | -0/+1 |
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with width of project select dropdown Before: ![Screen_Shot_2016-03-24_at_13.42.53](/uploads/25580c45dc339f7f932f032ac2d10fba/Screen_Shot_2016-03-24_at_13.42.53.png) ![Screen_Shot_2016-03-24_at_13.43.04](/uploads/e4d1d4e332d27f14c980264bef9dc4d9/Screen_Shot_2016-03-24_at_13.43.04.png) After: ![Screen_Shot_2016-03-24_at_13.42.38](/uploads/68b8e161d86b41849f9e8a1d9c8fd36c/Screen_Shot_2016-03-24_at_13.42.38.png) ![Screen_Shot_2016-03-24_at_13.43.13](/uploads/f3fe732bcd517efea3a1d7c761bb6a0e/Screen_Shot_2016-03-24_at_13.43.13.png) See merge request !3386 | ||||
| * | Fixed issue with width of project select dropdown | Phil Hughes | 2016-03-24 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'sidebar-bold-fix' into 'master' | Jacob Schatz | 2016-03-24 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bold in sidebar ![Screen_Shot_2016-03-23_at_12.01.54](/uploads/d50ae3426efcb2436b3debdd80073b2f/Screen_Shot_2016-03-23_at_12.01.54.png) This is to go with https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/289 See merge request !3358 | ||||
| * | | HAML style fixsidebar-bold-fix | Phil Hughes | 2016-03-24 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed bold in sidebar | Phil Hughes | 2016-03-23 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'fix-password-settings-regressions' into 'master' | Jacob Schatz | 2016-03-24 | 1 | -8/+9 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shows password form when signed in with linked account Closes #14379 Doing this to get the builds passing for !3325 See merge request !3381 | ||||
| * | | | Shows password form when signed in with linked accountfix-password-settings-regressions | Phil Hughes | 2016-03-24 | 1 | -8/+9 |
| | |/ | |/| | | | | | | | Closes #14379 | ||||
* | | | Merge branch 'lease-design-comments' into 'master' | Douwe Maan | 2016-03-24 | 1 | -0/+21 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Explain why ExclusiveLease has no #cancel [ci skip] See merge request !3383 | ||||
| * | | | Explain why ExclusiveLease has no #cancellease-design-comments | Jacob Vosmaer | 2016-03-24 | 1 | -0/+21 |
| |/ / | | | | | | | | | | [ci skip] | ||||
* | | | Merge branch ↵ | Douwe Maan | 2016-03-24 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 'add-tooltip-to-issue-new-branch-button-with-create-branch-issue-title-123-14565' into 'master' Add tooltip to new branch button Closes #14565 See merge request !3380 | ||||
| * | | Add tooltip to new branch buttonadd-tooltip-to-issue-new-branch-button-with-create-branch-issue-title-123-14565 | Zeger-Jan van de Weg | 2016-03-24 | 1 | -1/+1 |
|/ / | |||||
* | | 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 |
| | | | | |