summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Prevent GitLab issue tracker spec from failing later specsfix-issue-tracker-specSean McGivern2017-07-131-18/+9
* Merge branch '35036-commit-page-dropdown' into 'master'Phil Hughes2017-07-131-1/+1
|\
| * Fix i18n string in commit page options dropdown35036-commit-page-dropdownBalasankar C2017-07-131-1/+1
* | Merge branch 'navigation-toggle' into 'master'Phil Hughes2017-07-132-2/+2
|\ \ | |/ |/|
| * Fix wording of nav togglenavigation-toggleAnnabel Dunstone Gray2017-07-122-2/+2
* | Merge branch '34780-restricted-visibility-levels-in-admin-application-setting...Robert Speicher2017-07-133-15/+89
|\ \
| * | Fix wrong helper used for adding context for translations.34780-restricted-visibility-levels-in-admin-application-settings-looks-offRuben Davila2017-07-123-15/+89
* | | Merge branch 'enable-scss-lint-declaration-order' into 'master'Clement Ho2017-07-1213-23/+29
|\ \ \
| * | | Enable DeclarationOrder in scss-lintTakuya Noguchi2017-07-1213-23/+29
* | | | Merge branch 'enable-scss-lint-bang-format' into 'master'Clement Ho2017-07-127-9/+13
|\ \ \ \
| * | | | Enable BangFormat in scss-lintTakuya Noguchi2017-07-127-9/+13
| |/ / /
* | | | Merge branch 'gitlab-shell-5-3-1' into 'master'Stan Hu2017-07-121-1/+1
|\ \ \ \
| * | | | Update gitlab-shell to v5.3.1Sean McGivern2017-07-121-1/+1
* | | | | Merge branch 'migrate-workhorse-send-blob-to-gitaly' into 'master'Robert Speicher2017-07-123-5/+61
|\ \ \ \ \
| * | | | | Migrate Workhorse SendBlob to GitalyAhmad Sherif2017-07-113-5/+61
* | | | | | Merge branch 'mr-branch-link-use-tree' into 'master'Robert Speicher2017-07-1210-9/+65
|\ \ \ \ \ \
| * | | | | | Fix spec name grammermr-branch-link-use-treeClement Ho2017-07-121-3/+3
| * | | | | | Add namespace for BlobClement Ho2017-07-111-1/+1
| * | | | | | Make commits behind text a link to the target branch commits pageClement Ho2017-07-118-7/+46
| * | | | | | Convert target branch link to use treeClement Ho2017-07-116-10/+10
| * | | | | | MR branch link now links to tree instead of commitsClement Ho2017-07-103-1/+18
* | | | | | | Merge branch 'backport-ee-2405' into 'master'Douwe Maan2017-07-121-3/+7
|\ \ \ \ \ \ \
| * | | | | | | Extract the finder portion of ldap_person so it can be overridden in EENick Thomas2017-07-121-3/+7
* | | | | | | | Merge branch '34797_add_italian_translations_of_pipeline_charts' into 'master'Douwe Maan2017-07-121-8/+65
|\ \ \ \ \ \ \ \
| * | | | | | | | merge Italian translation part.po to gitlab.po黄涛2017-07-122-79/+65
| * | | | | | | | Add it translation difference of Pipeline Charts黄涛2017-07-071-0/+71
* | | | | | | | | Deep linkSid Sijbrandij2017-07-121-1/+1
* | | | | | | | | Merge branch 'enable-scss-lint-unnecessary-parent-reference' into 'master'Clement Ho2017-07-1210-13/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Enable UnnecessaryParentReference in scss-lintTakuya Noguchi2017-07-1210-13/+17
* | | | | | | | | | Merge branch '34534-update-vue-resource' into 'master'Phil Hughes2017-07-1228-170/+327
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Update vue-resourceFilipa Lacerda2017-07-1228-170/+327
|/ / / / / / / / /
* | | | | | | | | Merge branch 'bugfix-htmlenc' into 'master'Sean McGivern2017-07-123-1/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Stop sanitizing user 'name' when inserting into dbNathan Neulinger2017-07-123-1/+17
* | | | | | | | | | Merge branch '34792_add_traditional_chinese_in_taiwan_translations_of_pipelin...Rémy Coutable2017-07-121-4/+58
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Synchronous zanata in zh_TW translation黄涛2017-07-121-5/+5
| * | | | | | | | | | optimize translation content based on discussion黄涛2017-07-111-5/+5
| * | | | | | | | | | merge pipeline charts translate to gitlab.po黄涛2017-07-112-72/+56
| * | | | | | | | | | optimize translation based on discussion黄涛2017-07-101-7/+7
| * | | | | | | | | | Add zh-TW translation difference of Pipeline Charts黄涛2017-07-071-0/+70
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'replace_spinach_spec_browse_files' into 'master'Rémy Coutable2017-07-1213-380/+821
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Replace 'browse_files.feature' spinach test with an rspec analogblackst0ne2017-07-1213-380/+821
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '34325-reinstate-is_admin-for-user-api' into 'master'Sean McGivern2017-07-125-6/+53
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Return `is_admin` attribute in the GET /user endpoint for adminsRémy Coutable2017-07-125-6/+53
* | | | | | | | | | Merge branch '34978-remove-public-ci-favicon-ico' into 'master'Rémy Coutable2017-07-122-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove public/ci/favicon.icoTakuya Noguchi2017-07-122-0/+4
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '34858-bump-scss-lint-to-0-54-0' into 'master'Rémy Coutable2017-07-124-5/+13
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Bump scss-lint to 0.54.0Takuya Noguchi2017-07-084-5/+13
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'update-gitaly-0-17-0' into 'master'Rémy Coutable2017-07-121-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use Gitaly server v0.17.0update-gitaly-0-17-0Alejandro Rodríguez2017-07-111-1/+1
* | | | | | | | | | Merge branch 'new-nav-preferences-image' into 'master'Filipa Lacerda2017-07-121-0/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |