summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Prevent branches or tags from starting with invalid characters (e.g. -, .)valid-branch-name-dash-bugJacob Schatz2017-10-053-1/+11
| | | | Closes #38817
* Merge branch 'popover-paradigm' into 'master'Annabel Dunstone Gray2017-10-053-0/+31
|\ | | | | | | | | | | | | Added popover paradigm to ux guide Closes gitlab-design#45 and gitlab-design#36 See merge request gitlab-org/gitlab-ce!14552
| * Added popover paradigm to ux guideDimitrie Hoekstra2017-10-053-0/+31
|/
* Merge branch 'fix_webhook_user_avatar_on_push' into 'master'Rémy Coutable2017-10-051-1/+1
|\ | | | | | | | | | | | | Use full URL of user avatar on webhook push Closes #34339 See merge request gitlab-org/gitlab-ce!14706
| * Use full URL of user avatar on webhook pushfix_webhook_user_avatar_on_pushVitaliy @blackst0ne Klachkov2017-10-051-1/+1
| |
* | Merge branch '34102-online-view-of-artifacts-fe' into 'master'Nick Thomas2017-10-0515-41/+277
|\ \ | | | | | | | | | | | | | | | | | | Add external link for online artifacts Closes #34102 See merge request gitlab-org/gitlab-ce!14399
| * | Update test to use the new API34102-online-view-of-artifacts-feZeger-Jan van de Weg2017-10-051-3/+10
| | |
| * | Test against public projectsZeger-Jan van de Weg2017-10-055-14/+56
| | |
| * | Incorporate feedbackZeger-Jan van de Weg2017-10-044-13/+38
| | |
| * | Add extra assertions about how the link will openEric Eastwood2017-10-041-1/+4
| | |
| * | Dry up external_link? usageEric Eastwood2017-10-041-9/+8
| | |
| * | Merge branch 'master' into 34102-online-view-of-artifacts-feEric Eastwood2017-10-04262-2148/+8161
| |\ \
| * | | Add JSON as external pages artifactEric Eastwood2017-10-031-1/+1
| | | |
| * | | Add translation method to external artifact tooltipEric Eastwood2017-10-031-1/+1
| | | |
| * | | Revert back to original size now that we no longer changed the artifacts zipEric Eastwood2017-10-031-1/+1
| | | |
| * | | Update tests for new implementationZeger-Jan van de Weg2017-10-032-58/+3
| | | |
| * | | Merge branch '34102-online-view-of-artifacts-fe' of ↵Zeger-Jan van de Weg2017-10-038-10/+42
| |\ \ \ | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into 34102-online-view-of-artifacts-fe
| | * | | Restore lost artifacts browser imageEric Eastwood2017-10-031-0/+0
| | | | |
| | * | | Fix up artifacts zip size after adding index.htmlEric Eastwood2017-10-031-1/+1
| | | | |
| | * | | Add test for external HTML artifactEric Eastwood2017-10-034-6/+26
| | | | |
| | * | | Use CSS to space external link icon from textEric Eastwood2017-10-022-2/+3
| | | | |
| | * | | Add docs for online view of HTML artifactsEric Eastwood2017-10-022-1/+7
| | | | |
| | * | | Add changelog for online view of HTML artifactsEric Eastwood2017-10-022-1/+6
| | | | |
| * | | | Redirect to pages daemonZeger-Jan van de Weg2017-10-039-55/+102
| |/ / /
| * | | Backend for HTML serving with GitLab PagesZeger-Jan van de Weg2017-10-025-4/+87
| | | |
| * | | Add external link FE for online artifactsEric Eastwood2017-09-294-7/+60
| | | | | | | | | | | | | | | | FE for https://gitlab.com/gitlab-org/gitlab-ce/issues/34102
* | | | Merge branch 'zj-gitaly-namespace-service' into 'master'Douwe Maan2017-10-0512-44/+176
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Gitaly namespace service enabled for GitLab See merge request gitlab-org/gitlab-ce!14274
| * | | | Fix namespace deletion testsZeger-Jan van de Weg2017-10-053-14/+18
| | | | |
| * | | | Gitaly namespace service enabled for GitLabZeger-Jan van de Weg2017-10-0510-30/+158
| | | | |
* | | | | Merge branch 'rc/fix/gh-import-branches-performance' into 'master'Sean McGivern2017-10-050-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve GitHub import performance Closes #36288, #36292, and #38467 See merge request gitlab-org/gitlab-ce!14445
* \ \ \ \ \ Merge branch 'rc/fix/gh-import-branches-performance' into 'master'Sean McGivern2017-10-0510-121/+113
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve GitHub import performance Closes #36288, #36292, and #38467 See merge request gitlab-org/gitlab-ce!14445
| * | | | | No need to rescue Rugged::ConfigError in RepositoryMirroringRémy Coutable2017-10-051-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Add changelog entry for the GitHub import performance improvementrc/fix/gh-import-branches-performanceRémy Coutable2017-10-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Minor improvements after latest reviewRémy Coutable2017-10-053-14/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Improve & simplify GitHub's representation classesRémy Coutable2017-10-054-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Ensure the `import:github` task doesn't schedule an import jobRémy Coutable2017-10-051-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The point of this task is to run the import in the foreground, so it shouldn't schedule an import job! Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Set `label_ids` and `assignee_ids` after the initial `save!`.Rémy Coutable2017-10-054-20/+42
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Fetch the remote if a PR has been created/updated after the last fetchRémy Coutable2017-10-051-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Don't mark the import as finished if it wasn't successful in the ↵Rémy Coutable2017-10-051-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `import:github` task Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Ensure Github::Import#execute returns false if any errors occuredRémy Coutable2017-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Set `ref_fetched` to `true` in Github::Import#fetch_pull_requestsRémy Coutable2017-10-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we fetch all the refs we need at the beginning of the import process, we can safely set this attribute. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Move `fetch_ref` from MergeRequestDiff#ensure_commit_shas to MergeRequestRémy Coutable2017-10-052-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeRequest#create_merge_request_diff and MergeRequest#reload_diff are the only places where we generate a new MR diff so that's where we should fetch the ref. This also ensures that the ref is not fetched when we call merge_request.merge_request_diffs.create in Github::Import#fetch_pull_requests. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Don't even check if the branch exists locally as we only use its name in GH ↵Rémy Coutable2017-10-052-56/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | import The benefit is that we don't even have to create temp source/target branches. Also, when the source branch of the imported MR is from a fork, name it "user:branch" to mimic how we display it for MR when forks actually exists. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Don't check for commit existence in Github::Representation::Branch#exists?Rémy Coutable2017-10-052-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to check if the existing branch contains a specific SHA since we only use the branch's name, the SHA is taken from the pull request raw `sha` data. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Keep only the changes that are known to work wellRémy Coutable2017-10-054-38/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, improved a bit the method names in Github::Representation::PullRequest. Last but not least, ensure temp branch names doesn't contain a `/` as this would create the ref in a subfolder in `refs/heads` (e.g. `refs/heads/gh-123/456/rymai/foo`), and would leave empty directories upon branch deletion (e.g. `refs/heads/gh-123/456/rymai/`. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Fetch and map refs/pull to refs/merge-requests in the GH importJames Lopez2017-10-054-31/+34
| | | | | | | | | | | | | | | | | | | | | | | | update MR diff
* | | | | | Merge branch ↵Tim Zallmann2017-10-054-9/+71
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32163-protected-branch-form-should-have-sane-defaults-for-dropdowns' into 'master' Resolve "Protected branch form should have sane defaults for dropdowns" Closes #32163 See merge request gitlab-org/gitlab-ce!14278
| * | | | | | address-code-styling32163-protected-branch-form-should-have-sane-defaults-for-dropdownsJose Ivan Vargas2017-10-041-4/+4
| | | | | | |
| * | | | | | Merge branch 'master' into ↵Jose Ivan Vargas2017-10-03489-6589/+12400
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 32163-protected-branch-form-should-have-sane-defaults-for-dropdowns
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into ↵Jose Ivan Vargas2017-09-26757-5186/+9284
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 32163-protected-branch-form-should-have-sane-defaults-for-dropdowns
View Lorry Controller Status