summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Set empty before_script for sast job in gitlab-ci.ymldz-add-sastDmitriy Zaporozhets2017-12-221-0/+1
|
* Remove security checks from static analysis and add sast jobDmitriy Zaporozhets2017-12-222-2/+7
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* 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
| | | | | | | |
* | | | | | | | Merge branch 'docs-move-article-artifactory' into 'master'Achilleas Pipinellis2017-12-215-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 folderMarcia Ramos2017-12-215-299/+298
|/ / / / / / /
* | | | | | | Merge branch 'diff-worker-js-fix' into 'master'Jacob Schatz2017-12-211-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed diff_worker not compiling correctly Closes #41182 See merge request gitlab-org/gitlab-ce!15966
| * | | | | | | changed webpack configdiff-worker-js-fixPhil Hughes2017-12-162-3/+5
| | | | | | | |
| * | | | | | | Fixed diff_worker not compiling correctlyPhil Hughes2017-12-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #41182
* | | | | | | | Merge branch 'docs-move-transfer-project-to-group' into 'master'Achilleas Pipinellis2017-12-215-84/+171
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor user, project and group docs when changing namespace See merge request gitlab-org/gitlab-ce!16019
| * | | | | | | | Mention GitLab Pages when changing usernameJohn Doe2017-12-211-1/+3
| | | | | | | | |
| * | | | | | | | Consolidate the docs when changing a repo pathJohn Doe2017-12-214-115/+164
| | | | | | | | |
| * | | | | | | | Add docs for automatic redirects when renaming namespacesAchilleas Pipinellis2017-12-212-6/+42
| | | | | | | | |
| * | | | | | | | move "Transfer an existing project into a group" to project docsMarcia Ramos2017-12-213-16/+16
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move the section - replace identifiers with inline links - update settings (General settings > Advanced settings)
* | | | | | | | Merge branch 'jprovazn-search' into 'master'Yorick Peterse2017-12-215-3/+34
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip projects filter on merge requests search See merge request gitlab-org/gitlab-ce!15955
| * | | | | | | | Skip projects filter on merge requests searchjprovazn-searchJan Provaznik2017-12-215-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 Schatz2017-12-213-3/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly name webpack chunks for dynamic imports See merge request gitlab-org/gitlab-ce!16066
| * \ \ \ \ \ \ \ Merge branch 'master' into fix-webpack-chunk-namingClement Ho2017-12-21299-2357/+4831
| |\ \ \ \ \ \ \ \
| * | | | | | | | | update dispatcher to allow for dynamic imports until webpack plugin is updatedfix-webpack-chunk-namingMike Greiling2017-12-202-1/+6
| | | | | | | | | |