summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
| * | | | | Added test for initial merge request widget statemr-widget-initial-state-testsPhil Hughes2017-01-261-0/+34
| | | | | |
* | | | | | Merge branch 'improve-ci-example-php-doc' into 'master' Rémy Coutable2017-01-302-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed composer installer script in the CI PHP example doc See merge request !8817
| * | | | | | Changed composer installer script in the CI PHP example docimprove-ci-example-php-docJeffrey Cafferata2017-01-262-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script will check some php.ini settings warn you if they are set incorrectly, and then download the latest composer.phar in the current directory. These lines will, in order: - Download the installer SHA-384 to the current directory - Download the installer to the current directory - Verify the installer SHA-384 which you can also cross-check https://composer.github.io/pubkeys.html - Run the installer - Remove the installer & the installer SHA-384 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'hardcode-title-system-note' into 'master' Rémy Coutable2017-01-302-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure autogenerated title does not cause failing spec Closes #26933 See merge request !8693
| * | | | | | | Ensure autogenerated title does not cause failing specbrian m. carlson2017-01-272-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hardcode the title into the object in the spec, so that an autogenerated title (such as one starting with "O") does not cause the spec to fail.
* | | | | | | | Merge branch 'ux-guide-minor-updates' into 'master' Achilleas Pipinellis2017-01-292-3/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UX Guide: minor updates See merge request !8862
| * | | | | | | | [ci skip] UX Guide Add general term section to copyux-guide-minor-updatesAllison Whilden2017-01-282-3/+9
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] UX guide: clean up term tables in copy [ci skip] UX guide: update dropdown max height for multiline items
* | | | | | | | Merge branch 'relative-url-assets' into 'master' Jacob Schatz2017-01-2713-19/+88
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove hard-coded absolute URLs from all frontend assets See merge request !8831
| * | | | | | | | add CHAGELOG.md entry for !8831Mike Greiling2017-01-271-0/+4
| | | | | | | | |
| * | | | | | | | remove assets:compile step from relative_url docsMike Greiling2017-01-271-8/+0
| | | | | | | | |
| * | | | | | | | update scripts and docs to reference the newly namespaced rake taskrelative-url-assetsMike Greiling2017-01-279-11/+11
| | | | | | | | |
| * | | | | | | | namespace assets rake tasks to gitlab:assets:*Mike Greiling2017-01-272-29/+47
| | | | | | | | |
| * | | | | | | | correct gzip files if they exist as wellMike Greiling2017-01-271-0/+19
| | | | | | | | |