summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Extend specs for build badgerefactor/project-badges-interfaceGrzegorz Bizon2016-03-291-9/+48
|
* Refactor builds badge, encapsulate inside a classGrzegorz Bizon2016-03-293-2/+60
|
* Merge branch 'clarify_lfs' into 'master' Achilleas Pipinellis2016-03-251-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 configurationDrew Blessing2016-03-241-0/+4
| |
* | Describe CI stuff.Sytse Sijbrandij2016-03-241-1/+1
| |
* | Merge branch 'issue_14610' into 'master' Robert Speicher2016-03-241-2/+2
|\ \ | | | | | | | | | | | | Fix cancel button on issuable edit form See merge request !3392
| * | Fix link when issuable is newAlfredo Sumaran2016-03-241-1/+1
| | |
| * | Fix cancel link on issuable edit formissue_14610Alfredo Sumaran2016-03-241-1/+1
|/ /
* | Merge branch ↵Douwe Maan2016-03-245-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 Alexandre2016-03-244-25/+25
| | |
| * | Comments on confidential issues doesn't show in activity feed to non-membersDouglas Barbosa Alexandre2016-03-243-16/+49
|/ /
* | Merge branch 'project-dropdown-width' into 'master' Jacob Schatz2016-03-241-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 dropdownPhil Hughes2016-03-241-0/+1
| |
* | Merge branch 'sidebar-bold-fix' into 'master' Jacob Schatz2016-03-241-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-fixPhil Hughes2016-03-241-1/+1
| | |
| * | Fixed bold in sidebarPhil Hughes2016-03-231-1/+1
| | |
* | | Merge branch 'fix-password-settings-regressions' into 'master' Jacob Schatz2016-03-241-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-regressionsPhil Hughes2016-03-241-8/+9
| | |/ | |/| | | | | | | Closes #14379
* | | Merge branch 'lease-design-comments' into 'master' Douwe Maan2016-03-241-0/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Explain why ExclusiveLease has no #cancel [ci skip] See merge request !3383
| * | | Explain why ExclusiveLease has no #cancellease-design-commentsJacob Vosmaer2016-03-241-0/+21
| |/ / | | | | | | | | | [ci skip]
* | | Merge branch ↵Douwe Maan2016-03-241-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-14565Zeger-Jan van de Weg2016-03-241-1/+1
|/ /
* | Merge branch 'fix-frontend-specs' into 'master' Rémy Coutable2016-03-242-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-specsRémy Coutable2016-03-242-2/+2
|/ /
* | Merge branch 'dropdown-alignment-fixes' into 'master' restrict_avatar_upload_to_image_filesJacob Schatz2016-03-239-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-fixesPhil Hughes2016-03-231-23/+60
| | |
| * | Fixed failing testsPhil Hughes2016-03-231-2/+2
| | |
| * | Changed colour of no matching results bgPhil Hughes2016-03-233-5/+22
| | | | | | | | | | | | Highlights first row when filtering
| * | Removed bold on any/unassigned authorsPhil Hughes2016-03-231-13/+22
| | |
| * | Adjusted alignment for the new label formPhil Hughes2016-03-235-20/+48
| | |
| * | Added label color box in dropdownPhil Hughes2016-03-232-7/+10
| | |
| * | Added clear button to dropdown filterPhil Hughes2016-03-233-5/+39
| | |
* | | Merge branch 'scss-style-guide-fixes' into 'master' Jacob Schatz2016-03-231-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.connorshea2016-03-231-3/+24
|/ / / | | | | | | | | | | | | | | | Fix a typo and add a section on ignoring issues. [ci skip]
* | | Merge branch 'issue_7959' into 'master' Jacob Schatz2016-03-2310-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 CHANGELOGAlfredo Sumaran2016-03-231-0/+1
| | | |
| * | | Move cropper.css to vendor folderissue_7959Alfredo Sumaran2016-03-231-0/+0
| | | |
| * | | Move cropper.js to vendor folderAlfredo Sumaran2016-03-232-0/+1
| | | |
| * | | Clear original input after cropAlfredo Sumaran2016-03-221-0/+1
| | | | | | | | | | | | | | | | This fixes the case when the user selects the same image consecutively. It failed because no 'change' event was fired.
| * | | 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-22378-2624/+6320
| |\ \ \
| * | | | 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
| | | | |