summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'wiki-bottom-padding' into 'master' Jacob Schatz2016-06-061-1/+1
|\
| * Add padding to bottom of wiki page, fix #12921.Connor Shea2016-06-061-1/+1
* | Merge branch 'activity-links' into 'master' Jacob Schatz2016-06-061-3/+7
|\ \
| * | Fixed issue with activity links not being consistentactivity-linksPhil Hughes2016-06-021-3/+7
* | | Merge branch 'edit-mobile' into 'master' Jacob Schatz2016-06-063-9/+26
|\ \ \
| * | | Shows the edit comment button on mobileedit-mobilePhil Hughes2016-06-023-9/+26
| |/ /
* | | Merge branch '18026-consider-removing-issue-merge-request-previous-next-butto...Jacob Schatz2016-06-063-45/+0
|\ \ \
| * | | Remove prev/next buttons on issues and merge requests18026-consider-removing-issue-merge-request-previous-next-buttonsAlejandro Rodríguez2016-06-063-45/+0
* | | | Merge branch 'confidential-issue-notice' into 'master' Jacob Schatz2016-06-062-0/+39
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix error on non-issue pages with comment areas.Connor Shea2016-06-051-1/+1
| * | | Add confidential issue notice in comment box.Connor Shea2016-06-032-0/+39
* | | | Merge branch 'notes-are-awardables' into 'master' Douwe Maan2016-06-0613-123/+230
|\ \ \ \ | |_|/ / |/| | |
| * | | Updated MR notes.notes-are-awardablesFatih Acet2016-06-064-18/+16
| * | | Fix scss-lint.Fatih Acet2016-06-061-1/+1
| * | | Added tests for award emoji feature.Fatih Acet2016-06-062-11/+11
| * | | Create and show emoji loader on the fly.Fatih Acet2016-06-062-6/+21
| * | | Some design related tweaks.Fatih Acet2016-06-066-7/+24
| * | | Be consistent on naming.Fatih Acet2016-06-061-22/+22
| * | | Animate emoji when rendered.Fatih Acet2016-06-061-1/+12
| * | | Fix mutual exclusivity for emoji only comments.Fatih Acet2016-06-061-1/+4
| * | | Refactor awardsHandler methods to work with votesBlock.Fatih Acet2016-06-062-35/+36
| * | | Award emoji implementation for notes.Fatih Acet2016-06-063-65/+92
| * | | Show emoji menu in notes.Fatih Acet2016-06-063-3/+25
| * | | Backend awardables on commentsZJ van de Weg2016-06-064-2/+15
* | | | Merge branch 'jquery2' into 'master' Jacob Schatz2016-06-064-6/+7
|\ \ \ \
| * | | | Fixed JS errorsjquery2Phil Hughes2016-06-053-5/+6
| * | | | Upgraded jQuery to version 2Phil Hughes2016-06-051-1/+1
| |/ / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-0624-106/+514
|\ \ \ \
| * | | | Add a U2F-specific audit log entry after logging in.Timothy Andrew2016-06-061-2/+11
| * | | | Implement authentication (login) using a U2F device.Timothy Andrew2016-06-065-30/+164
| * | | | Implement U2F registration.Timothy Andrew2016-06-0610-57/+256
| * | | | Render `gon` data in the page `body`, not `head`Timothy Andrew2016-06-065-2/+5
| * | | | Update the `browser` gem.Timothy Andrew2016-06-061-1/+1
| * | | | Add a `U2fRegistrations` table/model.Timothy Andrew2016-06-064-14/+77
| |/ / /
* | | | Merge branch 'fix/unauthorized-access-to-build-data' into 'master' Douwe Maan2016-06-062-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Remove 'unscoped' from project builds selectionTomasz Maczukin2016-06-042-2/+2
| |/ /
* | | Merge branch 'rubocop/enable-ambiguous-operator-rubocop-lint' into 'master' Robert Speicher2016-06-051-1/+1
|\ \ \
| * | | Enable Lint/AmbiguousOperator rubocop coprubocop/enable-ambiguous-operator-rubocop-lintGrzegorz Bizon2016-06-031-1/+1
* | | | Remove extra bracketissue_13499Alfredo Sumaran2016-06-031-2/+1
* | | | Fix specAlfredo Sumaran2016-06-031-1/+1
* | | | Address feedbackAlfredo Sumaran2016-06-039-32/+26
* | | | Spec label add / delete in UpdateServiceSean McGivern2016-06-031-9/+8
* | | | Allow bulk-updating to remove all labelsSean McGivern2016-06-031-1/+1
* | | | EnhancementsAlfredo Sumaran2016-06-033-16/+13
* | | | Respond to .json onlyAlfredo Sumaran2016-06-031-1/+6
* | | | Fix specAlfredo Sumaran2016-06-031-1/+1
* | | | Add mising paramsAlfredo Sumaran2016-06-031-3/+6
* | | | Remove console.logAlfredo Sumaran2016-06-031-1/+0
* | | | Bulk assignment implementationAlfredo Sumaran2016-06-033-2/+111
* | | | Tweaks for bulk assignmentAlfredo Sumaran2016-06-031-3/+15