summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix Counter Cache not being disabled for acts-on-taggablefix-counter-cache-for-acts-as-taggableKamil Trzcinski2017-05-262-0/+8
|
* Merge branch 'zj-sort-env-folders' into 'master'Kamil Trzciński2017-05-233-7/+17
|\ | | | | | | | | | | | | Sort environments folders when opening them Closes #30814 See merge request !11436
| * Improve test wordingZ.J. van de Weg2017-05-231-7/+7
| |
| * Make sorting difference clearerZeger-Jan van de Weg2017-05-191-4/+4
| |
| * Sort environments folders when opening themZ.J. van de Weg2017-05-173-0/+10
| | | | | | | | Fixes gitlab-org/gitlab-ce#30814
* | Merge branch 'zj-ps-update-gitlab-yml' into 'master'Grzegorz Bizon2017-05-231-1/+1
|\ \ | | | | | | | | | | | | Update gitlab.yml with default setting See merge request !11614
| * | Update gitlab.yml with default settingzj-ps-update-gitlab-ymlZ.J. van de Weg2017-05-221-1/+1
| | |
* | | Merge branch 'fix-retried-for-postgres' into 'master'Kushal Pandya2017-05-234-7/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix migrations for older PostgreSQL versions Closes #32721 See merge request !11620
| * | | Fix migrations for older PostgreSQL versionsfix-retried-for-postgresKamil Trzcinski2017-05-234-7/+13
| | | | | | | | | | | | | | | | | | | | - Do not care about error when creating index on PostgreSQL - Test against PostgreSQL 9.2
* | | | Merge branch 'prevent-project-transfer' into 'master'Douwe Maan2017-05-237-9/+74
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Prevent project transfer if a new group is not selected Closes #25455 See merge request !11214
| * | | Refactored transfer_service #execute actionprevent-project-transferJose Ivan Vargas2017-05-221-10/+6
| | | |
| * | | minor adjustments to the specsJose Ivan Vargas2017-05-223-12/+11
| | | |
| * | | Renamed some messages and refactored the project_edit class to a functionJose Ivan Vargas2017-05-226-21/+14
| | | |
| * | | Prevent project transfer if a new group is not selectedJose Ivan Vargas2017-05-227-5/+82
| | | |
* | | | Merge branch 'handle-transient-mr-query-count-spec' into 'master'Douwe Maan2017-05-221-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Handle transient MR query count spec See merge request !11571
| * | | | Handle transient MR query count spechandle-transient-mr-query-count-specOswaldo Ferreira2017-05-191-1/+1
| | | | |
* | | | | Merge branch '32418-make-link-to-self-less-obvious' into 'master'Fatih Acet2017-05-225-8/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change links to issuable meta to black Closes #32418 See merge request !11505
| * | | | | Fix specs32418-make-link-to-self-less-obviousAnnabel Dunstone Gray2017-05-192-2/+2
| | | | | |
| * | | | | Change links to issuable meta to blackAnnabel Dunstone Gray2017-05-193-6/+6
| | | | | |
* | | | | | Merge branch '32486-fix-note-emoji-placement' into 'master'Annabel Dunstone Gray2017-05-222-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32486 Fix placement of note emoji on hover Closes #32486 See merge request !11605
| * | | | | | 32486 Fix placement of note emoji on hover32486-fix-note-emoji-placementtauriedavis2017-05-222-4/+4
| | | | | | |
* | | | | | | Merge branch '32657-fix-mr-widget-styles' into 'master'Fatih Acet2017-05-222-7/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MR widget styling fixes Closes #32657 See merge request !11591
| * | | | | | | MR widget styling fixes32657-fix-mr-widget-styleskushalpandya2017-05-222-7/+15
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '32631-issue-emoji-wrap' into 'master'Clement Ho2017-05-223-4/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spacing of issue emojis Closes #32631 See merge request !11567
| * | | | | | | Fix spacing of issue emojis32631-issue-emoji-wrapAnnabel Dunstone Gray2017-05-193-4/+8
| | | | | | | |
* | | | | | | | Merge branch 'ce#32623-browser-tooltip-commits-branch-list' into 'master'Annabel Dunstone Gray2017-05-222-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32623 Change order of commits ahead and behind on divergence graph for branch list Closes #32623 See merge request !11559
| * | | | | | | | 32623 Change order of commits ahead and behind on divergence graph for ↵ce#32623-browser-tooltip-commits-branch-listtauriedavis2017-05-192-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | branch list
* | | | | | | | | Merge branch 'fix-weird-jquery-data-attribute-caching-issue-in-notes' into ↵Phil Hughes2017-05-221-2/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix jQuery data attribute caching issue causing expanding issues Closes #32705 See merge request !11609
| * | | | | | | | Fix jQuery data attribute caching issue casuing expanding issuesEric Eastwood2017-05-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Command | Result $link.data('lineType') | '' $link.data('line-type') | '' $link.attr('data-line-type') | 'new' $link[0].dataset.lineType | 'new'
* | | | | | | | | Merge branch 'reduce-unnecessary-redundancy' into 'master'Sean Packham (GitLab)2017-05-221-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removes unnecessary redundacy in usage ping doc See merge request !11604
| * | | | | | | | | removes unnecessary redundacy in usage ping docreduce-unnecessary-redundancyJob van der Voort2017-05-221-1/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix/git_http_request_without_password' into 'master'Douwe Maan2017-05-222-1/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid resource intensive login checks if password is not provided Closes #32598 See merge request !11537
| * | | | | | | | | Avoid resource intensive login checks if password is not providedHoratiu Eugen Vlad2017-05-212-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #32598
* | | | | | | | | | Merge branch 'notification-settings-doc' into 'master'Marcia Ramos2017-05-224-3/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add project and group notification settings info See merge request !11507
| * | | | | | | | | | Add project and group notification settings infonotification-settings-docCindy Pallares2017-05-194-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notification settings are described, but aren't mentioned where they are or where to change them.
* | | | | | | | | | | Merge branch '32570-project-activity-tab-border' into 'master'Annabel Dunstone Gray2017-05-224-4/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32570 Fix border-bottom for project activity tab Closes #32570 See merge request !11568
| * | | | | | | | | | | 32570 Fix border-bottom for project activity tab32570-project-activity-tab-bordertauriedavis2017-05-194-4/+8
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'update-coding-translation' into 'master'Douwe Maan2017-05-222-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change translation for 'coding' by 'desarrollo' for spanish See merge request !11580
| * | | | | | | | | | | Change translation for 'coding' by 'desarrollo' for Spanishupdate-coding-translationRuben Davila2017-05-202-3/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'adopt-es-module-syntax' into 'master'Filipa Lacerda2017-05-22101-315/+290
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adopt ES module syntax See merge request !9567
| * | | | | | | | | | | | fix eslint violationadopt-es-module-syntaxMike Greiling2017-05-181-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | update linter to catch uses of commonjs syntaxMike Greiling2017-05-181-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | refactor instances of CJS module.exports to ES module syntaxMike Greiling2017-05-167-17/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | fix eslint failuresMike Greiling2017-05-165-6/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | fix implicit window object reference within gl_form_specMike Greiling2017-05-161-6/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | update test_bundle to use ES module syntaxMike Greiling2017-05-161-6/+8
| | | | | | | | | | | | |
| * | | | | | | | | | | | update frontend specs to use ES module syntaxMike Greiling2017-05-1651-131/+129
| | | | | | | | | | | | |
| * | | | | | | | | | | | update dispatcher.js to use ES module syntaxMike Greiling2017-05-161-3/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | update remaining uses of CJS syntax to ES module syntaxMike Greiling2017-05-1620-59/+64
| | | | | | | | | | | | |
| * | | | | | | | | | | | update shortcuts scripts to use ES module syntaxMike Greiling2017-05-165-7/+7
| | | | | | | | | | | | |