Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Prevent GitLab issue tracker spec from failing later specsfix-issue-tracker-spec | Sean McGivern | 2017-07-13 | 1 | -18/+9 |
* | Merge branch '35036-commit-page-dropdown' into 'master' | Phil Hughes | 2017-07-13 | 1 | -1/+1 |
|\ | |||||
| * | Fix i18n string in commit page options dropdown35036-commit-page-dropdown | Balasankar C | 2017-07-13 | 1 | -1/+1 |
* | | Merge branch 'navigation-toggle' into 'master' | Phil Hughes | 2017-07-13 | 2 | -2/+2 |
|\ \ | |/ |/| | |||||
| * | Fix wording of nav togglenavigation-toggle | Annabel Dunstone Gray | 2017-07-12 | 2 | -2/+2 |
* | | Merge branch '34780-restricted-visibility-levels-in-admin-application-setting... | Robert Speicher | 2017-07-13 | 3 | -15/+89 |
|\ \ | |||||
| * | | Fix wrong helper used for adding context for translations.34780-restricted-visibility-levels-in-admin-application-settings-looks-off | Ruben Davila | 2017-07-12 | 3 | -15/+89 |
* | | | Merge branch 'enable-scss-lint-declaration-order' into 'master' | Clement Ho | 2017-07-12 | 13 | -23/+29 |
|\ \ \ | |||||
| * | | | Enable DeclarationOrder in scss-lint | Takuya Noguchi | 2017-07-12 | 13 | -23/+29 |
* | | | | Merge branch 'enable-scss-lint-bang-format' into 'master' | Clement Ho | 2017-07-12 | 7 | -9/+13 |
|\ \ \ \ | |||||
| * | | | | Enable BangFormat in scss-lint | Takuya Noguchi | 2017-07-12 | 7 | -9/+13 |
| |/ / / | |||||
* | | | | Merge branch 'gitlab-shell-5-3-1' into 'master' | Stan Hu | 2017-07-12 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Update gitlab-shell to v5.3.1 | Sean McGivern | 2017-07-12 | 1 | -1/+1 |
* | | | | | Merge branch 'migrate-workhorse-send-blob-to-gitaly' into 'master' | Robert Speicher | 2017-07-12 | 3 | -5/+61 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 | 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 | Filipa Lacerda | 2017-07-12 | 28 | -170/+327 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'bugfix-htmlenc' into 'master' | Sean McGivern | 2017-07-12 | 3 | -1/+17 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Stop sanitizing user 'name' when inserting into db | Nathan Neulinger | 2017-07-12 | 3 | -1/+17 |
* | | | | | | | | | | Merge branch '34792_add_traditional_chinese_in_taiwan_translations_of_pipelin... | Rémy Coutable | 2017-07-12 | 1 | -4/+58 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 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 | 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 | Rémy Coutable | 2017-07-12 | 5 | -6/+53 |
* | | | | | | | | | | Merge branch '34978-remove-public-ci-favicon-ico' into 'master' | Rémy Coutable | 2017-07-12 | 2 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 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 | 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.0update-gitaly-0-17-0 | Alejandro Rodríguez | 2017-07-11 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'new-nav-preferences-image' into 'master' | Filipa Lacerda | 2017-07-12 | 1 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | |