summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Gracefully handle garbled URIs in Markdownsh-catch-invalid-uri-markdownStan Hu2017-12-223-1/+11
| | | | | | | There are certain inputs that look like valid URIs that are accepted by URI but not Addressable::URI. Handle the case where the latter fails. Closes #41442
* Merge branch 'docs/gpg-clarify' into 'master'Marcia Ramos2017-12-221-1/+6
|\ | | | | | | | | | | | | Add note about using the term GPG for all related implementations Closes #36970 See merge request gitlab-org/gitlab-ce!14887
| * Add note about using the term GPG for all related implementationsdocs/gpg-clarifyAchilleas Pipinellis2017-12-221-1/+6
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/36970
* | Merge branch 'dm-diff-note-for-line-performance' into 'master'Robert Speicher2017-12-227-37/+14
|\ \ | | | | | | | | | | | | | | | | | | Improve performance of DiffDiscussion#truncated_diff_lines and DiffNote#diff_line by removing expensive diff position calculation and comparison Closes #41406 See merge request gitlab-org/gitlab-ce!16111
| * | Improve performance of DiffDiscussion#truncated_diff_lines and ↵Douwe Maan2017-12-227-37/+14
| | | | | | | | | | | | DiffNote#diff_line by removing expensive diff position calculation and comparison
* | | Merge branch 'fj-revert-event-target-author-preloading' into 'master'Stan Hu2017-12-222-6/+1
|\ \ \ | | | | | | | | | | | | | | | | Reverted fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788 See merge request gitlab-org/gitlab-ce!16118
| * | | Reverted fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788Francisco Javier López2017-12-222-6/+1
| | | |
* | | | Merge branch ↵Kamil Trzciński2017-12-2239-327/+805
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41053-extend-cluster-applications-to-allow-install-to-prometheus' into 'master' Extend Cluster Applications to allow installation of Prometheus Closes #41053 See merge request gitlab-org/gitlab-ce!15895
| * | | | Extend Cluster Applications to allow installation of PrometheusMayra Cabrera2017-12-2239-327/+805
|/ / / /
* | | | Merge branch 'docs-move-article-ldap' into 'master'🚄 Job van der Voort 🚀2017-12-228-278/+272
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Docs: move article LDAP-CE to its topic-related folder See merge request gitlab-org/gitlab-ce!16094
| * | | | Docs: move article LDAP-CE to its topic-related folderMarcia Ramos2017-12-228-278/+272
| |/ / /
* | | | Merge branch 'dm-issue-move-transaction-error' into 'master'Robert Speicher2017-12-225-9/+42
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Execute project hooks and services after commit when moving an issue Closes #41324 See merge request gitlab-org/gitlab-ce!16108
| * | | Execute project hooks and services after commit when moving an issuedm-issue-move-transaction-errorDouwe Maan2017-12-225-9/+42
| |/ /
* | | Merge branch '38893-banzai-upload-filter-relative-urls' into 'master'Douwe Maan2017-12-227-202/+126
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use relative URLs when linking to uploaded files Closes #38893 See merge request gitlab-org/gitlab-ce!15751
| * | | Use relative URLs when linking to uploaded filesNick Thomas2017-12-227-202/+126
| | | |
* | | | Merge branch 'rc/use-gitlab-styles' into 'master'Robert Speicher2017-12-2270-2531/+757
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Use gitlab-styles which provides shared RuboCop config and cops Closes #37711 See merge request gitlab-org/gitlab-ce!14337
| * | | Use gitlab-stylesRémy Coutable2017-12-2270-2531/+757
|/ / / | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'index-namespaces-lower-name' into 'master'Yorick Peterse2017-12-224-1/+38
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add index on namespaces lower(name) for UsersController#exists Closes #41340 See merge request gitlab-org/gitlab-ce!16059
| * | | Add index on namespaces lower(name) for UsersController#existsindex-namespaces-lower-nameGreg Stark2017-12-214-1/+38
| | | |
* | | | Merge branch 'dz-fix-seed-fu' into 'master'Douwe Maan2017-12-221-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explictly require Gitlab::Utils in ProjectFeaturesCompatibility Closes #41390 See merge request gitlab-org/gitlab-ce!16107
| * | | | Explictly require Gitlab::Utils in ProjectFeaturesCompatibilitydz-fix-seed-fuDmitriy Zaporozhets2017-12-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason Rails does not require it automatically when invoked via rake task which cause tasks like seed_fu fail Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'docs-clarify-auto-devops-pipelines' into 'master'Achilleas Pipinellis2017-12-222-15/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clarify Auto DevOps pipelines See merge request gitlab-org/gitlab-ce!16106
| * | | | | Clarify Auto DevOps pipelinesFabio Busatto2017-12-222-15/+8
|/ / / / /
* | | | | Merge branch 'winh-fail-missing-export' into 'master'Tim Zallmann2017-12-222-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make webpack fail for missing exports See merge request gitlab-org/gitlab-ce!16005
| * | | | | Make webpack fail for missing exportsWinnie Hellmann2017-12-222-1/+4
| | | | | |
* | | | | | Merge branch 'lfs-docs-typo' into 'master'Achilleas Pipinellis2017-12-221-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: fix a typo in LFS documentation See merge request gitlab-org/gitlab-ce!16078
| * | | | | | docs: fix a typo in LFS documentationBen Boeckel2017-12-211-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'patch-29' into 'master'Achilleas Pipinellis2017-12-221-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Fix prometheus arg in prometheus.yml See merge request gitlab-org/gitlab-ce!16075
| * | | | | Fix prometheus arg in prometheus.ymlSam Galson2017-12-211-1/+1
| |/ / / /
* | | | | Merge branch 'jivl-general-icons-2' into 'master'Tim Zallmann2017-12-2226-36/+76
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Replace the download, fork and resolve discussion in a new issue icons See merge request gitlab-org/gitlab-ce!15436
| * | | | | Replaced the remaining code-fork iconsjivl-general-icons-2Jose Ivan Vargas2017-12-1917-21/+41
| | | | | |
| * | | | | code-fork replacementsJose Ivan Vargas2017-12-192-6/+7
| | | | | |
| * | | | | Replaced some fork icons instances and fixed the Icon component on the MR WidgetJose Ivan Vargas2017-12-198-12/+25
| | | | | |
| * | | | | replaced download icon for the sprite based oneJose Ivan Vargas2017-12-197-11/+17
| | | | | |
* | | | | | Merge branch 'fl-update-svg' into 'master'Tim Zallmann2017-12-229-7/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Dependencies See merge request gitlab-org/gitlab-ce!16073
| * | | | | | Update DependenciesFilipa Lacerda2017-12-219-7/+11
| | |/ / / / | |/| | | |
* | | | | | Update VERSION to 10.4.0-prev10.4.0.preTiago Botelho2017-12-221-1/+1
| | | | | |
* | | | | | Update CHANGELOG.md for 10.3.0Tiago Botelho2017-12-22118-597/+149
| | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'qa-fix-escape-password-spaces' into 'master'Grzegorz Bizon2017-12-221-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Escape spaces to %20 rather than + See merge request gitlab-org/gitlab-ce!16037
| * | | | | It should escape spaces to %20 rather than +qa-fix-escape-password-spacesLin Jen-Shin2017-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `CGI.escape` would escape spaces to +, which is fine in some cases, but doesn't work for git clone.
* | | | | | Merge branch 'fix/last-push-event-widget-layout' into 'master'Clement Ho2017-12-213-14/+21
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Last push event widget width for fixed layout #40268 See merge request gitlab-org/gitlab-ce!15862
| * | | | | Last push event widget width for fixed layoutGeorge Tsiolis2017-12-213-14/+21
| | | | | |
* | | | | | Merge branch '41268-bump-ruby-to-2-3-6' into 'master'Robert Speicher2017-12-213-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Bump Ruby to 2.3.6" See merge request gitlab-org/gitlab-ce!16016
| * | | | | | Update Ruby version to 2.3.641268-bump-ruby-to-2-3-6Rémy Coutable2017-12-213-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'docs/update-doc-for-ruby-2-3-6' into 'master'Robert Speicher2017-12-214-8/+368
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Update installation and upgrade guides to use Ruby 2.3.6 See merge request gitlab-org/gitlab-ce!16038
| * | | | | | Update installation and upgrade guides to use Ruby 2.3.6docs/update-doc-for-ruby-2-3-6Rémy Coutable2017-12-204-8/+368
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch '33609-hide-pagination' into 'master'Clement Ho2017-12-213-1/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not show Vue pagination if only one page Closes #33609 See merge request gitlab-org/gitlab-ce!15999
| * | | | | | | Do not show Vue pagination if only one pageMario de la Ossa2017-12-213-1/+28
| | | | | | | |
* | | | | | | | Merge branch 'patch-28' into 'master'Jacob Schatz2017-12-215-73/+218
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added 'admin' persona See merge request gitlab-org/gitlab-ce!15470
| * | | | | | | | Added 'admin' personaSarah O'Donnell2017-12-215-73/+218
| | | | | | | | |