Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove extra space on profile page if new nav enabledremove-extra-space-on-profile | Annabel Dunstone Gray | 2017-07-12 | 2 | -2/+6 |
| | |||||
* | Merge branch 'gitlab-shell-5-3-1' into 'master' | Stan Hu | 2017-07-12 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Update gitlab-shell to v5.3.1 Closes gitlab-shell#92 See merge request !12817 | ||||
| * | Update gitlab-shell to v5.3.1 | Sean McGivern | 2017-07-12 | 1 | -1/+1 |
| | | | | | | | | | | This fixes an issue where the merge request URLs for a push returned an error, which made gitlab-shell show a stacktrace to the user. | ||||
* | | Merge branch 'migrate-workhorse-send-blob-to-gitaly' into 'master' | Robert Speicher | 2017-07-12 | 3 | -5/+61 |
|\ \ | | | | | | | | | | | | | | | | | | | Migrate Workhorse SendBlob to Gitaly Closes gitaly#356 See merge request !12313 | ||||
| * | | Migrate Workhorse SendBlob to Gitaly | Ahmad Sherif | 2017-07-11 | 3 | -5/+61 |
| | | | |||||
* | | | Merge branch 'mr-branch-link-use-tree' into 'master' | Robert Speicher | 2017-07-12 | 10 | -9/+65 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | MR branch link now links to tree instead of commits Closes #34243 See merge request !12763 | ||||
| * | | | Fix spec name grammermr-branch-link-use-tree | Clement Ho | 2017-07-12 | 1 | -3/+3 |
| | | | | |||||
| * | | | Add namespace for Blob | Clement Ho | 2017-07-11 | 1 | -1/+1 |
| | | | | |||||
| * | | | Make commits behind text a link to the target branch commits page | Clement Ho | 2017-07-11 | 8 | -7/+46 |
| | | | | |||||
| * | | | Convert target branch link to use tree | Clement Ho | 2017-07-11 | 6 | -10/+10 |
| | | | | |||||
| * | | | MR branch link now links to tree instead of commits | Clement Ho | 2017-07-10 | 3 | -1/+18 |
| | | | | |||||
* | | | | Merge branch 'backport-ee-2405' into 'master' | Douwe Maan | 2017-07-12 | 1 | -3/+7 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Backport "Automatically link Kerberos users and LDAP people" changes to CE See merge request !12807 | ||||
| * | | | | Extract the finder portion of ldap_person so it can be overridden in EE | Nick Thomas | 2017-07-12 | 1 | -3/+7 |
| | | | | | |||||
* | | | | | Merge branch '34797_add_italian_translations_of_pipeline_charts' into 'master' | Douwe Maan | 2017-07-12 | 1 | -8/+65 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Italian translations of Pipeline Charts Closes #34797 See merge request !12700 | ||||
| * | | | | | merge Italian translation part.po to gitlab.po | 黄涛 | 2017-07-12 | 2 | -79/+65 |
| | | | | | | |||||
| * | | | | | Add it translation difference of Pipeline Charts | 黄涛 | 2017-07-07 | 1 | -0/+71 |
| | | | | | | |||||
* | | | | | | Deep link | Sid Sijbrandij | 2017-07-12 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'enable-scss-lint-unnecessary-parent-reference' into 'master' | Clement Ho | 2017-07-12 | 10 | -13/+17 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable UnnecessaryParentReference in scss-lint See merge request !12738 | ||||
| * | | | | | | Enable UnnecessaryParentReference in scss-lint | Takuya Noguchi | 2017-07-12 | 10 | -13/+17 |
| | | | | | | | |||||
* | | | | | | | Merge branch '34534-update-vue-resource' into 'master' | Phil Hughes | 2017-07-12 | 28 | -170/+327 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update vue-resource Closes #34534 See merge request !12658 | ||||
| * | | | | | | Update vue-resource | Filipa Lacerda | 2017-07-12 | 28 | -170/+327 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'bugfix-htmlenc' into 'master' | Sean McGivern | 2017-07-12 | 3 | -1/+17 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decode user/namespace names before display See merge request !10085 | ||||
| * | | | | | | Stop sanitizing user 'name' when inserting into db | Nathan Neulinger | 2017-07-12 | 3 | -1/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add spec tests for encoding | ||||
* | | | | | | | Merge branch ↵ | Rémy Coutable | 2017-07-12 | 1 | -4/+58 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34792_add_traditional_chinese_in_taiwan_translations_of_pipeline_charts' into 'master' Add Traditional Chinese in Taiwan translations of Pipeline Charts Closes #34792 See merge request !12697 | ||||
| * | | | | | | | Synchronous zanata in zh_TW translation | 黄涛 | 2017-07-12 | 1 | -5/+5 |
| | | | | | | | | |||||
| * | | | | | | | optimize translation content based on discussion | 黄涛 | 2017-07-11 | 1 | -5/+5 |
| | | | | | | | | |||||
| * | | | | | | | merge pipeline charts translate to gitlab.po | 黄涛 | 2017-07-11 | 2 | -72/+56 |
| | | | | | | | | |||||
| * | | | | | | | optimize translation based on discussion | 黄涛 | 2017-07-10 | 1 | -7/+7 |
| | | | | | | | | |||||
| * | | | | | | | Add zh-TW translation difference of Pipeline Charts | 黄涛 | 2017-07-07 | 1 | -0/+70 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'replace_spinach_spec_browse_files' into 'master' | Rémy Coutable | 2017-07-12 | 13 | -380/+821 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | Replace 'browse_files.feature' spinach test with an rspec analog See merge request !12251 | ||||
| * | | | | | | Replace 'browse_files.feature' spinach test with an rspec analog | blackst0ne | 2017-07-12 | 13 | -380/+821 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch '34325-reinstate-is_admin-for-user-api' into 'master' | Sean McGivern | 2017-07-12 | 5 | -6/+53 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return `is_admin` attribute in the GET /user endpoint for admins Closes #34325 See merge request !12811 | ||||
| * | | | | | | Return `is_admin` attribute in the GET /user endpoint for admins | Rémy Coutable | 2017-07-12 | 5 | -6/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | | Merge branch '34978-remove-public-ci-favicon-ico' into 'master' | Rémy Coutable | 2017-07-12 | 2 | -0/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove public/ci/favicon.ico Closes #34978 See merge request !12803 | ||||
| * | | | | | | | Remove public/ci/favicon.ico | Takuya Noguchi | 2017-07-12 | 2 | -0/+4 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '34858-bump-scss-lint-to-0-54-0' into 'master' | Rémy Coutable | 2017-07-12 | 4 | -5/+13 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump scss-lint to 0.54.0 Closes #34858 See merge request !12733 | ||||
| * | | | | | | | Bump scss-lint to 0.54.0 | Takuya Noguchi | 2017-07-08 | 4 | -5/+13 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'update-gitaly-0-17-0' into 'master' | Rémy Coutable | 2017-07-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Gitaly server v0.17.0 Closes #34853 See merge request !12802 | ||||
| * | | | | | | | Use Gitaly server v0.17.0update-gitaly-0-17-0 | Alejandro Rodríguez | 2017-07-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/34853 and enables https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1712 | ||||
* | | | | | | | | Merge branch 'new-nav-preferences-image' into 'master' | Filipa Lacerda | 2017-07-12 | 1 | -0/+0 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated new navigation image in preferences Closes #34970 See merge request !12806 | ||||
| * | | | | | | | Updated new navigation image in preferences | Phil Hughes | 2017-07-12 | 1 | -0/+0 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | Closes #34970 | ||||
* | | | | | | | Merge branch 'remove-nprogress-gleaning' into 'master' | Clement Ho | 2017-07-12 | 2 | -6/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove CSS for nprogress removed See merge request !12737 | ||||
| * | | | | | | | Remove CSS for nprogress removed | Takuya Noguchi | 2017-07-12 | 2 | -6/+4 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'enable-scss-lint-import-path' into 'master' | Clement Ho | 2017-07-12 | 4 | -46/+50 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable ImportPath in scss-lint See merge request !12749 | ||||
| * | | | | | | | Enable ImportPath in scss-lint | Takuya Noguchi | 2017-07-12 | 4 | -46/+50 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'enable-scss-lint-property-spelling' into 'master' | Clement Ho | 2017-07-12 | 2 | -1/+5 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable PropertySpelling in scss-lint See merge request !12752 | ||||
| * | | | | | | | Enable PropertySpelling in scss-lint | Takuya Noguchi | 2017-07-12 | 2 | -1/+5 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'enable-scss-lint-space-after-comma' into 'master' | Clement Ho | 2017-07-12 | 7 | -18/+22 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable SpaceAfterComma in scss-lint See merge request !12734 | ||||
| * | | | | | | | Enable SpaceAfterComma in scss-lint | Takuya Noguchi | 2017-07-12 | 7 | -18/+22 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'breadcrumbs-limit-width' into 'master' | Annabel Dunstone Gray | 2017-07-11 | 4 | -1/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added limit-container-width to breadcrumbs container Closes #34573 See merge request !12776 |