summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* fix a whitespace34897-delete-branch-after-mergeMicael Bergeron2017-10-121-1/+1
* fix for discussionMicael Bergeron2017-10-121-3/+4
* fix the merger override to remove source branchmicael.bergeron2017-10-111-5/+8
* Merge branch 'move_markdown_preview_to_concern' into 'master'Sean McGivern2017-10-116-35/+28
|\
| * Add support for markdown preview to group milestonesmove_markdown_preview_to_concernVitaliy @blackst0ne Klachkov2017-10-116-35/+28
* | Merge branch '38720-sort-admin-runners' into 'master'Rémy Coutable2017-10-112-2/+3
|\ \
| * | Add sort runners on admin runnersTakuya Noguchi2017-10-042-2/+3
* | | Simplify project pageAnnabel Dunstone Gray2017-10-1113-149/+269
* | | Enable eslint in star and remove from main.jsFilipa Lacerda2017-10-112-20/+21
* | | Merge branch '38869-labels' into 'master'Phil Hughes2017-10-114-151/+137
|\ \ \
| * | | Use ES6 modules in labels and labels managerFilipa Lacerda2017-10-104-151/+137
* | | | Decreases z-index of select2 to a lower number than our navigation barFilipa Lacerda2017-10-101-0/+1
* | | | Remove not selector increasing specificity of rulesfix-dropdownFilipa Lacerda2017-10-102-2/+3
|/ / /
* | | Fix unable to expand text diff discussion commentsClement Ho2017-10-103-4/+4
* | | Stop using `branch_names.include?` and use `branch_exists?`Andrew Newdigate2017-10-103-5/+5
* | | Merge branch '38869-u2f' into 'master'38968-label-picker-should-be-cleared-upon-selecting-a-labelPhil Hughes2017-10-107-223/+190
|\ \ \
| * | | Remove u2f from globalnamespace38869-u2fFilipa Lacerda2017-10-097-223/+190
* | | | Merge branch 'flash-es6-module' into 'master'Filipa Lacerda2017-10-1071-197/+179
|\ \ \ \
| * | | | removed global eslint for remaining filesflash-es6-modulePhil Hughes2017-10-105-8/+0
| * | | | fixed notes specsPhil Hughes2017-10-102-12/+10
| * | | | karma spec fixesPhil Hughes2017-10-104-13/+8
| * | | | fixed eslintPhil Hughes2017-10-101-8/+8
| * | | | flash testsPhil Hughes2017-10-101-11/+34
| * | | | spec fixesPhil Hughes2017-10-102-7/+12
| * | | | Flash is now a ES6 modulePhil Hughes2017-10-1067-179/+148
* | | | | Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master'Douwe Maan2017-10-1012-12/+18
|\ \ \ \ \
| * | | | | Changed Group Icon URL Back to try option38245-private-avatars-are-not-cdn-compatibleTim Zallmann2017-10-101-5/+1
| * | | | | Fix for Lint Error + Upload TestTim Zallmann2017-10-091-1/+0
| * | | | | Based on MR simplified the logicTim Zallmann2017-10-093-17/+5
| * | | | | Removed 2 uncommented linesTim Zallmann2017-10-061-2/+0
| * | | | | Fixed Linting ErrorTim Zallmann2017-10-051-8/+0
| * | | | | Another Change for cleanupTim Zallmann2017-10-051-6/+0
| * | | | | Updates based on MR commentsTim Zallmann2017-10-053-16/+19
| * | | | | Fixed TestsTim Zallmann2017-10-041-5/+6
| * | | | | Fixed TestTim Zallmann2017-10-041-3/+3
| * | | | | Fixed Linting errors + testsTim Zallmann2017-10-042-5/+3
| * | | | | Created group_icon and group_icon_urlTim Zallmann2017-10-0411-15/+34
| * | | | | Making private project avatars use local paths + Some Group IconsTim Zallmann2017-10-044-9/+27
* | | | | | Merge branch '38941-lock-note-fix' into 'master'Sean McGivern2017-10-101-1/+1
|\ \ \ \ \ \
| * | | | | | Fix text for the merge request lock system noteJarka Kadlecova2017-10-101-1/+1
* | | | | | | Merge branch 'acet-fix-paste-on-comment-form' into 'master'Filipa Lacerda2017-10-101-1/+4
|\ \ \ \ \ \ \
| * | | | | | | Trigger change event of the markdown textarea to allow Vue catch the programm...acet-fix-paste-on-comment-formFatih Acet2017-09-271-1/+4
* | | | | | | | Remove Build code from global namespaceFilipa Lacerda2017-10-108-97/+87
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'ee-38771-ce-backport' into 'master'Douwe Maan2017-10-103-2/+13
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Backports EE 38771 changes to CE.Tiago Botelho2017-10-103-2/+13
* | | | | | | Merge branch '38869-api' into 'master'Phil Hughes2017-10-101-1/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove Api from main.js38869-apiFilipa Lacerda2017-10-091-1/+0
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '38574-superfluous-export-in-advanced-settings-of-project-settin...Tim Zallmann2017-10-101-1/+1
|\ \ \ \ \ \
| * | | | | | fix incorrect description for advanced settings section of project settings38574-superfluous-export-in-advanced-settings-of-project-settingsMike Greiling2017-10-091-1/+1
| |/ / / / /
* | | | | | Fix bad type checking to prevent 0 count badge to be shownFilipa Lacerda2017-10-102-8/+25
|/ / / / /