summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | | | * | | | | | | | | | | | | | | | | | Prettify awards_handler_spec.js scriptMike Greiling2018-10-171-356/+335
| |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | 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
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch '49740-share-frontend-configs-between-repos' into 'master'Clement Ho2018-10-163-46/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Share frontend configs between repos" Closes #49740 See merge request gitlab-org/gitlab-ce!22405
| * | | | | | | | | | | | | | | | | | | Use @gitlab/eslint-config as base in eslintrcMike Greiling2018-10-163-46/+19
| | |_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch '51712-no-promise-without-done-fail' into 'master'Mike Greiling2018-10-167-19/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2. enable jasmine/no-promise-without-done-fail See merge request gitlab-org/gitlab-ce!22231
| * | | | | | | | | | | | | | | | | | enable jasmine/no-promise-without-done-failJohann Hubert Sonntagbauer2018-10-167-19/+17
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'fix-review-link-docs' into 'master'Douwe Maan2018-10-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "ready for review" link See merge request gitlab-org/gitlab-ce!22393
| * | | | | | | | | | | | | | | | | | | Fix "ready for review" linkJan Provaznik2018-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove assignee_id=0 condition from search filters, we agreed that just presence of "ready of review" label is sufficient for filtering MRs, no need to unassign yourself.
* | | | | | | | | | | | | | | | | | | | Merge branch 'sh-fix-commit-signatures-error' into 'master'Douwe Maan2018-10-163-2/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix commit signature error when project is disabled Closes #50903 See merge request gitlab-org/gitlab-ce!22344
| * | | | | | | | | | | | | | | | | | | | Fix commit signature error when project is disabledStan Hu2018-10-153-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project is disabled, visiting the home page would show, "An error occurred while loading commit signatures". This change checks that the user has permission to view the project to avoid unnecessary GPG signature lookups. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50903
* | | | | | | | | | | | | | | | | | | | | Merge branch '52650-webhook-image-urls-rewritten-incorrectly-in-issues' into ↵Douwe Maan2018-10-166-55/+115
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Webhook Image URLs Rewritten Incorrectly in Issues" Closes #52650 See merge request gitlab-org/gitlab-ce!22361
| * | | | | | | | | | | | | | | | | | | | Web hook -> webhookSean McGivern2018-10-161-3/+3
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Fix image webhook rewriting for uploadsSean McGivern2018-10-166-53/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This rewrote URLs to be absolute URLs. However, for uploads (the most common case), we actually need them to point to not just the GitLab instance, but the project they're from. Thankfully, we can normally get that information from the object we're building the hook for.
* | | | | | | | | | | | | | | | | | | | | Merge branch 'prettify-all-the-things-6' into 'master'Fatih Acet2018-10-1649-1443/+1458
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prettify all the things (part 6) See merge request gitlab-org/gitlab-ce!22256