summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Change merge_request_diff_cache_service_spec.rbdz-cache-namespace-methodsDmitriy Zaporozhets2017-02-022-5/+8
| | | | | | | | | Don't stub Rails.cache.write in tests. For example introducing cache for Project#full_path breaks merge_request_diff_cache_service_spec.rb because latest one expected that no other code will use Rails.cache.write during test. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Cache full_name and full_path methods for both Project and NamespaceDmitriy Zaporozhets2017-02-018-47/+206
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add CacheMethod concernDmitriy Zaporozhets2017-01-302-0/+109
| | | | | | | | | | | | Based on caching code from Repository. Since repository has some specific cases and in future will be changed even more I decided to create separate class specifically for AR model needs * cache return value to the instance variable and cache store * method to clear cached value * allow access to uncached version of method Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch '8-16-0-release-date' into 'master' Rémy Coutable2017-01-301-1/+1
|\ | | | | | | | | Fix 8.16.0 release date. See merge request !8881
| * Fix 8.16.0 release date. 8-16-0-release-dateAdam Niedzielski2017-01-301-1/+1
| | | | | | It was already released, we do not have to wait until February!
* | Merge branch ↵Fatih Acet2017-01-3013-51/+76
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | '20852-getting-started-project-better-blank-state-for-labels-view' into 'master' Labels empty state Closes #24457 and #20852 See merge request !7443
| * | Added labels empty state and priority label empty state20852-getting-started-project-better-blank-state-for-labels-viewLuke "Jared" Bennett2017-01-3013-51/+76
| | | | | | | | | | | | | | | | | | Fixed delete labels not working Review changes
* | | Merge branch 'dz-nested-groups-improvements-2' into 'master' Dmitriy Zaporozhets2017-01-3012-9/+64
|\ \ \ | |_|/ |/| | | | | | | | Nested groups improvements pt 2 See merge request !8827
| * | Improve search within group logicDmitriy Zaporozhets2017-01-303-2/+10
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add changelog item about new attributes in group apiDmitriy Zaporozhets2017-01-301-0/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Update group api doc with full_name and full_path attributesDmitriy Zaporozhets2017-01-302-1/+15
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add tests for nested groups in search service and search helperDmitriy Zaporozhets2017-01-302-0/+24
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Include nested groups items into search resultsDmitriy Zaporozhets2017-01-301-1/+5
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Use full group name/path in UI dropdownsDmitriy Zaporozhets2017-01-304-7/+8
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'fix/import-encrypt-atts' into 'master' Douwe Maan2017-01-3011-14/+70
|\ \ | | | | | | | | | | | | | | | | | | Ignore encrypted attributes in Import/Export Closes #24458 See merge request !8739
| * | fix spec failurefix/import-encrypt-attsJames Lopez2017-01-301-1/+1
| | |
| * | fix typo in specJames Lopez2017-01-301-1/+1
| | |
| * | programmatically remove encrypted attributes. Added relevant spec.James Lopez2017-01-303-2/+22
| | |
| * | rename method and added note to export file spec about new encrypted attributesJames Lopez2017-01-302-2/+5
| | |
| * | fix spec failuresJames Lopez2017-01-302-2/+2
| | |
| * | fix typoJames Lopez2017-01-302-3/+3
| | |
| * | Ignore encrypted attributes in Import/ExportJames Lopez2017-01-308-12/+45
| | | | | | | | | | | | | | | | | | | | | * Regenerates tokens for all models that have them * Remove variables, since they are basically just storing encrypted data * Bumped version up to 0.1.6 * Updated related docs
* | | Merge branch 'zj-slow-service-fetch' into 'master' Yorick Peterse2017-01-302-3/+14
|\ \ \ | |_|/ |/| | | | | | | | Improve performance of triggered chat commands See merge request !8876
| * | Improve performance of triggered chat commandszj-slow-service-fetchZ.J. van de Weg2017-01-302-3/+14
| |/ | | | | | | | | | | | | | | | | | | | | When the trigger endpoint is called, it has to find the right service for the given project. However, the old implementation did much more. For example, it build a list of the missing services on this project. This whole process took about 750ms _each time_. The current implementation is expected to perform 10x better, as it only searches in the current projects services. Given the service has to be configured anyway, this can be done.
* | Merge branch 'document-how-to-vue' into 'master' Fatih Acet2017-01-302-18/+92
|\ \ | |/ |/| | | | | Document how to vue See merge request !8866
| * First draft of "how to use vue.js in gitlab" documentationFilipa Lacerda2017-01-302-18/+92
| | | | | | | | | | | | | | | | | | | | | | | | Puts back trailing whitespace Changes after review Changes after review Adds Changelog entry Follow documentation styleguide
* | Merge branch 'patch-11' into 'master' Rémy Coutable2017-01-301-4/+4
|\ \ | | | | | | | | | | | | Fix the documentation to use the correct variable in a code example See merge request !8585
| * | Use consistent URLs for review apps in the docsVincent Tunru2017-01-271-4/+4
| | | | | | | | | | | | | | | | | | It said `<slug>.review.example.com` at one place, `review-<slug>.example.com` elsewhere, and no mention of `review` at all in other places. We now leave out `review` everywhere.
| * | Actually use `$CI_ENVIRONMENT_SLUG` in the `environment:url`Vincent2017-01-151-1/+1
| | |
* | | Merge branch '27047-8-16-cannot-login-with-2fa' into 'master' Fatih Acet2017-01-301-12/+12
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Resolve "Cannot login with 2fa" Closes #27047 See merge request !8730
| * | Initial fix proposal for u2f not working27047-8-16-cannot-login-with-2faLuke "Jared" Bennett2017-01-261-12/+12
| | |
* | | Merge branch '23634-remove-project-grouping' into 'master' Sean McGivern2017-01-3027-96/+235
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Don't group issue, merge request and TODO lists by project Closes #23634 See merge request !8519
| * | | Do not rely on style class for changing DOM state on "Mark all as done"23634-remove-project-groupingOswaldo Ferreira2017-01-272-37/+38
| | | |
| * | | Remove unnecessary extra margin on issues, mr and todo pagesOswaldo Ferreira2017-01-275-47/+40
| | | |
| * | | Remove border from issues, todos and MR pagesOswaldo Ferreira2017-01-274-3/+7
| | | |
| * | | Remove bold weight from TODOs action name fontOswaldo Ferreira2017-01-272-1/+8
| | | |
| * | | Move issuable reference display to a helper methodOswaldo Ferreira2017-01-274-4/+46
| | | |
| * | | Add commment to Issue, Project and MergeRequest #to_referenceOswaldo Ferreira2017-01-273-0/+3
| | | |
| * | | Change argument name assuming its always a ProjectOswaldo Ferreira2017-01-271-2/+2
| | | |
| * | | Present TODO's list without grouping by projectOswaldo Ferreira2017-01-276-33/+38
| | | |
| * | | Present group and dashboard MR list without grouping by projectOswaldo Ferreira2017-01-278-44/+32
| | | |
| * | | Refactor Project#to_reference and make full_path a keyword argumentBerna Castro2017-01-276-42/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor overall code and fix failing specs Fix Project#to_reference Fix wrong spaces and update changelog Refactor #to_reference for Project & Issue Fix and improves Project#to_reference
| * | | Fix and add specs for Project#to_referenceBerna Castro2017-01-271-3/+9
| | | |
| * | | Fix and add specs for Issue#to_referenceBerna Castro2017-01-271-1/+10
| | | |
| * | | Refactor code when rendering a collection of issuesBerna Castro2017-01-271-4/+1
| | | |
| * | | Add the group path to the issue ID if applicableBerna Castro2017-01-272-5/+13
| | | |
| * | | Don't group projects on dashboard#issuesBerna Castro2017-01-271-11/+5
| | | |
* | | | Merge branch 'patch-8' into 'master'Rémy Coutable2017-01-301-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | add information that docker registry storage needs to be accessible for docker clients See merge request !8179
| * | | | add information that docker registry storage needs to be accessible for ↵Elan Ruusamäe2017-01-271-0/+4
| | | | | | | | | | | | | | | | | | | | docker clients
* | | | | Merge branch 'mr-widget-initial-state-tests' into 'master' Rémy Coutable2017-01-301-0/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added test for initial merge request widget state See merge request !8738