summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* update installation reqs38826-update-sizing-recommendations-docsJoshua Lambert2017-10-131-1/+1
* update installation reqsJoshua Lambert2017-10-131-2/+2
* 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 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
|\ \
| * | 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 gitlab.com:gitlab-org/git...Zeger-Jan van de Weg2017-10-038-10/+42
| |\ \ \
| | * | | 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
* | | | Merge branch 'zj-gitaly-namespace-service' into 'master'Douwe Maan2017-10-0512-44/+176
|\ \ \ \
| * | | | 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
|\ \ \ \ \
* \ \ \ \ \ Merge branch 'rc/fix/gh-import-branches-performance' into 'master'Sean McGivern2017-10-0510-121/+113
|\ \ \ \ \ \ | |/ / / / /
| * | | | | No need to rescue Rugged::ConfigError in RepositoryMirroringRémy Coutable2017-10-051-3/+0
| * | | | | Add changelog entry for the GitHub import performance improvementrc/fix/gh-import-branches-performanceRémy Coutable2017-10-051-0/+5
| * | | | | Minor improvements after latest reviewRémy Coutable2017-10-053-14/+6
| * | | | | Improve & simplify GitHub's representation classesRémy Coutable2017-10-054-17/+15
| * | | | | Ensure the `import:github` task doesn't schedule an import jobRémy Coutable2017-10-051-4/+9
| * | | | | Set `label_ids` and `assignee_ids` after the initial `save!`.Rémy Coutable2017-10-054-20/+42
| * | | | | Fetch the remote if a PR has been created/updated after the last fetchRémy Coutable2017-10-051-4/+14
| * | | | | Don't mark the import as finished if it wasn't successful in the `import:gith...Rémy Coutable2017-10-051-4/+10
| * | | | | Ensure Github::Import#execute returns false if any errors occuredRémy Coutable2017-10-051-1/+1
| * | | | | Set `ref_fetched` to `true` in Github::Import#fetch_pull_requestsRémy Coutable2017-10-051-0/+1
| * | | | | Move `fetch_ref` from MergeRequestDiff#ensure_commit_shas to MergeRequestRémy Coutable2017-10-052-2/+3
| * | | | | Don't even check if the branch exists locally as we only use its name in GH i...Rémy Coutable2017-10-052-56/+4
| * | | | | Don't check for commit existence in Github::Representation::Branch#exists?Rémy Coutable2017-10-052-9/+5
| * | | | | Keep only the changes that are known to work wellRémy Coutable2017-10-054-38/+46
| * | | | | Fetch and map refs/pull to refs/merge-requests in the GH importJames Lopez2017-10-054-31/+34
* | | | | | Merge branch '32163-protected-branch-form-should-have-sane-defaults-for-dropd...Tim Zallmann2017-10-054-9/+71
|\ \ \ \ \ \
| * | | | | | address-code-styling32163-protected-branch-form-should-have-sane-defaults-for-dropdownsJose Ivan Vargas2017-10-041-4/+4
| * | | | | | Merge branch 'master' into 32163-protected-branch-form-should-have-sane-defau...Jose Ivan Vargas2017-10-03489-6589/+12400
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 32163-protected-branch-form...Jose Ivan Vargas2017-09-26757-5186/+9284
| |\ \ \ \ \ \ \
| * | | | | | | | Addressed observationsJose Ivan Vargas2017-09-261-6/+6
View Lorry Controller Status