summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Resolved MR discussions22152-improve-setup-ssh-documentationSean Packham2016-10-111-23/+31
* Merge branch 'master' into 22152-improve-setup-ssh-documentationSean Packham2016-10-11786-5638/+12794
|\
| * Merge branch 'document-ci-shell-trace-variable' into 'master' Achilleas Pipinellis2016-10-112-0/+36
| |\
| | * Document the new CI_DEBUG_TRACE variableNick Thomas2016-10-112-0/+36
| * | Merge branch 'sh-fix-issue-20776' into 'master' Robert Speicher2016-10-113-1/+24
| |\ \
| | * | Fix Error 500 when viewing old merge requests with bad diff datash-fix-issue-20776Stan Hu2016-10-103-1/+24
| * | | Merge branch 'new-gitlab-users-clear_all_authentication_tokens-task' into 'ma...Robert Speicher2016-10-115-0/+70
| |\ \ \
| | * | | Add a safeguard in User#set_projects_limitnew-gitlab-users-clear_all_authentication_tokens-taskRémy Coutable2016-10-111-0/+5
| | * | | Add a new gitlab:users:clear_all_authentication_tokens taskRémy Coutable2016-10-114-0/+65
| * | | | Merge branch 'master' into 'master' Rémy Coutable2016-10-113-2/+3
| |\ \ \ \
| | * | | | Update mail_room gemTjaart van der Walt2016-10-063-3/+4
| * | | | | Merge branch 'gitlab-basics' into 'master' Achilleas Pipinellis2016-10-1121-1/+1
| |\ \ \ \ \
| | * | | | | Remove redundant imagesAchilleas Pipinellis2016-10-1121-1/+1
| * | | | | | Merge branch 'nahtnam/gitlab-ce-ci-test-phoenix' into 'master' Achilleas Pipinellis2016-10-113-0/+58
| |\ \ \ \ \ \
| | * | | | | | Improve a bit the example .gitlab-ci.yml for Phoenixnahtnam/gitlab-ce-ci-test-phoenixRémy Coutable2016-10-111-9/+13
| | * | | | | | Add an example for testing a phoenix application with Gitlab CI.Manthan Mallikarjun2016-10-113-0/+54
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'gitlab-basics' into 'master' Achilleas Pipinellis2016-10-1177-177/+149
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Rearrange GitLab basics READMEsAchilleas Pipinellis2016-10-112-3/+3
| | * | | | | New images for GitLab basics "Create MR" docsAchilleas Pipinellis2016-10-118-29/+20
| | * | | | | Add new images in GitLab basics "Create issue" docsAchilleas Pipinellis2016-10-119-15/+18
| | * | | | | Reference the web editor docs in GitLab basics "Add a file"Achilleas Pipinellis2016-10-111-25/+3
| | * | | | | New images for GitLab basics "Fork project" docsAchilleas Pipinellis2016-10-115-9/+10
| | * | | | | Reference the web editor docs in GitLab basics "Create a branch"Achilleas Pipinellis2016-10-113-37/+10
| | * | | | | New images for GitLab basics "Create group" docsAchilleas Pipinellis2016-10-119-23/+28
| | * | | | | Add new images for GitLab basics "create project"Achilleas Pipinellis2016-10-115-12/+15
| | * | | | | Use new image for gitlab-basics/command-line-commands.mdgitlab-basicsAchilleas Pipinellis2016-10-104-7/+21
| | * | | | | Refactor SSH key addition in GitLab basicsAchilleas Pipinellis2016-10-1010-17/+21
| | * | | | | Change img dir nameAchilleas Pipinellis2016-10-1053-39/+39
| * | | | | | Merge branch 'precalculate-trending-projects' into 'master' Robert Speicher2016-10-1112-102/+171
| |\ \ \ \ \ \
| | * | | | | | Precalculate trending projectsprecalculate-trending-projectsYorick Peterse2016-10-1012-102/+171
| * | | | | | | Merge branch 'empty-mrs' into 'master' Rémy Coutable2016-10-117-49/+71
| |\ \ \ \ \ \ \
| | * | | | | | | Allow empty merge requestsArtem Sidorenko2016-10-117-49/+71
| * | | | | | | | Merge branch 'reserve-robots-txt-namespace' into 'master' Robert Speicher2016-10-111-0/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add `robots.txt` to the list of reserved namespacesNick Thomas2016-10-111-0/+1
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge branch 'sh-update-mailroom' into 'master' Robert Speicher2016-10-112-1/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Bump mail_room to v0.8.1 to fix thread cleanup issuesh-update-mailroomStan Hu2016-10-102-1/+2
| | |/ / / / / /
| * | | | | | | Merge branch 'dz-cleanup-routing' into 'master' Dmitriy Zaporozhets2016-10-1110-167/+60
| |\ \ \ \ \ \ \
| | * | | | | | | Fix duplicate entry in CHANGELOGdz-cleanup-routingDmitriy Zaporozhets2016-10-101-1/+0
| | * | | | | | | Better wording in API readmeDmitriy Zaporozhets2016-10-101-2/+2
| | * | | | | | | Fix api users spec for post request with invalid idDmitriy Zaporozhets2016-10-101-4/+4
| | * | | | | | | Replace undefined Grape routing code from 400 to 404Dmitriy Zaporozhets2016-10-105-30/+33
| | * | | | | | | Fix API specs behaviour for invalid routingDmitriy Zaporozhets2016-10-104-20/+51
| | * | | | | | | Catch any undefined API routing and return 400 Bad RequestDmitriy Zaporozhets2016-10-103-3/+9
| | * | | | | | | Update git over http test to match new routingDmitriy Zaporozhets2016-10-101-3/+2
| | * | | | | | | Remove NamespacesControllerDmitriy Zaporozhets2016-10-103-145/+0
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch '23118-use-one-style-of-naming-js-files' into 'master' Fatih Acet2016-10-115-0/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Formatted all app/assets/javascripts to underscore naming convention23118-use-one-style-of-naming-js-filesLuke Bennett2016-10-105-0/+0
| * | | | | | | | Merge branch 'simplify-compare-page-text' into 'master' Fatih Acet2016-10-101-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Changed 'Compare branches, tags or commit ranges' to 'Compare Git revisions'simplify-compare-page-textLuke Bennett2016-10-101-1/+1
| | |/ / / / / / /
| * | | | | | | | Merge branch '20356-network-commit-hash-input-placeholder-corrections' into '...Fatih Acet2016-10-101-1/+1
| |\ \ \ \ \ \ \ \