summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Always return the translated level name.35034-fix-unstranslated-visibility-levelsRuben Davila2017-07-133-5/+11
* Merge branch 'fix-issue-tracker-spec' into 'master'Rémy Coutable2017-07-131-18/+9
|\
| * Prevent GitLab issue tracker spec from failing later specsfix-issue-tracker-specSean McGivern2017-07-131-18/+9
* | Merge branch 'bvl-enable-features-in-test' into 'master'Rémy Coutable2017-07-135-2/+22
|\ \
| * | Enable all feature flags by default in specsbvl-enable-features-in-testBob Van Landuyt2017-07-135-2/+22
* | | Merge branch '34598-more-metrics-info-should-go-to-gitlab-docs' into 'master'Filipa Lacerda2017-07-131-2/+2
|\ \ \
| * | | Mor info about prometheus service configuration, and fixing problems with mis...34598-more-metrics-info-should-go-to-gitlab-docsPawel Chojnacki2017-07-071-2/+2
* | | | Merge branch '34835-environment-truncate-job' into 'master'Filipa Lacerda2017-07-131-2/+2
|\ \ \ \
| * | | | Truncate job on environment view34835-environment-truncate-jobAnnabel Dunstone Gray2017-07-121-2/+2
* | | | | Merge branch 'lib-git-gitaly' into 'master'Sean McGivern2017-07-1323-101/+75
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Try to eliminate unused diff optionsJacob Vosmaer2017-07-122-101/+9
| * | | | Add Gitaly notes and annotations to Gitlab::GitJacob Vosmaer2017-07-1221-0/+66
* | | | | 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
| | |_|/ / / / / / / / | |/| | | | | | | | |