summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Review changes21122-move-list-of-builds-to-bottom-of-sidebarLuke Bennett2016-08-231-1/+1
|
* Changed `retry` link to blueLuke Bennett2016-08-231-0/+7
|
* Moved builds panel to the bottom of the builds sidemenuLuke Bennett2016-08-231-2/+1
|
* Allow passing an index to selectRowAtIndexAlfredo Sumaran2016-08-231-2/+7
|
* Fixed enter key in search input not workingPhil Hughes2016-08-231-10/+18
| | | | Closes #20627
* Set default label if user unselects the option from dropdownfix-empty-dropdownAlfredo Sumaran2016-08-211-2/+6
|
* Toggle dropdown disabled attributeAlfredo Sumaran2016-08-211-3/+1
| | | | Before this the dropdowns were not being disabled if the user unselected an option from the allowed to merge/push dropdowns.
* Do not update if one dropdown has not selected any optionAlfredo Sumaran2016-08-211-0/+3
| | | | No need to update the branch permission if no option is marked on the dropdown
* Merge branch '581-ee-backport-branch-permissions' into 'master' Douwe Maan2016-08-201-8/+11
|\ | | | | | | | | | | | | Backport changes from gitlab-org/gitlab-ee!581 See merge request !5884
| * Use typeof instead of Underscore methodAlfredo Sumaran2016-08-191-2/+2
| |
| * check if selectedObject is definedAlfredo Sumaran2016-08-191-1/+1
| |
| * make input name to be a functionAlfredo Sumaran2016-08-191-8/+11
| |
* | Merge branch 'gokmengoksel/gitlab-ce-koding' into 'master' Stan Hu2016-08-191-0/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Koding Integration ## What does this MR do? Will provide Koding integration with GitLab services. Forked from !4914. ## Are there points in the code the reviewer needs to double check? I've introduced new layouts which might not be necessary, first time contributor. ## Why was this MR needed? We're planning to ship Koding with GitLab. ## What are the relevant issue numbers? #12759 #14698 ## Screenshots (if relevant) ### Screencasts http://recordit.co/BDMbhwgxPD http://recordit.co/By0qiz1ClC ### Enable Koding in Application Settings ![image](/uploads/73a69421105c03aa2b0b47e2617d3fbc/image.png) ### Koding Dashboard ![image](/uploads/6c7dda34792280c0e4791e36af4eba11/image.png) ### Set up Koding Stack 1 - ![image](/uploads/d5c2b93f8e61b5cbffdb06f0267d485f/image.png) 2 - ![image](/uploads/44d9a9b574b8ac0c5eb553fb9653d5da/image.png) ### Run on Koding on Project Page ![image](/uploads/7d2b46221009074ffff75d66d5a1a555/image.png) ### Run in IDE on Merge Requests ![image](/uploads/65eed90c34c34b5fe7ad29ef9c717640/image.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] Tests - [x] Added for this feature/bug - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5909
| * | Support integration with Koding (online IDE)Gokmen Goksel2016-08-191-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Koding: #index: landing page for Koding integration If enabled it will provide a link to open remote Koding instance url for now we are also providing the sneak preview video for how integration works in detail. Repository: check whether .koding.yml file exists on repository Projects: landing page: show Run in IDE (Koding) button if repo has stack file Projects: MR: show Run in IDE Koding button if repo has stack file on active branch ProjectHelpers: add_koding_stack: stack generator for provided project With this helper we will auto-generate the required stack template for a given project. For the feature we can request this base template from the running Koding instance on integration. Currently this will provide users to create a t2.nano instance on aws and it'll automatically configures the instance for basic requirements. Projects: empty state and landing page provide shortcuts to create stack projects_helper: use branch on checkout and provide an entry point This ${var.koding_queryString_branch} will be replaced with the branch provided in query string which will allow us to use same stack template for different branches of the same repository. ref: https://github.com/koding/koding/pull/8597/commits/b8c0e43c4c24bf132670aa8a3cfb0d634acfd09b projects_helper: provide sha info in query string to use existing vms With this change we'll be able to query existing vms on Koding side based on the commit id that they've created. ref: https://github.com/koding/koding/pull/8597/commits/1d630fadf31963fa6ccd3bed92e526761a30a343 Integration: Docs: Koding documentation added Disable /koding route if integration is disabled Use application settings to enable Koding Projects_helper: better indentation with strip_heredoc usage Projects_helper: return koding_url as is if there is no project provided current_settings: set koding_enabled: false by default Koding_Controller: to render not_found once integration is disabled Dashboard_specs: update spec for Koding enabled case Projects_Helper: make repo dynamic ref: https://github.com/koding/koding/pull/8597/commits/4d615242f45aaea4c4986be84ecc612b0bb1514c Updated documentation to have right format
* | | Merge branch 'lbennett/gitlab-ce-17465-search-for-project-with-cursor-keys' ↵Jacob Schatz2016-08-192-35/+57
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' 17465 Fixed dropdown cursor key navigation ## What does this MR do? This MR fixes the use of cursor/arrow/enter key events with search dropdowns, allowing a user to navigate up and down the list with the arrow keys and then select their item with the enter key. It also applies some *minor* scroll user experience fixes, such as resetting the selected dropdown item every time it opens/closes (also stops multiple dropdowns conflicting) and forcing the dropdown scroll to scroll right to the top or bottom depending on whether they have selected the first or last item, respectively. ## Are there points in the code the reviewer needs to double check? I would like someone with GitLab experience to check over whether this would harm any unique implementations of the GitLabDropdown or SearchAutocomplete. ## Why was this MR needed? The current version has incorrectly behaving search dropdowns in the navbar, they either do not navigate using the keyboard or do not use the enter keystroke to select a highlighted item. ## What are the relevant issue numbers? Fixes #17465. Closes #20752. Closes #21014. **Contributes** to #20754. ## Screenshots (if relevant) ![17465.mp4](/uploads/1145abec226036abbaaa4aa46020f52b/17465.mp4) See merge request !4781
| * | | review changeslbennett/gitlab-ce-17465-search-for-project-with-cursor-keysLuke Bennett2016-08-192-12/+9
| | | |
| * | | Fixed conflictsLuke Bennett2016-08-182-16/+13
| | | |
| * | | Fixed specsLuke Bennett2016-08-181-2/+3
| | | |
| * | | Fixed spec and improved formattingLuke Bennett2016-08-182-3/+3
| | | |
| * | | Moved changes across to es5 and changed spec to es6Luke Bennett2016-08-184-1034/+55
| | | |
| * | | Fix failed testsLuke "Jared" Bennett2016-08-181-1/+1
| | | |
| * | | Further review changes and removed large ammounts of reformattingLuke "Jared" Bennett2016-08-182-107/+132
| | | |
| * | | Fixed test turbolink conditionLuke "Jared" Bennett2016-08-181-5/+5
| | | |
| * | | Review changes and final formattingLuke "Jared" Bennett2016-08-181-140/+115
| | | |
| * | | improved turbolinks.visit conditionalLuke "Jared" Bennett2016-08-181-1/+1
| | | |
| * | | Added new non-selectable selector exclusions to fix arrow key events, fixed ↵Luke Bennett2016-08-182-0/+1006
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the simulated clicking of a row and fixed the conflict between enter key form submit and enter key row selection Added bootstrap dropdown event triggers to invoke the open and close methods of the dropdown, allowing for the binding of array key events Added #17465 fix entry to CHANGELOG Fixed multi-dropdown selected row index conflict Fixed whitespace diff Added padding to the dropdown content iterative scroll as well as new conditional scrolls to scroll all the way to the top when the first item of a list is selected and to scroll all the way to the bottom when the last item of a list is selected Added conditionals to the enable and disable autocomplete methods to stop multiple invocations without any enabled/disabled state change Fixes some incorrect firing of requests. The dropdown box was invoking a new query every time it closed and the GitLabDropdownRemote callback was invoking a new query which was causing the dropdown double render issue. Added .selectable css class to dropdown list items that are not dividers or headers and altered selectors to account for that. Moved scroll padding Number to variable. Removed unused method Started Dropdown tests Added fixture and began first test Almost finished, navigation done, action and close needed YAY. TESTS DONE. Altered test and fixed click started removing selectable class use Fixed as reviewed altered selection method Fixed autocomplete shutting dropdown on arrow key use patched XSS vulns updated tests f Added click fixes
* | | | Merge branch 'issue-boards-label-text-color' into 'master' Robert Speicher2016-08-191-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added text color to issues labels in issue board lists ## What does this MR do? Adds the text color for labels in the response. The frontend was already setup to handle this, just needed the data from the backend. See merge request !5898
| * | | Added text color to issues labels in issue board listsPhil Hughes2016-08-191-0/+1
| | | |
* | | | Merge branch 'issue-boards-mobile-improvements' into 'master' Jacob Schatz2016-08-195-36/+8
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improvements to issue boards on mobile ## What does this MR do? - Removes the drag handles - Adds a delay before dragging can start otherwise you can't scroll the page See merge request !5897
| * | | Removed commented code :poop:issue-boards-mobile-improvementsPhil Hughes2016-08-192-26/+0
| | | |
| * | | Improvements to issue boards on mobilePhil Hughes2016-08-195-36/+34
| | | |
* | | | Merge branch 'expiration-date-on-memberships' into 'master' Douwe Maan2016-08-194-3/+61
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expiration date on memberships Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17495 See merge request !5876
| * \ \ \ Merge branch 'master' into 'expiration-date-on-memberships'Sean McGivern2016-08-1920-22/+953
| |\ \ \ \ | | | |/ / | | |/| | | | | | | # Conflicts: # db/schema.rb
| * | | | Don’t add events in loopDouwe Maan2016-08-181-19/+17
| | | | |
| * | | | Use `gl` namespace and explicitly check that string is emptyDouwe Maan2016-08-182-5/+5
| | | | |
| * | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-1813-53/+233
| |\ \ \ \
| * | | | | Allow project group links to be expiredSean McGivern2016-08-181-0/+1
| | | | | |
| * | | | | Add expiration date to group membershipsSean McGivern2016-08-181-0/+1
| | | | | |
| * | | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-1894-676/+3136
| |\ \ \ \ \
| * | | | | | Add MemberExpirationDate JS helperSean McGivern2016-08-182-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helper adds a datepicker to all `js-access-expiration-date` elements. If that element is a child of a `clearable-input` element and has a sibling `js-clear-input` element, then it will show a working clear button to the right of the input field.
| * | | | | | Add MemberExpirationDate JS helperSean McGivern2016-08-183-10/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helper adds a datepicker to all `js-access-expiration-date` elements. If that element is a child of a `clearable-input` element and has a sibling `js-clear-input` element, then it will show a working clear button to the right of the input field.
| * | | | | | Remove inline JavaScript. Add datepicker to the edit form.Adam Niedzielski2016-08-061-0/+7
| | | | | | |
* | | | | | | Merge branch 'ace-ventura' into 'master' Jacob Schatz2016-08-195-2/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ace ventura ## What does this MR do? Makes Ace only load when it's actually necessary. The only two places it seems to be used is for Snippets and the File (Blob) Editor. Before minification or compression, this takes the application.js down from 2.2MB to 1.6MB, and also removes two inline scripts :D Compressed/Minified: master: 317KB/1.1MB, ace-ventura: 220KB/771KB ## Are there points in the code the reviewer needs to double check? That this doesn't just completely break anything. ## Why was this MR needed? Ace is a big library, this allows us to only load it when necessary. ## What are the relevant issue numbers? #14372 ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4914
| * | | | | | | Don't use global variables.ace-venturaConnor Shea2016-08-182-3/+3
| | | | | | | |
| * | | | | | | Only load Ace on Snippets and file edit pages.Connor Shea2016-08-185-2/+26
| | | | | | | |
* | | | | | | | Merge branch 'label-tooltip-sidebar-collapsed' into 'master' Robert Speicher2016-08-191-3/+29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tooltip to label value in collapsed sidebar ## What does this MR do? Adds a list of the issuables labels to a tooltip in the collapsed sidebar. Limited to 5 otherwise the list could get crazy long. Closes #19398 See merge request !5232
| * | | | | | | | Changed tests to use JS testsPhil Hughes2016-08-191-1/+3
| | | | | | | | |
| * | | | | | | | Addressed feedbackPhil Hughes2016-08-191-0/+2
| | | | | | | | |
| * | | | | | | | Made logic simpler by moving away from underscorejsPhil Hughes2016-08-191-12/+8
| | | | | | | | |
| * | | | | | | | Added tooltip to label value in collapsed sidebarPhil Hughes2016-08-191-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #19398