summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
|\ \ \
| * | | Changed placeholder to 'Commit hash'20356-network-commit-hash-input-placeholder-correctionsLuke Bennett2016-10-101-1/+1
| |/ /
* | | Merge branch 'fix-options-caret-mobile-viewport' into 'master' Fatih Acet2016-10-103-2/+3
|\ \ \
| * | | Fix inconsistent options dropdown caret on mobile viewportsClement Ho2016-10-083-2/+3
* | | | Merge branch 'mr-file-path-copy-btn' into 'master' Fatih Acet2016-10-103-2/+4
|\ \ \ \
| * | | | Added copy file path button to diffsmr-file-path-copy-btnPhil Hughes2016-10-103-2/+4
| | |/ / | |/| |
* | | | Merge branch 'remove-redundant-mixins' into 'master' Annabel Dunstone Gray2016-10-1022-50/+40
|\ \ \ \
| * | | | Remove redundant mixinsClement Ho2016-10-0822-50/+40
| | |/ / | |/| |
* | | | Merge branch 'doc/link-coverage-badge-to-coverage-report' into 'master' Achilleas Pipinellis2016-10-101-2/+2
|\ \ \ \
| * | | | Add link to test coverage report to READMEdoc/link-coverage-badge-to-coverage-reportGrzegorz Bizon2016-10-101-2/+2
| | |/ / | |/| |
* | | | Merge branch 'fix-misnamed-constant' into 'master' Robert Speicher2016-10-103-3/+3
|\ \ \ \
| * | | | HTMLEntityFilter -> HtmlEntityFilterNick Thomas2016-10-103-3/+3
* | | | | Merge branch 'use-let-in-tests' into 'master' Stan Hu2016-10-101-1/+0
|\ \ \ \ \
| * | | | | Use user from let instead recreate in beforeSemyon Pupkov2016-10-091-1/+0
| | |/ / / | |/| | |
* | | | | Merge branch 'jmcgeheeiv/gitlab-ce-patch-1' into 'master' Achilleas Pipinellis2016-10-101-23/+36
|\ \ \ \ \
| * | | | | Add registry to skipped data in backup raketask docsAchilleas Pipinellis2016-10-101-4/+6
| * | | | | Added "CI secret variables" per @axil.John McGehee2016-09-291-3/+3
| * | | | | Rebase and resolve conflicts in backup doc for !3761john McGehee2016-09-281-23/+34
* | | | | | Merge branch 'explain-0600' into 'master' Robert Speicher2016-10-101-1/+1
|\ \ \ \ \ \
| * | | | | | Explain the extra chmodJacob Vosmaer2016-09-261-1/+1
* | | | | | | Merge branch 'jerdog/gitlab-ce-update-start-using-git-documentation' into 'ma...2529-error-502-when-creating-mrAchilleas Pipinellis2016-10-102-11/+10
|\ \ \ \ \ \ \
| * | | | | | | Updating changes based on feedback from @connorsheaJerdog2016-10-101-5/+5
| * | | | | | | Changes to make Git basics more intuitiveJerdog2016-10-102-11/+10
* | | | | | | | Merge branch 'tnir/gitlab-ce-23068-cleanup-ci-application-controller'Rémy Coutable2016-10-104-9/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Remove Ci::ApplicationControllerTakuya Noguchi2016-10-104-9/+3
|/ / / / / / /
* | | | | | | Merge branch 'gtrafimenkov/gitlab-ce-clarify-runners-delete-token' into 'mast...Achilleas Pipinellis2016-10-102-2/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Clarify which token should be used to delete a runnerGennady Trafimenkov2016-10-102-2/+5
|/ / / / / /
* | | | | | Merge branch 'fix/async-pipeline-processing-stale-data' into 'master' Kamil Trzciński2016-10-103-16/+42
|\ \ \ \ \ \
| * | | | | | Check for transition loopback in commit statusfix/async-pipeline-processing-stale-dataGrzegorz Bizon2016-10-081-1/+3
| * | | | | | Add temporary fix for race condition in MWBSGrzegorz Bizon2016-10-081-0/+3
| * | | | | | Improve transitions and run hooks after transactionGrzegorz Bizon2016-10-081-18/+20
| * | | | | | Improve spec for merge when build succeeds featureGrzegorz Bizon2016-10-081-5/+19
| * | | | | | Fix ci pipeline processing with async jobsGrzegorz Bizon2016-10-072-14/+19
* | | | | | | Merge branch 'namespace-validation-fixes' into 'master' Sean McGivern2016-10-105-11/+41
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Correct namespace validation to forbid bad names #21077Will Starms2016-10-075-11/+41