Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removed user profile inline JavaScriptuser-inline-scripts | Phil Hughes | 2017-07-13 | 5 | -21/+12 |
| | |||||
* | Merge branch 'fix-issue-tracker-spec' into 'master' | Rémy Coutable | 2017-07-13 | 1 | -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-spec | Sean McGivern | 2017-07-13 | 1 | -18/+9 |
| | | |||||
* | | Merge branch 'bvl-enable-features-in-test' into 'master' | Rémy Coutable | 2017-07-13 | 5 | -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-test | Bob Van Landuyt | 2017-07-13 | 5 | -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 Lacerda | 2017-07-13 | 1 | -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-docs | Pawel Chojnacki | 2017-07-07 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | missing labels | ||||
* | | | | Merge branch '34835-environment-truncate-job' into 'master' | Filipa Lacerda | 2017-07-13 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Truncate job on environment view Closes #34835 See merge request !12818 | ||||
| * | | | | Truncate job on environment view34835-environment-truncate-job | Annabel Dunstone Gray | 2017-07-12 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge branch 'lib-git-gitaly' into 'master' | Sean McGivern | 2017-07-13 | 23 | -101/+75 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | Add Gitaly notes to Gitlab::Git, delete diff options See merge request !12814 | ||||
| * | | | | Try to eliminate unused diff options | Jacob Vosmaer | 2017-07-12 | 2 | -101/+9 |
| | | | | | |||||
| * | | | | Add Gitaly notes and annotations to Gitlab::Git | Jacob Vosmaer | 2017-07-12 | 21 | -0/+66 |
| | | | | | |||||
* | | | | | Merge branch '35036-commit-page-dropdown' into 'master' | Phil Hughes | 2017-07-13 | 1 | -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-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 toggle See merge request !12796 | ||||
| * | | | | Fix wording of nav togglenavigation-toggle | Annabel Dunstone Gray | 2017-07-12 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | Merge branch ↵ | Robert Speicher | 2017-07-13 | 3 | -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-off | Ruben Davila | 2017-07-12 | 3 | -15/+89 |
| | | | | | | | | | | | | | | | | | | | | | | | | Additionally some missing translations were added | ||||
* | | | | | | Merge branch 'enable-scss-lint-declaration-order' into 'master' | Clement Ho | 2017-07-12 | 13 | -23/+29 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable DeclarationOrder in scss-lint See merge request !12805 | ||||
| * | | | | | | 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 See merge request !12815 | ||||
| * | | | | | | | 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 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 |
| | |_|/ / / / / / / / | |/| | | | | | | | | |