summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dont-assign-me-if-you-arent-allow' into 'master' Rémy Coutable2016-04-071-6/+8
|\
| * Remove duplication. Remove JS data attributesJacob Schatz2016-04-071-6/+6
| * Hide "assign to me" link if not alloweddont-assign-me-if-you-arent-allowJacob Schatz2016-04-071-5/+7
* | Merge branch 'feature/expose-builds-badge' into 'master' Rémy Coutable2016-04-072-1/+30
|\ \
| * | Change name of badge variable in badges controllerGrzegorz Bizon2016-04-061-3/+3
| * | Remove obsolete badge code from project viewGrzegorz Bizon2016-04-061-3/+0
| * | Expose project badges in project settings menuGrzegorz Bizon2016-04-061-1/+6
| * | Make it possible to switch ref in badges viewGrzegorz Bizon2016-04-061-0/+2
| * | Add project header title in project badges viewGrzegorz Bizon2016-04-061-0/+2
| * | Use highlight helper to render badges code syntaxGrzegorz Bizon2016-04-061-4/+4
| * | Improve view with list of badgesGrzegorz Bizon2016-04-061-7/+12
| * | Extend build status badge, add html/markdown methodsGrzegorz Bizon2016-04-061-3/+3
| * | Add project badges view prototypeGrzegorz Bizon2016-04-062-0/+18
* | | Reset MR optsanti-memoizer-mr-fixJacob Schatz2016-04-061-0/+2
| |/ |/|
* | Merge branch 'patch/fix-markdown-preview-wikis' into 'master' Robert Speicher2016-04-071-1/+5
|\ \
| * | Add specific markdown_preview route for WikisGabriel Mazetto2016-03-301-1/+5
* | | Merge branch 'master' into issue_14952Alfredo Sumaran2016-04-062-3/+3
|\ \ \
| * \ \ Merge branch 'issue_14800' into 'master' Jacob Schatz2016-04-061-2/+2
| |\ \ \
| | * | | Change approach, do not use timeoutsAlfredo Sumaran2016-04-061-2/+2
| * | | | Fixed delete comment button colordelete-icon-colorPhil Hughes2016-04-061-1/+1
| | |_|/ | |/| |
* | | | Use .new_record? insteadAlfredo Sumaran2016-04-061-2/+2
* | | | Do not add location badge when creating a group or projectissue_14952Alfredo Sumaran2016-04-051-2/+2
|/ / /
* | | Merge branch 'note-form-design' into 'master' Jacob Schatz2016-04-056-48/+46
|\ \ \ | |/ / |/| |
| * | Removed emoji button from notes formnote-form-designPhil Hughes2016-04-051-3/+0
| * | Logged out boxPhil Hughes2016-04-042-16/+14
| * | Discussion formPhil Hughes2016-04-041-13/+13
| * | Removed css code that isnt usedPhil Hughes2016-04-041-10/+0
| * | Focus style for comment formPhil Hughes2016-04-041-1/+1
| * | Hides current user icon on mobilePhil Hughes2016-04-041-2/+2
| * | Added toolbar to comment formPhil Hughes2016-04-043-24/+34
| * | Restyling on elements in comment formPhil Hughes2016-04-045-27/+27
| * | Started refactoring of note formPhil Hughes2016-04-043-20/+23
* | | Merge branch 'remove-2fa-status' into 'master' Jacob Schatz2016-04-041-2/+0
|\ \ \
| * | | Remove 2FA status on enable pageremove-2fa-statusRobert Schilling2016-03-291-2/+0
* | | | Merge branch 'admin-pages-layout' into 'master' Dmitriy Zaporozhets2016-04-042-35/+38
|\ \ \ \
| * | | | Single quotes paradiseadmin-pages-layoutDmitriy Zaporozhets2016-04-041-4/+4
| * | | | Improve UI for admin/groups pageDmitriy Zaporozhets2016-04-042-35/+38
* | | | | Merge branch 'dz-admin-area-fixes' into 'master' Jacob Schatz2016-04-045-9/+11
|\ \ \ \ \
| * | | | | Fix missing paddings in admin areaDmitriy Zaporozhets2016-04-044-8/+10
| * | | | | Dont use monospace font for namesDmitriy Zaporozhets2016-04-041-1/+1
| |/ / / /
* | | | | Merge branch 'hide_profile_activity_on_mobile' into 'master' Jacob Schatz2016-04-041-1/+1
|\ \ \ \ \
| * | | | | hide user profile activity graph on mobile and enable horizontal scroll for m...hide_profile_activity_on_mobileArinde Eniola2016-04-011-1/+1
* | | | | | Merge branch 'fix-award-emoji-menu' into 'master' Jacob Schatz2016-04-041-0/+2
|\ \ \ \ \ \
| * | | | | | Fix award emoji picker for relative_urlSandra Freihofer2016-04-011-0/+2
* | | | | | | Merge branch '14083-build-labels' into 'master' Jacob Schatz2016-04-041-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Add labels to block element14083-build-labelsAnnabel Dunstone2016-04-011-1/+1
| |/ / / / /
* | | | | | Fix creation of merge requests for orphaned branchesStan Hu2016-04-041-2/+5
| |_|_|/ / |/| | | |
* | | | | Merge branch 'build-updates' into 'master' Douwe Maan2016-04-032-17/+24
|\ \ \ \ \
| * | | | | Updated based on feedbackPhil Hughes2016-03-211-20/+34
| * | | | | Updated to fix issues risen during feedbackPhil Hughes2016-03-182-38/+26