summaryrefslogtreecommitdiff
path: root/spec/javascripts
Commit message (Collapse)AuthorAgeFilesLines
* fix frontend testsMike Greiling2017-01-282-10/+21
|
* Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-283-0/+274
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (33 commits) Improved code style on the issue_sidebar_spec.rb add CHAGELOG.md entry for !8831 remove assets:compile step from relative_url docs update scripts and docs to reference the newly namespaced rake task namespace assets rake tasks to gitlab:assets:* correct gzip files if they exist as well automatically correct CSS urls on assets:precompile remove hard-coded assets path for ace editor modules Fixed cancel button in the services form not redirecting back to the integrations settings view Fix search bar search param encoding Fix a transient failure in the `Explore::ProjectsController` spec Fix filtering with multiple words Fix project name label's for reference in project settings Fixed merge request tabs extra margin Don't call `#uniq` on a relation Move Gitlab::Shell and Gitlab::ShellAdapter files to lib/ Move ApplicationSetting DEFAULTS to `.defaults` instead Move a begin/rescue clause to ApplicationSetting.expire Use badge partial as single source of truth instead of having 2 partials doing the same Changes after review ...
| * Merge branch ↵Filipa Lacerda2017-01-271-0/+156
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | '27248-filtered-search-does-not-allow-filtering-labels-with-multiple-words' into 'master' Fix filtering label and milestone with multiple words Closes #27248 and #27334 See merge request !8830
| | * Fix filtering with multiple words27248-filtered-search-does-not-allow-filtering-labels-with-multiple-wordsClement Ho2017-01-271-0/+156
| | |
| * | Merge branch ↵Fatih Acet2017-01-271-0/+50
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '26448-unnecessary-request-is-made-when-filter-input-box-is-focused-by-keyboard' into 'master' Only search commits on input change since last search Closes #26448 See merge request !8488
| | * | Only search commits on input change since last search26448-unnecessary-request-is-made-when-filter-input-box-is-focused-by-keyboardSam Rose2017-01-251-0/+50
| | | |
| * | | Merge branch 'fix-search-bar-search-param' into 'master' Filipa Lacerda2017-01-271-0/+68
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Fix search bar search param encoding Closes #27398 See merge request !8753
| | * | Fix search bar search param encodingfix-search-bar-search-paramClement Ho2017-01-271-0/+68
| | | |
* | | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-2751-412/+822
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (389 commits) Document "No gems fetched from git repositories" policy [ci skip] Typos Small gramatical tweaks Typos Added PHP & NPM doc Use `:empty_project` where possible in request specs Add caching of droplab ajax requests Use `:empty_project` where possible in model specs Revert 3f17f29a Remove unused js response from refs controller Add MR id to changelog entry fixed small mini pipeline graph line glitch Prevent form to be submitted twice Fix Error 500 when repositories contain annotated tags pointing to blobs Fix /explore sorting (trending) Simplify wording in "adding an image" docs Remove "official merge window" from CONTRIBUTING.md [ci skip] Update repository check documentation Fixed flexbox and wrap issues Update two_factor_authentication.md ...
| * | | Merge branch ↵Fatih Acet2017-01-261-0/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '27124-search-bar-does-not-load-discussion-notes-selected-labels' into 'master' Fix filtered search so that labels selected from discussion notes display correctly Closes #27124 See merge request !8756
| | * | | Fix filtered search so that labels selected from discussion notes display ↵27124-search-bar-does-not-load-discussion-notes-selected-labelsClement Ho2017-01-251-0/+6
| | |/ / | | | | | | | | | | | | correctly
| * | | Merge branch 'copy-as-md' into 'master' Jacob Schatz2017-01-251-9/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Copying a rendered issue/comment will paste into GFM textareas as actual GFM See merge request !8597
| | * \ \ Merge branch 'master' into copy-as-mdDouwe Maan2017-01-253-2/+17
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/lib/utils/common_utils.js.es6
| | * | | Merge branch 'master' into copy-as-mdDouwe Maan2017-01-249-17/+232
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch 'master' into copy-as-mdDouwe Maan2017-01-1938-393/+729
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/lib/utils/common_utils.js.es6
| | * | | | Move some functions to utilsDouwe Maan2017-01-181-2/+2
| | | | | |
| | * | | | Fix ShortcutsIssuable#replyWithSelectedText testsDouwe Maan2017-01-171-9/+12
| | | | | |
| * | | | | Merge branch '26775-fix-auto-complete-initial-loading' into 'master' Fatih Acet2017-01-251-0/+26
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix autocomplete initial undefined state (loading) Closes #26775 See merge request !8667
| | * | | | Fix autocomplete initial undefined state26775-fix-auto-complete-initial-loadingEric Eastwood2017-01-231-0/+26
| | | |_|/ | | |/| | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/26775
| * | | | Merge branch 'newline-eslint-rule' into 'master'Jacob Schatz2017-01-252-2/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add an eslint rule to flag extra newlines See merge request !8137
| | * | | | Flag multiple empty lines in eslint, fix offenses.newline-eslint-ruleBryce Johnson2017-01-242-2/+0
| | |/ / /
| * | | | Merge branch 'normalize_frontend_headers' into 'master' Fatih Acet2017-01-251-0/+17
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Create a util for normalizing headers on the frontend See merge request !8750
| | * | | use gl.utils.normalizeHeaders in pipelines storenormalize_frontend_headersRegis2017-01-241-0/+17
| | | | |
| * | | | update tests to correspond with new behaviorMike Greiling2017-01-211-3/+3
| |/ / /
| * | | Fixed failing JS specsPhil Hughes2017-01-211-4/+16
| | | |
| * | | Teaspoon test fixPhil Hughes2017-01-211-3/+18
| | | |
| * | | Merge branch '25507-handle-errors-environment-list' into 'master' Fatih Acet2017-01-193-1/+142
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Error handling in environments list" Closes #25507 See merge request !8461
| | * | | Adds testsFilipa Lacerda2017-01-123-1/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds changelog entry Finishes tests Fix eslint errors Fix teaspoon test timing out
| * | | | Merge branch '26601-dropdown-makes-request-close' into 'master' Fatih Acet2017-01-191-5/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes builds dropdown making request when clicked to be closed Closes #26601 See merge request !8545
| | * | | | Use bootstrap dropdown events to only make the request when the dropdown is ↵26601-dropdown-makes-request-closeFilipa Lacerda2017-01-131-5/+6
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being opened Fixes builds dropdown making request when clicked to be closed Adds MR ID to CHANGELOG Improve documentation Use bootstrap dropdown events to only make the request when the dropdown is being opened
| * | | | Merge branch 'allow-shared-examples-jasmine' into 'master' Fatih Acet2017-01-193-1/+47
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Add jasmine helpers and run their specs Closes #26305 See merge request !8437
| | * | | Add first shared examples to a helper and updated teaspoon_env to allow ↵allow-shared-examples-jasmineLuke "Jared" Bennett2017-01-183-1/+47
| | | |/ | | |/| | | | | | | | | helper specs to run
| * | | Merge branch 'simple-eslint-fixes' into 'master' Fatih Acet2017-01-1934-382/+352
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Simple eslint fixes See merge request !8536
| | * | | resolve all prefer-const eslint violationsMike Greiling2017-01-183-17/+16
| | | | |
| | * | | resolve all x-spacing and no-spaced-x eslint violationsMike Greiling2017-01-186-98/+104
| | | | |
| | * | | resolve all indent eslint violationsMike Greiling2017-01-186-66/+69
| | | | |
| | * | | resolve all no-trailing-spaces eslint violationsMike Greiling2017-01-181-1/+1
| | | | |
| | * | | resolve all padded-blocks eslint violationsMike Greiling2017-01-1828-66/+28
| | | | |
| | * | | resolve all semi and no-extra-semi eslint violationsMike Greiling2017-01-189-197/+197
| | | | |
| | * | | resolve all no-plusplus eslint violationsMike Greiling2017-01-185-21/+21
| | |/ /
| * | | Merge branch '26803-typing-then-tab-in-a-comment-doesn-t-select-the-author' ↵Fatih Acet2017-01-191-0/+65
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fixed highlightFirst and added specs Closes #26803 See merge request !8622
| | * | | Fixed highlightFirst and added specs26803-typing-then-tab-in-a-comment-doesn-t-select-the-authorLuke "Jared" Bennett2017-01-181-0/+65
| | |/ /
| * | | Merge branch ↵Fatih Acet2017-01-191-0/+100
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24032-changed-visibility-level-to-public-but-project-is-not-public' into 'master' Update project visibility level ui to use dropdowns Closes #24296, #24123, and #24032 See merge request !7645
| | * | | Fixed tests24032-changed-visibility-level-to-public-but-project-is-not-publicLuke "Jared" Bennett2016-12-101-0/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grab permissions description from backend Review changes Added unit tests
* | | | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-182-11/+213
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (67 commits) Add some API endpoints for time tracking. use destructuring syntax instead add changelog yml file correct User_agent placement in robots.txt Fixing typo Fix Project#update_repository_size to convert MB to Bytes properly Remove repository trait from factories that don't need it in features Add the `:repository` trait to `:project` factories in Cucumber steps Add a `:repository` trait to the `:empty_project` factory Update clipboard_button text: Copy commit SHA to clipboard Fix search bar filter dropdown scrollbars get rid of log fix UI behaviour - only make new calls when button is clicked and dropdown is not displayed better UI fix - simple solution Disable all cops in .rubocop_todo.yml fix spec refactored a bunch of stuff based on feedback fix serializer fix bug retrieving medians fix specs ...
| * | | | Merge branch 'backport-time-tracking-ce' into 'master' Douwe Maan2017-01-182-11/+212
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Backport timetracking to CE See merge request !8195
| | * | | Backport timetracking frontend to CE.Bryce Johnson2017-01-152-11/+212
| | | |/ | | |/|
* | | | Merge branch 'master' into go-go-gadget-webpackPhil Hughes2017-01-171-0/+19
|\ \ \ \ | |/ / /
| * | | Fix dropdown filter input value after blur26616-fix-search-group-project-filtersEric Eastwood2017-01-161-0/+19
| |/ /
* | | rewrite test which relied on teaspoon quirkMike Greiling2017-01-131-2/+6
| | |