summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add missing group members to export for I/Efix/import-group-membersJames Lopez2017-02-0710-13/+124
|
* Merge branch 'sh-add-index-for-label-count' into 'master' Yorick Peterse2017-02-052-1/+13
|\ | | | | | | | | | | | | Add index to labels for `type` and project_id` Closes #27676 See merge request !8978
| * Add index to labels for `type` and project_id`sh-add-index-for-label-countStan Hu2017-02-042-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When loading pages that display the number of open issues, the backend runs a query such as: ```sql SELECT "labels"."id" FROM "labels" WHERE "labels"."type" IN ('ProjectLabel') AND "labels"."project_id" = 1000 ``` This results in an entire scan of the `labels` table. To optimize performance, add the appropriate index to the table. Closes #27676
* | Merge branch 'slash-commands-typo' into 'master' Grzegorz Bizon2017-02-052-1/+5
|\ \ | |/ |/| | | | | | | | | Fixed typo in slash commands docs Closes #27674 See merge request !8976
| * Fixed typoJason Aquino2017-02-042-1/+5
| | | | | | | | Fixes gitlab-org/gitlab-ce#27674
* | Merge branch 'fix-rack-proxy' into 'master' Douwe Maan2017-02-041-2/+2
|\ \ | |/ |/| | | | | Fix "NameError: uninitialized constant Rack::Proxy" in production environment See merge request !8977
| * fix rack-proxy dependency in productionfix-rack-proxyMike Greiling2017-02-041-2/+2
| |
* | Merge branch 'ux-guide-button-placement' into 'master' Achilleas Pipinellis2017-02-041-0/+14
|\ \ | |/ |/| | | | | UX Guide: Button placement in groups See merge request !8972
| * [ci skip] UX Guide: Button placement in groupsux-guide-button-placementAllison Whilden2017-02-031-0/+14
| |
* | Merge branch 'go-go-gadget-webpack' into 'master' Jacob Schatz2017-02-04204-985/+2780
|\ \ | | | | | | | | | | | | | | | | | | Integrate webpack for frontend asset compilation Closes #14634 See merge request !7288
| * | fix failing testgo-go-gadget-webpackMike Greiling2017-02-031-1/+1
| | |
| * | fix Vue warnings for missing elementMike Greiling2017-02-031-2/+2
| | |
| * | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-03100-1992/+2066
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Change window size before visiting page, to get correct scroll position Fix slash commands spec error Move project services to new location under Integrations Move webhooks to new a location under Integrations Fixed eslint test failure Fixed redirection from http://someproject.git to http://someproject Add traits for the different Event types to the Event factory prevent nonewline type diff lines from containing unfolding link ensure linenumber data attribute is correct for the last line in a diff chunk ensure last line in diff block is contained within a table row element ensure click event is bound only once
| * \ \ Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-03287-2144/+3741
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (181 commits) Fixed adding to list bug Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index Fixed modal lists dropdown not updating when list is deleted Fixed remove btn error after creating new issue in list Removed duplicated test Removed Masonry, instead uses groups of data Uses mixins for repeated functions Fixed up specs Props use objects with required & type values Removes labels instead of closing issue when clicking remove button Fixed JS lint errors Fixed issue card spec Added webkit CSS properties Fixed bug with empty state showing after search Fixed users href path being incorrect Fixed bug where 2 un-selected issues would stay on selected tab Fixed DB schema Changed how components are added in objects Added remove button Add optional id property to the issue schema Fixed issue link href Disabled add issues button if no lists exist ...
| * | | | consistently use single quotesMike Greiling2017-02-021-3/+3
| | | | |
| * | | | allow application.js to require other scripts which start with application*Mike Greiling2017-02-021-1/+1
| | | | |
| * | | | DRY with Gitlab.config.webpack.dev_server referenceswebpackMike Greiling2017-02-021-10/+12
| | | | |
| * | | | Merge branch 'master' into webpackMike Greiling2017-02-02154-612/+1805
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (63 commits) Use `add_$role` helper in snippets specs removes old css class from everywhere Fixes broken build: Use jquery to get the element position in the page Check public snippets for spam Keep snippet visibility on error Update pipeline and commit URL and text on CI status change Support non-ASCII characters in GFM autocomplete Active tense test coverage Fix filtered search manager spec teaspoon error Reduce the number of loops that Cycle Analytics specs use Remove unnecessary returns / unset variables from the CoffeeScript -> JS conversion. update spec Change the reply shortcut to focus the field even without a selection. use destroy_all Remove settings cog from within admin scroll tabs; keep links centered add changelog remove old project members from project add spec replicating validation error Improve styling of the new issue message Don't capitalize environment name in show page ...
| * | | | | disable webpack proxy in rspec environment due to conflicts with webmock gemMike Greiling2017-02-021-12/+20
| | | | | |
| * | | | | remove changes to ProcfileMike Greiling2017-02-011-1/+0
| | | | | |
| * | | | | configure webpack dev server port via environment variableMike Greiling2017-02-011-10/+2
| | | | | |
| * | | | | add rack middleware to proxy webpack dev serverMike Greiling2017-02-017-0/+71
| | | | | |
| * | | | | remove dev-server config from development environmentMike Greiling2017-01-311-7/+0
| | | | | |
| * | | | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-31176-850/+1829
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (83 commits) Fix small typo on new branch button spec Abillity to promote project labels to group labels Update and pin the `jwt` gem to ~> 1.5.6 refactor merge request build service Update index.md Clarify that Auto Deploy requires a public project. cop for gem fetched from a git source Add CHANGELOG entry Remove new branch button for confidential issues Remove flash warning from login page add complete changelog Add project ID index to `project_authorizations` table to optimize queries Fix disable storing of sensitive information when importing a new repo Fix notification when global=disabled, group=watch Ensure rake is called within the correct bundle context Fix 8.16.0 release date. Improve search within group logic Add changelog item about new attributes in group api Update group api doc with full_name and full_path attributes Add tests for nested groups in search service and search helper ...
| * | | | | | add CHAGELOG.md entry for webpack branchMike Greiling2017-01-291-0/+4
| | | | | | |
| * | | | | | fix failing rspec buildMike Greiling2017-01-281-4/+4
| | | | | | |
| * | | | | | fix test failure for merge request widgetMike Greiling2017-01-281-1/+1
| | | | | | |
| * | | | | | fix duplicate data-toggle attributeMike Greiling2017-01-281-2/+0
| | | | | | |
| * | | | | | update rake tasksMike Greiling2017-01-282-2/+2
| | | | | | |
| * | | | | | fix frontend testsMike Greiling2017-01-282-10/+21
| | | | | | |
| * | | | | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-2859-135/+651
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | | | | | remove sprockets-es6 and execjs dependenciesMike Greiling2017-01-282-10/+0
| | | | | | | |
| * | | | | | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-271135-4777/+11247
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | | | | | | Use webpack_port file if it existsPhil Hughes2017-01-192-1/+12
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-18215-710/+3716
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 'master' into go-go-gadget-webpackPhil Hughes2017-01-1759-510/+659
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Remove trailing whitespace
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-1537-1385/+1524
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (24 commits) Allow to use + symbol in filenames Use string for class_name option for lazy autoload class change how pagination component is loaded revise sortable_name test formatting fix pagination component handling different header styles from different server proxies Improve disabled state select Fix Rubocop offense in build specs Add Changelog for commit links fix on pipelines page Remove empty build spec file from invalid location Merge build specs into file that has valid location Fixed spacing of labels in issuable row on milestone#show Update commit entity to point to valid commit page Allow to use ENV variables in redis config Check for env[Grape::Env::GRAPE_ROUTING_ARGS] instead of endpoint.route Mutate the attribute instead of issuing a write operation to the DB Remove useless permission checks in Gitlab::Checks::ChangeAccess Fix broken link in docs prefer unit test on model over view test rename sort method add CHANGELOG.md entry for !8277 ...
| * | | | | | | | | | | | optimize gitlab ci to only run npm install onceMike Greiling2017-01-151-3/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | add dependency license approvalsMike Greiling2017-01-141-10/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7288#note_21415733
| * | | | | | | | | | | | fix missing components in cycle_analytics_bundleMike Greiling2017-01-141-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | fix requireAll within filtered search bundleMike Greiling2017-01-131-8/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | rewrite test which relied on teaspoon quirkMike Greiling2017-01-131-2/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | more post-merge fixesMike Greiling2017-01-139-26/+24
| | | | | | | | | | | | |
| * | | | | | | | | | | | Added gzip compressionPhil Hughes2017-01-132-1/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | add phantomJS to karma configMike Greiling2017-01-132-0/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | phantomJS requires "use strict" for polyfill to properly workMike Greiling2017-01-131-1/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | phantomJS doesn't allow us to spyOn history.replaceStateMike Greiling2017-01-137-14/+40
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into go-go-gadget-webpackPhil Hughes2017-01-13369-2171/+10065
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | remove teaspoon-specific testMike Greiling2017-01-101-3/+3
| | | | | | | | | | | | | |