summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixes a migration that causes error on some legacy DBsrd-set-missing-fields-on-migrationRubén Dávila2018-11-011-2/+2
| | | | | | | | | Looks like there are some legacy GitLab databases that have a NOT NULL constraint for the `created_at` and `updated` fields. This change fixes the migration by adding a default value to those columns and I think we always should have it in mind when inserting DB records through raw SQL.
* Merge branch 'qa-123' into 'master'Douglas Barbosa Alexandre2018-10-1734-205/+1246
|\ | | | | | | | | First iteration to allow creating QA resources using the API See merge request gitlab-org/gitlab-ce!21302
| * First iteration to allow creating QA resources using the APIRémy Coutable2018-10-1734-205/+1246
|/
* Merge branch '52527-harden-wiki-against-missing-last-version' into 'master'Douglas Barbosa Alexandre2018-10-175-14/+33
|\ | | | | | | | | | | | | Harden the wiki against missing last_versions Closes #52527 See merge request gitlab-org/gitlab-ce!22377
| * Harden the wiki against missing last_versionsNick Thomas2018-10-175-14/+33
| | | | | | | | | | | | Currently, we assume a "last_version" always exists for a wiki page. In production, this is not always true. So, guard uses of it with a null check.
* | Merge branch 'gt-remove-prometheus-configuration-help-text' into 'master'Clement Ho2018-10-173-4/+5
|\ \ | | | | | | | | | | | | | | | | | | Remove prometheus configuration help text Closes #52782 See merge request gitlab-org/gitlab-ce!22413
| * | Remove prometheus configuration help textGeorge Tsiolis2018-10-173-4/+5
| | |
* | | Merge branch '49591-use-cached-readme-blobs' into 'master'Rémy Coutable2018-10-175-38/+79
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use cached readme blobs where appropriate Closes #49591 See merge request gitlab-org/gitlab-ce!22325
| * | | Use cached readme blobs where appropriateNick Thomas2018-10-175-38/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab keeps a cache of the rendered HTML for a repository's README as stored in the HEAD branch. However, it was not used in all circumstances. In particular, the new blob viewer framework bypassed this cache entirely. This MR ensures a ::ReadmeBlob is returned instead of a ::Blob when asking a repository for an individual blob, if the commit and path match the readme for HEAD. This makes the cached HTML available to consumers, including the blob viewer. The ReadmeBlob is a simple delegator to the Blob, so should be compatible in all cases. Adding the rendered_markdown method is the only additional behaviour it contains.
* | | | Merge branch 'fj-52406-wiki-file-content-disposition' into 'master'Douwe Maan2018-10-1712-46/+130528
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixed bug with the content disposition with wiki attachments See merge request gitlab-org/gitlab-ce!22220
| * | | | Fixed bug with the content disposition with wiki attachmentsFrancisco Javier López2018-10-1712-46/+130528
|/ / / /
* | | | Merge branch 'severity-and-priority-rounding-rules-docs' into 'master'Douwe Maan2018-10-171-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Round P/S labels up, not down See merge request gitlab-org/gitlab-ce!22424
| * | | | Round P/S labels up, not downNick Thomas2018-10-171-0/+7
| | | | |
* | | | | Merge branch 'patch-28' into 'master'52748-gitlab-maven-repository-documentation-improvementsMike Lewis2018-10-171-7/+8
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | add link to concurrent devops See merge request gitlab-org/gitlab-ce!22071
| * | | | further instance statistics editsMike Lewis2018-10-171-8/+8
| | | | |
| * | | | spellingWilliam Chia2018-10-031-1/+1
| | | | |
| * | | | add link to concurrent devopsWilliam Chia2018-10-031-1/+2
| | | | |
* | | | | Merge branch '44361-remove-gitlab-grit' into 'master'Rémy Coutable2018-10-178-118/+296
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove gitlab-grit as a transitive dependency of GitLab Closes #44361 See merge request gitlab-org/gitlab-ce!22373
| * | | | | Remove a dependency on gitlab-gollum-libnick.thomas/gitlab-ce-44361-remove-gitlab-gritNick Thomas2018-10-162-14/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inlining this code allows us to remove a dependency on gitlab_grit in gitlab-ce. We can't stop maintaining gitlab_grit yet, since gitaly-ruby still depends on this gem, but it moves us a step closer.
| * | | | | Remove explicit requires from flowdockNick Thomas2018-10-162-5/+0
| | | | | |
| * | | | | Remove a dependency on gitlab-gollum-libNick Thomas2018-10-164-54/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing this dependency also allows us to remove a transitive dependency on gitlab_grit - which is the whole point of this exercise. I don't think we can EOL gitlab_grit until it's removed as a dependency from gitaly-ruby, but this at least gets it out of gitlab-ce.
| * | | | | Merge flowdock monkeypatch into the inlined gemNick Thomas2018-10-163-101/+23
| | | | | |
| * | | | | Rubocop improvementsNick Thomas2018-10-162-29/+30
| | | | | |
| * | | | | Inline the gitlab-flowdock-git-hooks gemNick Thomas2018-10-166-12/+250
| | |/ / / | |/| | | | | | | | | | | | | | | | | | This allows us to avoid one transitive dependency on gitlab-grit. The aim is to remove all transitive dependencies.
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceGitLab Release Tools Bot2018-10-1722-32/+274
|\ \ \ \ \
| * \ \ \ \ Merge branch 'extend-create-spec-with-label' into 'master'Rémy Coutable2018-10-1714-12/+150
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend Create New Merge Request test to also add a label Closes gitlab-qa#233 See merge request gitlab-org/gitlab-ce!19228
| | * | | | | Extend Create New Merge Request test to also add a labelAleksandr Soborov2018-10-1714-12/+150
| |/ / / / /
| * | | | | Merge branch 'gt-update-environments-empty-state' into 'master'Filipa Lacerda2018-10-176-20/+26
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update environments empty state See merge request gitlab-org/gitlab-ce!22297
| | * | | | | Update environments empty stateGeorge Tsiolis2018-10-176-20/+26
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'add/git-protocol-v2-docs' into 'master'Evan Read2018-10-172-0/+98
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Git protocol v2 docs See merge request gitlab-org/gitlab-ce!22227
| | * | | | | Add Git protocol v2 docsJames Lopez2018-10-172-0/+98
| |/ / / / /
* | | | | | Update CHANGELOG.md for 11.3.6GitLab Release Tools Bot2018-10-171-0/+4
|/ / / / / | | | | | | | | | | [ci skip]
* | | | | Merge branch 'winh-refactor-job-groups' into 'master'Phil Hughes2018-10-179-81/+60
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Replace job with group in frontend components to be consistent with backend See merge request gitlab-org/gitlab-ce!22387
| * | | | | Replace job with group in frontend components to be consistent with backendWinnie Hellmann2018-10-179-81/+60
|/ / / / /
* | | | | Merge branch 'issue_49936' into 'master'Marcia Ramos2018-10-179-54/+89
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow JIRA to login using email and API token Closes #49936 See merge request gitlab-org/gitlab-ce!21726
| * | | | | Allow JIRA to login using email and API tokenFelipe Artur2018-10-179-54/+89
|/ / / / /
* | | | | Merge branch 'sh-sh-add-nfs-details-docs' into 'master'Marcia Ramos2018-10-171-1/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add documentation on using NFS v4.1 and disabling server delegations See merge request gitlab-org/gitlab-ce!22379
| * | | | | Add documentation on using NFS v4.1 and disabling server delegationsStan Hu2018-10-161-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For more info, see: * https://gitlab.com/gitlab-org/gitaly/issues/1339 * https://gitlab.com/gitlab-org/gitlab-ce/issues/52017
* | | | | | Merge branch '50904-job-log' into 'master'Phil Hughes2018-10-1734-1400/+1448
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Integrate new vue+vuex code base with new API and remove old haml code" Closes #50904 See merge request gitlab-org/gitlab-ce!22116
| * | | | | | Resolve "Integrate new vue+vuex code base with new API and remove old haml code"Filipa Lacerda2018-10-1734-1400/+1448
|/ / / / / /
* | | | | | Merge branch '37727-fix-file-delete-redirect' into 'master'Rémy Coutable2018-10-174-5/+93
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "In web editor, when delete a file, should navigate to enclosing directory" Closes #37727 See merge request gitlab-org/gitlab-ce!21465
| * | | | | Resolve "In web editor, when delete a file, should navigate to enclosing ↵George Thomas2018-10-174-5/+93
|/ / / / / | | | | | | | | | | | | | | | directory"
* | | | | Merge branch '51712-new-line-before-expect' into 'master'Mike Greiling2018-10-17220-108/+1149
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3. enable jasmine/new-line-before-expect See merge request gitlab-org/gitlab-ce!22234
| * | | | | enable jasmine/new-line-before-expectJohann Hubert Sonntagbauer2018-10-17220-108/+1149
|/ / / / /
* | | | | Merge branch 'prettify-all-the-things-8' into 'master'Fatih Acet2018-10-1650-1051/+1330
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Prettify all the things (part 8) See merge request gitlab-org/gitlab-ce!22258
| * | | | | Prettify additional modules (I through Z)Mike Greiling2018-10-1650-1051/+1330
| | | | | |
* | | | | | Merge branch 'prettify-all-the-things-1' into 'master'Fatih Acet2018-10-1676-1029/+1138
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prettify all the things (part 1) See merge request gitlab-org/gitlab-ce!22248
| * | | | | | Prettify environments feature_highlight and filtered_search modulesMike Greiling2018-10-1622-405/+459
| | | | | | |
| * | | | | | Prettify diff_notes diffs and droplab modulesMike Greiling2018-10-1618-136/+172
| | | | | | |
| * | | | | | Prettify blob behaviors and cycle_analytics modulesMike Greiling2018-10-1636-488/+507
| |/ / / / /
View Lorry Controller Status