summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* removed global eslint for remaining filesflash-es6-modulePhil Hughes2017-10-105-8/+0
|
* fixed notes specsPhil Hughes2017-10-103-13/+33
| | | | | changed how the container class is added onto the text element more specs
* karma spec fixesPhil Hughes2017-10-106-18/+13
|
* fixed eslintPhil Hughes2017-10-102-11/+10
|
* flash testsPhil Hughes2017-10-102-11/+282
| | | | added back in documentation comment to flash file
* spec fixesPhil Hughes2017-10-103-8/+13
|
* 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 'winh-clarify-naming-imports-docs' into 'master'Filipa Lacerda2017-10-101-4/+26
|\ \ | | | | | | | | | | | | | | | | | | Make naming imports more clear Closes #38795 See merge request gitlab-org/gitlab-ce!14761
| * | Make naming imports more clearwinh-clarify-naming-imports-docswinh-clarify-naming-importsWinnie Hellmann2017-10-091-4/+26
| | |
* | | 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
| | |/ | |/|
* | | Merge branch '34841-todos' into 'master'Phil Hughes2017-10-105-52/+69
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix bad type checking to prevent 0 count badge to be shown Closes #34841 See merge request gitlab-org/gitlab-ce!14767
| * | Fix bad type checking to prevent 0 count badge to be shownFilipa Lacerda2017-10-105-52/+69
|/ /
* | 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 'rc/rename-codeclimate-to-codequality' into 'master'Kamil Trzciński2017-10-091-1/+1
|\ \ | | | | | | | | | | | | Rename the `codeclimate` job to `codequality` See merge request gitlab-org/gitlab-ce!14766
| * | Rename the `codeclimate` job to `codequality`rc/rename-codeclimate-to-codequalityRémy Coutable2017-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | As per our documentation: https://docs.gitlab.com/ee/user/project/merge_requests/code_quality_diff.html#how-it-works Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch '34284-add-changes-to-issuable-webhook-data' into 'master'Douwe Maan2017-10-0922-137/+659
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-0913-224/+423
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Start adding Gitlab::HookData::IssuableBuilderRémy Coutable2017-10-0913-150/+369
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Include the changes in issuable webhook payloadsRémy Coutable2017-10-0914-53/+157
| |/ / | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch '38534-minigraph' into 'master'Phil Hughes2017-10-093-4/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-093-4/+14
| | | |
* | | | Merge branch 'jk-assignees-todos-fix' into 'master'Sean McGivern2017-10-093-5/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 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-093-5/+30
| | |/ / | |/| |
* | | | Merge branch '23888-fix-unsubscription-link-for-snippet-notification' into ↵Sean McGivern2017-10-094-234/+390
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-094-234/+390
| |/ / / | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'rs-qa-sandbox-group' into 'master'Grzegorz Bizon2017-10-098-14/+138
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Make use of a `gitlab-qa-sandbox` group if available See merge request gitlab-org/gitlab-ce!14682
| * | | | Add QA::Scenario::Gitlab::Group::CreateRobert Speicher2017-10-097-59/+87
| | | | |
| * | | | Add QA::Page::Group::New to fill in the "Create group" formrs-qa-sandbox-groupRobert Speicher2017-10-063-13/+28
| | | | |
| * | | | Clean up QA::Page::Dashboard::Groups a bitRobert Speicher2017-10-061-11/+16
| | | | |
| * | | | Use autoloading instead of an explicit requireRobert Speicher2017-10-062-1/+4
| | | | |
| * | | | Implement Scenario::Gitlab::Sandbox::PrepareRobert Speicher2017-10-054-34/+69
| | | | | | | | | | | | | | | | | | | | | | | | | This better separates the concerns of preparing the sandbox namespace from creating a (sub)group.
| * | | | Make use of a `gitlab-qa-sandbox` group if availableRobert Speicher2017-10-043-7/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will use a top-level group if it's available, or create one if it's not, then create our `qa_test_*` groups as subgroups of the sandbox group.
* | | | | Merge branch 'group-sort-dropdown-blank' into 'master'Robert Speicher2017-10-093-1/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-09694-3668/+15494
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | # Conflicts: # spec/features/dashboard/group_spec.rb
| * | | | | Fixed default group sort optiongroup-sort-dropdown-blankPhil Hughes2017-10-063-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | Closes #38808
* | | | | | Merge branch '37483-activity-log-show-wrong-number-of-commits-per-push' into ↵Rémy Coutable2017-10-092-2/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-062-2/+6
| | | | | |
* | | | | | Merge branch 'bvl-fork-network-migrations' into 'master'Yorick Peterse2017-10-093-0/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create fork networks for root projects that are deleted Closes #38905 See merge request gitlab-org/gitlab-ce!14752
| * | | | | | Don't create fork networks for root projects that are deletedbvl-fork-network-migrationsBob Van Landuyt2017-10-093-0/+18
| | | | | | |
* | | | | | | Merge branch '37552-replace-js-true-with-js' into 'master'Rémy Coutable2017-10-09182-328/+461
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces `tag: true` into `:tag` in the specs Closes #37552 See merge request gitlab-org/gitlab-ce!14653
| * | | | | | | Replaces `tag: true` into `:tag` in the specsJacopo2017-10-07182-328/+461
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces all the explicit include metadata syntax in the specs (tag: true) into the implicit one (:tag). Added a cop to prevent future errors and handle autocorrection.
* | | | | | | | Merge branch 'rc/do-not-retry-ee_compat_check' into 'master'Sean McGivern2017-10-091-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not retry jobs that are allowed to fail See merge request gitlab-org/gitlab-ce!14757
| * | | | | | | | Do not retry jobs that are allowed to failrc/do-not-retry-ee_compat_checkRémy Coutable2017-10-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `ee_compat_check` job can take 10 minutes to run so it's a shame to retry it and loose 10 minutes if it fails for a good reason. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'icons-update-fix-regression-on-groups' into 'master'Phil Hughes2017-10-094-5/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-094-5/+5
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '38869-commitslist' into 'master'Phil Hughes2017-10-093-82/+79
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Removes CommitsList from global namespace See merge request gitlab-org/gitlab-ce!14735
View Lorry Controller Status