summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
* | | | | Merge branch 'fix-typo_doc-api-labels.md' into 'master' Achilleas Pipinellis2016-10-102-1/+2
|\ \ \ \ \
| * | | | | Fix a typo in doc/api/labels.mdLemures Lemniscati2016-10-092-1/+2
* | | | | | Merge branch '23123-build-sidebar-selected-build' into 'master' Rémy Coutable2016-10-101-1/+1
|\ \ \ \ \ \
| * | | | | | Fix wrong icon in CI build detail sidebar: right-arrow => arrow-right23123-build-sidebar-selected-buildRémy Coutable2016-10-101-1/+1
* | | | | | | Merge branch 'bpj-mr-loop' into 'master' Jacob Schatz2016-10-102-24/+15
|\ \ \ \ \ \ \
| * | | | | | | Debounce GfmAutoComplete setup and simplify code somewhat.bpj-mr-loopBryce Johnson2016-10-072-24/+15
* | | | | | | | Merge branch 'adam-commit-search-case-insensitive' into 'master' Sean McGivern2016-10-103-7/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Make searching for commits case insensitive.Adam Niedzielski2016-10-103-7/+18
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'shell-update' into 'master' Douwe Maan2016-10-102-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Update Gitlab Shell to fix errors moving projects between storagesshell-updateAlejandro Rodríguez2016-10-072-1/+2
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'tests-use-tmpfs' into 'master' Yorick Peterse2016-10-102-0/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Try tmpfs for repository storage, etcNick Thomas2016-10-062-0/+7
* | | | | | | | | Merge branch '22373-reduce-queries-in-api-helpers-find_project' into 'master' Yorick Peterse2016-10-102-22/+143
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve project policy specAlejandro Rodríguez2016-10-062-22/+143
* | | | | | | | | | Merge branch 'gjlaubenstein/gitlab-ce-21712-change-issue-show-html-title'Robert Speicher2016-10-105-4/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | reword html titles for merge requests and issuesGreg Laubenstein2016-10-095-4/+5
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'brennanroberts/gitlab-ce-22872-prevent-default-search-autocompl...Rémy Coutable2016-10-103-1/+22
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Prevent conflict b/w search field and its dropdownBrennan Roberts2016-10-103-1/+22
|/ / / / / / / /
* | | | | | | | Merge branch 'sh-add-user-constraints' into 'master' Stan Hu2016-10-081-1/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix missing constraints causing route failures when usernames with periods ar...sh-add-user-constraintsStan Hu2016-10-081-1/+4
|/ / / / / / / /
* | | | | | | | Merge branch 'sh-fix-for-ruby-2.1.0-spec' into 'master' Stan Hu2016-10-081-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Use Hash rocket syntax to maintain Ruby 2.1 compatibility in specStan Hu2016-10-081-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch '22953-label-with-long-title-overlaps-description-field' into 'm...Annabel Dunstone Gray2016-10-072-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Truncate long labels with ellipsis in labels pagevictorwu4162016-10-062-0/+8
* | | | | | | | | Merge branch 'improve-contributing' into 'master' Stan Hu2016-10-072-30/+30
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fix typo and add he MWBS accronym for "Merge When Build Succeeds"improve-contributingRémy Coutable2016-10-071-4/+4