summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-10367-2247/+5042
|\
| * 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 global namespace See merge request gitlab-org/gitlab-ce!14776
| | * Remove u2f from globalnamespace38869-u2fFilipa Lacerda2017-10-097-223/+190
| | |
| * | Merge branch 'flash-es6-module' into 'master'Filipa Lacerda2017-10-1071-197/+179
| |\ \ | | | | | | | | | | | | | | | | Flash is now a ES6 module See merge request gitlab-org/gitlab-ce!14626
| | * | removed global eslint for remaining filesflash-es6-modulePhil Hughes2017-10-105-8/+0
| | | |
| | * | fixed notes specsPhil Hughes2017-10-102-12/+10
| | | | | | | | | | | | | | | | | | | | changed how the container class is added onto the text element more specs
| | * | karma spec fixesPhil Hughes2017-10-104-13/+8
| | | |
| | * | fixed eslintPhil Hughes2017-10-101-8/+8
| | | |
| | * | flash testsPhil Hughes2017-10-101-11/+34
| | | | | | | | | | | | | | | | added back in documentation comment to flash file
| | * | spec fixesPhil Hughes2017-10-102-7/+12
| | | |
| | * | Flash is now a ES6 modulePhil Hughes2017-10-1067-179/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduced the technical debt around our JS flash function by making it a module that is imported rather than relying on the global function. The global function still exists mainly for technical debt with how some requests are being completed, but new JS should import the module directly. Also reduces some tech debt in the file by removing the need for jQuery. Instead Flash is now 100% vanilla JS.
| * | | Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master'Douwe Maan2017-10-1012-12/+18
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Private Avatars are not CDN compatible" Closes #38245 and gitlab-com/support-forum#2476 See merge request gitlab-org/gitlab-ce!14443
| | * | | 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
| | | | | | | | | | | | | | | | | | | | Tests for these new helper methods
| | * | | 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 note Closes #38941 See merge request gitlab-org/gitlab-ce!14779
| | * | | | 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 programmatic changes. Closes #38441 See merge request gitlab-org/gitlab-ce!14539
| | * | | | | Trigger change event of the markdown textarea to allow Vue catch the ↵acet-fix-paste-on-comment-formFatih Acet2017-09-271-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | programmatic changes.
| * | | | | | 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. See merge request gitlab-org/gitlab-ce!14782
| | * | | | 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.js See merge request gitlab-org/gitlab-ce!14774
| | * | | | Remove Api from main.js38869-apiFilipa Lacerda2017-10-091-1/+0
| | | |_|/ | | |/| |
| * | | | Merge branch ↵Tim Zallmann2017-10-101-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '38574-superfluous-export-in-advanced-settings-of-project-settings' into 'master' Resolve "Superfluous "Export" in "Advanced settings" of project settings" Closes #38574 See merge request gitlab-org/gitlab-ce!14773
| | * | | | 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
| |/ / /
| * | | Merge branch 'wiki-empty-page-heading' into 'master'Filipa Lacerda2017-10-091-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wiki empty page translation namespace not being removed Closes #38920 See merge request gitlab-org/gitlab-ce!14759
| | * | | Fix wiki empty page translation namespace not being removedwiki-empty-page-headingPhil Hughes2017-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | Closes #38920
| * | | | Merge branch '34284-add-changes-to-issuable-webhook-data' into 'master'Douwe Maan2017-10-097-63/+38
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include the changes in issuable webhook payloads Closes #34284 See merge request gitlab-org/gitlab-ce!14308
| | * | | | Introduce new hook data builders for Issue and MergeRequest34284-add-changes-to-issuable-webhook-dataRémy Coutable2017-10-092-107/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | Start adding Gitlab::HookData::IssuableBuilderRémy Coutable2017-10-096-60/+132
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | Include the changes in issuable webhook payloadsRémy Coutable2017-10-097-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Merge branch '38534-minigraph' into 'master'Phil Hughes2017-10-092-4/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes mini graph in commit view Closes #38534 See merge request gitlab-org/gitlab-ce!14758
| | * | | | | Fixes mini graph in commit view38534-minigraphFilipa Lacerda2017-10-092-4/+9
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'jk-assignees-todos-fix' into 'master'Sean McGivern2017-10-092-5/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Backport of "Don't create todos for old issue assignees" See merge request gitlab-org/gitlab-ce!14765
| | * | | | | Don't create todos for old issue assigneesJarka Kadlecova2017-10-092-5/+6
| | | |/ / / | | |/| | |
| * | | | | Merge branch '23888-fix-unsubscription-link-for-snippet-notification' into ↵Sean McGivern2017-10-091-1/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Don't show an "Unsubscribe" link in snippet comment notifications Closes #23888 See merge request gitlab-org/gitlab-ce!14764
| | * | | | | Don't show an "Unsubscribe" link in snippet comment notificationsRémy Coutable2017-10-091-1/+5
| | |/ / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status