summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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>
* | | Merge branch 'group-sort-dropdown-blank' into 'master'Robert Speicher2017-10-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed default group sort option Closes #38808 See merge request gitlab-org/gitlab-ce!14728
| * \ \ Merge branch 'master' into 'group-sort-dropdown-blank'Robert Speicher2017-10-09205-1401/+3909
| |\ \ \ | | |/ / | | | | | | | | # Conflicts: # spec/features/dashboard/group_spec.rb
| * | | Fixed default group sort optiongroup-sort-dropdown-blankPhil Hughes2017-10-061-1/+1
| | | | | | | | | | | | | | | | Closes #38808
* | | | Merge branch '37483-activity-log-show-wrong-number-of-commits-per-push' into ↵Rémy Coutable2017-10-091-2/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix the number representing the amount of commits related to a push event Closes #37483 See merge request gitlab-org/gitlab-ce!14103
| * | | Fix the number representing the amount of commits related to a push eventMark Fletcher2017-10-061-2/+1
| | | |
* | | | Merge branch 'icons-update-fix-regression-on-groups' into 'master'Phil Hughes2017-10-093-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Updated Icons + Fix for Collapsed Groups Angle See merge request gitlab-org/gitlab-ce!14754
| * | | | Updated Icons + Fix for Collapsed Groups Angleicons-update-fix-regression-on-groupsTim Zallmann2017-10-093-3/+3
| | | | |
* | | | | Removes CommitsList from global namespaceFilipa Lacerda2017-10-092-26/+27
| |_|_|/ |/| | |
* | | | Merge branch 'abuse-reports-module' into 'master'Filipa Lacerda2017-10-093-6/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Convert AbuseReports class to a module See merge request gitlab-org/gitlab-ce!14709
| * | | | Convert AbuseReports class to a moduleabuse-reports-modulePhil Hughes2017-10-063-6/+3
| | | | |
* | | | | Remove AjaxLoadingSpinner and CreateLabelDropdown from global namespaceFilipa Lacerda2017-10-096-34/+29
| | | | |
* | | | | Merge branch 'sh-show-all-slack-names' into 'master'Robert Speicher2017-10-097-16/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include GitLab full name with username in Slack messages Closes #38865 See merge request gitlab-org/gitlab-ce!14740
| * | | | | Include GitLab full name with username in Slack messagessh-show-all-slack-namesStan Hu2017-10-067-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to include the first and last name of the user, but !6624 modified this to include only the username. Let's compromise and add both in the form of `First Last (username)`. Closes #38865
* | | | | | Move cycle analytics banner into a vue fileFilipa Lacerda2017-10-093-12/+60
| |_|/ / / |/| | | |
* | | | | Merge branch '38890-fix-gpg-signature-updater-when-commit-is-missing' into ↵Stan Hu2017-10-071-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix error with GPG signature updater when commit was deleted Closes #38890 See merge request gitlab-org/gitlab-ce!14749
| * | | | | Fix error with GPG signature updater when commit was deleted38890-fix-gpg-signature-updater-when-commit-is-missingRubén Dávila2017-10-071-0/+2
| | | | | |
* | | | | | Merge branch 'cleanup_old_nav_stuff' into 'master'Filipa Lacerda2017-10-0723-926/+501
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Remove old navigation CSS See merge request gitlab-org/gitlab-ce!14573
| * | | | | Fix dropdown header alignment; empty navbar positioningcleanup_old_nav_stuffAnnabel Dunstone Gray2017-10-072-18/+18
| | | | | |
| * | | | | Specify gitlab navAnnabel Dunstone Gray2017-10-062-6/+6
| | | | | |
| * | | | | Finish combining nav stylesAnnabel Dunstone Gray2017-10-066-479/+414
| | | | | |
| * | | | | Fix specsAnnabel Dunstone Gray2017-10-062-0/+6
| | | | | |
| * | | | | Conflict fixesAnnabel Dunstone Gray2017-10-061-4/+4
| | | | | |
| * | | | | Start moving new nav styles into header.scssAnnabel Dunstone Gray2017-10-0613-268/+76
| | | | | |
| * | | | | FixesAnnabel Dunstone Gray2017-10-065-129/+130
| | | | | |
| * | | | | Fix scrolling tabsAnnabel Dunstone Gray2017-10-062-0/+8
| | | | | |
| * | | | | Remove nav images; remove old nav styles; create new file for other ↵Annabel Dunstone Gray2017-10-0610-526/+343
| |/ / / / | | | | | | | | | | | | | | | navigation elements
View Lorry Controller Status