Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Set empty before_script for sast job in gitlab-ci.ymldz-add-sast | Dmitriy Zaporozhets | 2017-12-22 | 1 | -0/+1 |
| | |||||
* | Remove security checks from static analysis and add sast job | Dmitriy Zaporozhets | 2017-12-22 | 2 | -2/+7 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Merge branch 'index-namespaces-lower-name' into 'master' | Yorick Peterse | 2017-12-22 | 4 | -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-name | Greg Stark | 2017-12-21 | 4 | -1/+38 |
| | | |||||
* | | Merge branch 'dz-fix-seed-fu' into 'master' | Douwe Maan | 2017-12-22 | 1 | -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-fu | Dmitriy Zaporozhets | 2017-12-22 | 1 | -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 Pipinellis | 2017-12-22 | 2 | -15/+8 |
|\ \ \ | | | | | | | | | | | | | | | | | Clarify Auto DevOps pipelines See merge request gitlab-org/gitlab-ce!16106 | ||||
| * | | | Clarify Auto DevOps pipelines | Fabio Busatto | 2017-12-22 | 2 | -15/+8 |
|/ / / | |||||
* | | | Merge branch 'winh-fail-missing-export' into 'master' | Tim Zallmann | 2017-12-22 | 2 | -1/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | Make webpack fail for missing exports See merge request gitlab-org/gitlab-ce!16005 | ||||
| * | | | Make webpack fail for missing exports | Winnie Hellmann | 2017-12-22 | 2 | -1/+4 |
| | | | | |||||
* | | | | Merge branch 'lfs-docs-typo' into 'master' | Achilleas Pipinellis | 2017-12-22 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | docs: fix a typo in LFS documentation See merge request gitlab-org/gitlab-ce!16078 | ||||
| * | | | | docs: fix a typo in LFS documentation | Ben Boeckel | 2017-12-21 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'patch-29' into 'master' | Achilleas Pipinellis | 2017-12-22 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Fix prometheus arg in prometheus.yml See merge request gitlab-org/gitlab-ce!16075 | ||||
| * | | | Fix prometheus arg in prometheus.yml | Sam Galson | 2017-12-21 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'jivl-general-icons-2' into 'master' | Tim Zallmann | 2017-12-22 | 26 | -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-2 | Jose Ivan Vargas | 2017-12-19 | 17 | -21/+41 |
| | | | | |||||
| * | | | code-fork replacements | Jose Ivan Vargas | 2017-12-19 | 2 | -6/+7 |
| | | | | |||||
| * | | | Replaced some fork icons instances and fixed the Icon component on the MR Widget | Jose Ivan Vargas | 2017-12-19 | 8 | -12/+25 |
| | | | | |||||
| * | | | replaced download icon for the sprite based one | Jose Ivan Vargas | 2017-12-19 | 7 | -11/+17 |
| | | | | |||||
* | | | | Merge branch 'fl-update-svg' into 'master' | Tim Zallmann | 2017-12-22 | 9 | -7/+11 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Update Dependencies See merge request gitlab-org/gitlab-ce!16073 | ||||
| * | | | | Update Dependencies | Filipa Lacerda | 2017-12-21 | 9 | -7/+11 |
| | |/ / | |/| | | |||||
* | | | | Update VERSION to 10.4.0-prev10.4.0.pre | Tiago Botelho | 2017-12-22 | 1 | -1/+1 |
| | | | | |||||
* | | | | Update CHANGELOG.md for 10.3.0 | Tiago Botelho | 2017-12-22 | 118 | -597/+149 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | | Merge branch 'qa-fix-escape-password-spaces' into 'master' | Grzegorz Bizon | 2017-12-22 | 1 | -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-spaces | Lin Jen-Shin | 2017-12-20 | 1 | -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 Ho | 2017-12-21 | 3 | -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 layout | George Tsiolis | 2017-12-21 | 3 | -14/+21 |
| | | | | | |||||
* | | | | | Merge branch '41268-bump-ruby-to-2-3-6' into 'master' | Robert Speicher | 2017-12-21 | 3 | -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-6 | Rémy Coutable | 2017-12-21 | 3 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | Merge branch 'docs/update-doc-for-ruby-2-3-6' into 'master' | Robert Speicher | 2017-12-21 | 4 | -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-6 | Rémy Coutable | 2017-12-20 | 4 | -8/+368 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | Merge branch '33609-hide-pagination' into 'master' | Clement Ho | 2017-12-21 | 3 | -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 page | Mario de la Ossa | 2017-12-21 | 3 | -1/+28 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'patch-28' into 'master' | Jacob Schatz | 2017-12-21 | 5 | -73/+218 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added 'admin' persona See merge request gitlab-org/gitlab-ce!15470 | ||||
| * | | | | | | | Added 'admin' persona | Sarah O'Donnell | 2017-12-21 | 5 | -73/+218 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'docs-move-article-artifactory' into 'master' | Achilleas Pipinellis | 2017-12-21 | 5 | -299/+298 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Docs: move article Artifactory + GL to subject-related folder See merge request gitlab-org/gitlab-ce!16081 | ||||
| * | | | | | | | Docs: move article Artifactory + GL to subject-related folder | Marcia Ramos | 2017-12-21 | 5 | -299/+298 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'diff-worker-js-fix' into 'master' | Jacob Schatz | 2017-12-21 | 1 | -1/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed diff_worker not compiling correctly Closes #41182 See merge request gitlab-org/gitlab-ce!15966 | ||||
| * | | | | | | | changed webpack configdiff-worker-js-fix | Phil Hughes | 2017-12-16 | 2 | -3/+5 |
| | | | | | | | | |||||
| * | | | | | | | Fixed diff_worker not compiling correctly | Phil Hughes | 2017-12-15 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #41182 | ||||
* | | | | | | | | Merge branch 'docs-move-transfer-project-to-group' into 'master' | Achilleas Pipinellis | 2017-12-21 | 5 | -84/+171 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor user, project and group docs when changing namespace See merge request gitlab-org/gitlab-ce!16019 | ||||
| * | | | | | | | | Mention GitLab Pages when changing username | John Doe | 2017-12-21 | 1 | -1/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Consolidate the docs when changing a repo path | John Doe | 2017-12-21 | 4 | -115/+164 |
| | | | | | | | | | |||||
| * | | | | | | | | Add docs for automatic redirects when renaming namespaces | Achilleas Pipinellis | 2017-12-21 | 2 | -6/+42 |
| | | | | | | | | | |||||
| * | | | | | | | | move "Transfer an existing project into a group" to project docs | Marcia Ramos | 2017-12-21 | 3 | -16/+16 |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move the section - replace identifiers with inline links - update settings (General settings > Advanced settings) | ||||
* | | | | | | | | Merge branch 'jprovazn-search' into 'master' | Yorick Peterse | 2017-12-21 | 5 | -3/+34 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip projects filter on merge requests search See merge request gitlab-org/gitlab-ce!15955 | ||||
| * | | | | | | | | Skip projects filter on merge requests searchjprovazn-search | Jan Provaznik | 2017-12-21 | 5 | -3/+34 |
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When searching for merge requests, an additional subquery is added which by default filters only merge requests which belong to source or target project user has permission for. This filter is not needed because more restrictive filter which checks if user has permission for target project is used in the query. So unless a custom projects filter is used by user, it's possible to skip the default projects filter and speed up the final query. Related to #40540 | ||||
* | | | | | | | | Merge branch 'fix-webpack-chunk-naming' into 'master' | Jacob Schatz | 2017-12-21 | 3 | -3/+13 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly name webpack chunks for dynamic imports See merge request gitlab-org/gitlab-ce!16066 | ||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into fix-webpack-chunk-naming | Clement Ho | 2017-12-21 | 299 | -2357/+4831 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | update dispatcher to allow for dynamic imports until webpack plugin is updatedfix-webpack-chunk-naming | Mike Greiling | 2017-12-20 | 2 | -1/+6 |
| | | | | | | | | | |