summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Frontend review changeszj-mattermost-command-help-messageLuke "Jared" Bennett2016-11-212-28/+33
|
* Added new .help-form styling and implemented with mattermost command service ↵Luke "Jared" Bennett2016-11-212-1/+43
| | | | help well
* Merge branch 'super-secret-login-upgrade' into 'master' Fatih Acet2016-11-191-23/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert signin tab order fix. The history: > 1. @sytses created this: https://gitlab.com/gitlab-org/gitlab-ce/issues/23279 > 2. The fix was submitted here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6867 > 3. I [made](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6867#note_16993324) the same observation you did after it was merged 4. A long discussion about accessibility and UX followed, and we decided to revert all changes (https://gitlab.com/gitlab-org/gitlab-ce/issues/23698). ## Screenshots (if relevant) ![2016-11-17_20.55.22](/uploads/c81b0bbe0cd08747124531778af6273f/2016-11-17_20.55.22.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23698 See merge request !7538
| * Un-un-revert signin tab order fix.super-secret-login-upgradeBryce Johnson2016-11-181-23/+0
| |
* | Merge branch '22539-display-folders' into 'master' Fatih Acet2016-11-1913-3/+1294
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Display "folders" for environments" ## What does this MR do? Adds the ability to show the grouped environments inside "folders". Adds several reusable vue components in order to accomplish the recursive tree data structure presented. For the individual components, Jasmine tests were added. For the ones that depend of an API response, rspec tests are used. ## Screenshots (if relevant) ![Screen_Shot_2016-11-16_at_02.00.13](/uploads/1278012c8639b999b53f080728d283e1/Screen_Shot_2016-11-16_at_02.00.13.png) ![Screen_Shot_2016-11-16_at_02.00.25](/uploads/a3d65416ddb553e1b8f0f4c8897a75dc/Screen_Shot_2016-11-16_at_02.00.25.png) ![Screen_Shot_2016-10-17_at_16.08.50](/uploads/af63efe1d2cbd5fc069408622ef4b607/Screen_Shot_2016-10-17_at_16.08.50.png) ![environments](/uploads/b5a1801766d82ab176fc60f96b6968cb/environments.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22539 See merge request !7015
| * | Fix broken testFilipa Lacerda2016-11-191-7/+2
| | |
| * | Changes for stop url to pathFilipa Lacerda2016-11-191-7/+1
| | |
| * | Expose stop_path for environment to not construct that in frontendKamil Trzcinski2016-11-182-2/+2
| | |
| * | Merge branch '22539-display-folders' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2016-11-187-83/+135
| |\ \ | | | | | | | | | | | | 22539-display-folders
| | * | Fix css classFilipa Lacerda2016-11-181-1/+2
| | | |
| | * | Remove comment from htmlFilipa Lacerda2016-11-181-1/+0
| | | |
| | * | Removes unnecessary commentsFilipa Lacerda2016-11-182-3/+0
| | | |
| | * | Improvements after reviewFilipa Lacerda2016-11-181-9/+1
| | | |
| | * | Remove unused CSSFilipa Lacerda2016-11-181-4/+0
| | | |
| | * | Remove slotsFilipa Lacerda2016-11-181-16/+20
| | | |
| | * | Fixes typoFilipa Lacerda2016-11-181-4/+4
| | | | | | | | | | | | | | | | Removes unneeded comparision
| | * | Try to use slotsFilipa Lacerda2016-11-182-22/+25
| | | |
| | * | Improve after reviewFilipa Lacerda2016-11-181-1/+1
| | | |
| | * | Improvements after reviewFilipa Lacerda2016-11-171-13/+41
| | | |
| | * | Adds helper to verify empty objectFilipa Lacerda2016-11-171-3/+18
| | | |
| | * | Fix after reviewFilipa Lacerda2016-11-171-4/+1
| | | |
| | * | Merge branch 'master' into 22539-display-foldersGrzegorz Bizon2016-11-173-1/+115
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (26 commits) Remove extra subscribable_type filter on migration Add feature spec for labels subscription Avoid code duplication for label subscription status on label partial Rename LabelSubscription javascript to ProjectLabelSubscription Fix label subscription menu on small screens resolution Allow users to subscribe to a group label at group or project level Use button instead of an icon to subscribe/unsubscribe to labels Add CHANGELOG entry Add toggle_subscription action to Groups::LabelsController Allow subscriptions to be created without a project Use subqueries instead of joins to migrate subscriptions Add helper method to toggle label subscription on labels controller spec Remove default value for `project` argument on subscribable concern Use @project as default on ToggleSubscriptionAction concern Allow users to subscribe to group labels at project-level Pass project to Entities::Label to check if user is subscribed Fix specs to pass a project when creating subscriptions Refactoring label subscription toggle button text to accept a project Refactoring label subscription status to accept a project Refactoring notification service to find subscriptions per project ...
| | * \ \ Merge branch 'master' into 22539-display-foldersGrzegorz Bizon2016-11-17123-125/+152
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (154 commits) Fix typos Fix wrong changelog item Add missing item for 8.13.6 Change last_used_at to use touch Add chat_name partial Mention Git strategy none Fix code review adds fix for security issue when annonymous user does not ... Remove ToC since it's now supported in the docs portal itself Add 8.14 to versions with further additions to review apps Add Limitations sections to environments and review apps docs Add link to environments docs Fix URL to review apps docs Add a prerequisites section, add some links Link to NGINX example project for the time being Get rid most of the irrelevant sections Add note about current limitation in $CI_BUILD_REF_NAME Add an intro and an Overview section for Review Apps WIP review apps Add Review apps link to CI README ... Conflicts: spec/features/environments_spec.rb
| | * | | | Adds fixed layout to prevent the columns from jumping when opening a folderFilipa Lacerda2016-11-171-0/+2
| | | | | |
| | * | | | Undo last commitFilipa Lacerda2016-11-171-236/+0
| | | | | |
| | * | | | Adds fixed layout to prevent the columns from jumping when opening a folderFilipa Lacerda2016-11-171-0/+236
| | | | | |
| | * | | | Fix broken button in empty stateFilipa Lacerda2016-11-171-8/+7
| | | | | |
| | * | | | inline conditionsFilipa Lacerda2016-11-171-4/+2
| | | | | |
| | * | | | Changes url to pathFilipa Lacerda2016-11-172-10/+10
| | | | | |
| | * | | | Fix iifeFilipa Lacerda2016-11-171-1/+1
| | | | | |
| | * | | | Fix spacesFilipa Lacerda2016-11-171-3/+3
| | | | | |
| | * | | | Improves variableFilipa Lacerda2016-11-171-9/+9
| | | | | |
| | * | | | Adds documentation to filter functionFilipa Lacerda2016-11-171-6/+27
| | | | | |
| | * | | | Fix rel attributeFilipa Lacerda2016-11-172-2/+2
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into 22539-display-foldersKamil Trzcinski2016-11-18140-305/+589
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | TestsFilipa Lacerda2016-11-161-1/+1
| | | | | |
| * | | | | Fix broken url for stop actionFilipa Lacerda2016-11-161-3/+9
| | | | | |
| * | | | | Remove debuggerFilipa Lacerda2016-11-161-1/+0
| | | | | |
| * | | | | Fixes broken testsFilipa Lacerda2016-11-162-3/+12
| | | | | |
| * | | | | Fix eslintFilipa Lacerda2016-11-161-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | Remove unused method
| * | | | | Adds missing tests for commit componentFilipa Lacerda2016-11-161-1/+1
| | | | | |
| * | | | | Fix eslint errorsFilipa Lacerda2016-11-167-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | Fix rubocop error
| * | | | | Adds props validationFilipa Lacerda2016-11-166-84/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves documentation Adds tests Fix prop validation for objects Finish tests for environment item Adds tests for toggle folder function Environment tests Adds tests
| * | | | | Refactor to work with vue 2 with just one root elementFilipa Lacerda2016-11-163-47/+87
| | | | | |
| * | | | | Update to vue 2Filipa Lacerda2016-11-165-34/+49
| | | | | |
| * | | | | Adds testsFilipa Lacerda2016-11-166-208/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds tests. Changes instance into a constructor Adds tests for environments component Adds tests assertations Adds external URL test Adds tests for Rollback component Adds tests for stop component Adds tests for actions component Fix environment item Init environment item tests
| * | | | | Add template to environment vue instanceFilipa Lacerda2016-11-162-28/+109
| | | | | |
| * | | | | Adds rollback and stop componentFilipa Lacerda2016-11-165-12/+105
| | | | | |
| * | | | | Adds external url component for environmentFilipa Lacerda2016-11-163-7/+33
| | | | | |
| * | | | | Adds permissions to actions componentFilipa Lacerda2016-11-161-4/+27
| | | | | |
View Lorry Controller Status