summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* changes in msgid in synchronization gitlab.pot黄涛2017-07-147-23/+23
|
* Merge branch 'dm-merge-request-creation-error' into 'master'Stan Hu2017-07-142-7/+32
|\ | | | | | | | | | | | | Make sure MergeRequest commit methods work when either compare_commits or merge_request_diff is set Closes #35077 See merge request !12856
| * Make sure MergeRequest commit methods work when either compare_commits or ↵dm-merge-request-creation-errorDouwe Maan2017-07-132-7/+32
| | | | | | | | merge_request_diff is set
* | Merge branch 'artifacts-download-dropdown-menu-is-too-narrow' into 'master'Clement Ho2017-07-132-1/+6
|\ \ | | | | | | | | | | | | | | | | | | Increase width of dropdown menus Closes #34989 See merge request !12809
| * | Increase width of dropdown menus automatically up to 500 pxThomas Wucher2017-07-132-1/+6
| | |
* | | Merge branch '33672_supplement_portuguese_brazil_translation_of_i18n' into ↵Douwe Maan2017-07-132-46/+928
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Supplement Portuguese Brazil translation of Project Page & Repository Page Closes #33672 See merge request !12156
| * | | remove repeat the context of msgstr黄涛2017-07-051-140/+140
| | | |
| * | | Merge branch '33672_supplement_portuguese_brazil_translation_of_i18n' of ↵黄涛2017-06-290-0/+0
| |\ \ \ | | | | | | | | | | | | | | | gitlab.com:htve/gitlab-ce into 33672_supplement_portuguese_brazil_translation_of_i18n
| | * | | Repair the wrong deletion of the author黄涛2017-06-281-0/+2
| | | | |
| | * | | Merge branch '33672_supplement_portuguese_brazil_translation_of_i18n' of ↵黄涛2017-06-280-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | gitlab.com:htve/gitlab-ce into 33672_supplement_portuguese_brazil_translation_of_i18n
| | | * | | Delete JSON files generated from PO files黄涛2017-06-281-1/+0
| | | | | |
| | | * | | rebase to master黄涛2017-06-280-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Merge branch '33672_supplement_portuguese_brazil_translation_of_i18n' of gitlab.com:htve/gitlab-ce into 33672_supplement_portuguese_brazil_translation_of_i18n
| | | | * | | revise changelog黄涛2017-06-141-1/+1
| | | | | | |
| | | | * | | add changelog of supplement portuguese brazil translation黄涛2017-06-141-0/+4
| | | | | | |
| | | | * | | supplement portuguese brazil translation黄涛2017-06-142-69/+946
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #33672
| | | * | | | supplement portuguese brazil translation黄涛2017-06-283-64/+947
| | | |/ / / | | | | | | | | | | | | | | | | | | Fix #33672
| | * | | | supplement portuguese brazil translation黄涛2017-06-282-64/+944
| | | | | | | | | | | | | | | | | | | | | | | | Fix #33672
| * | | | | Repair the wrong deletion of the author黄涛2017-06-291-0/+2
| | | | | |
| * | | | | supplement portuguese brazil translation黄涛2017-06-291-84/+83
| | | | | | | | | | | | | | | | | | | | | | | | Fix #33672
| * | | | | revise changelog黄涛2017-06-291-1/+1
| | | | | |
| * | | | | add changelog of supplement portuguese brazil translation黄涛2017-06-291-0/+4
| | | | | |
| * | | | | supplement portuguese brazil translation黄涛2017-06-291-68/+945
| | | | | | | | | | | | | | | | | | | | | | | | Fix #33672
* | | | | | Merge branch 'reload-new-navigation-option-change' into 'master'Filipa Lacerda2017-07-131-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reload page after changing navigation preference Closes #34968 See merge request !12833
| * | | | | | Reload page after changing navigation preferencereload-new-navigation-option-changePhil Hughes2017-07-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #34968
* | | | | | | Merge branch 'note-on-mysql-for-db-seed' into 'master'Rémy Coutable2017-07-131-0/+50
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more notes about developer seeds See merge request !12836
| * | | | | | | Add more notes about developer seedsLin Jen-Shin (godfat)2017-07-131-0/+50
|/ / / / / / /
* | | | | | | Merge branch 'backport-mr-create-service-changes' into 'master'Grzegorz Bizon2017-07-131-2/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport MR create service changes from EE See merge request !12808
| * | | | | | | Backport MR create service changes from EEbackport-mr-create-service-changesSean McGivern2017-07-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In EE, the `filter_params` method needs the MR to already have its `target_project` assigned.
* | | | | | | | Merge branch 'fix-issue-tracker-spec' into 'master'Rémy Coutable2017-07-131-18/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent GitLab issue tracker spec from failing later specs Closes #35042 See merge request !12835
| * | | | | | | | 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 specs See merge request !12832
| * | | | | | | | | Enable all feature flags by default in specsbvl-enable-features-in-testBob Van Landuyt2017-07-135-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise some features would go untested in non-specific contexts I did need to disable the `gitlab_git_diff_size_limit_increase`-feature in some specs since we depend on diffs being expandable while the file we are testing on is smaller than the increased limit.
* | | | | | | | | | Merge branch '34598-more-metrics-info-should-go-to-gitlab-docs' into 'master'Filipa Lacerda2017-07-131-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix links to documentation describing the Prometheus service and its specifics. Closes #34598 See merge request !12714
| * | | | | | | | | | Mor info about prometheus service configuration, and fixing problems with ↵34598-more-metrics-info-should-go-to-gitlab-docsPawel Chojnacki2017-07-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | missing labels
* | | | | | | | | | | Merge branch '34835-environment-truncate-job' into 'master'Filipa Lacerda2017-07-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Truncate job on environment view Closes #34835 See merge request !12818
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitaly notes to Gitlab::Git, delete diff options See merge request !12814
| * | | | | | | | | | | 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 dropdown Closes #35036 See merge request !12831
| * | | | | | | | | | | 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 toggle See merge request !12796
| * | | | | | | | | | Fix wording of nav togglenavigation-toggleAnnabel Dunstone Gray2017-07-122-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch ↵Robert Speicher2017-07-133-15/+89
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34780-restricted-visibility-levels-in-admin-application-settings-looks-off' into 'master' Fix wrong helper used for adding context for translations. Closes #34780 See merge request !12731
| * | | | | | | | | | | Fix wrong helper used for adding context for translations.34780-restricted-visibility-levels-in-admin-application-settings-looks-offRuben Davila2017-07-123-15/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally some missing translations were added
* | | | | | | | | | | | Merge branch 'enable-scss-lint-declaration-order' into 'master'Clement Ho2017-07-1213-23/+29
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable DeclarationOrder in scss-lint See merge request !12805
| * | | | | | | | | | | | 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-lint See merge request !12815
| * | | | | | | | | | | | | 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.1 Closes gitlab-shell#92 See merge request !12817