summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix bad code example29326-update-documentationFilipa Lacerda2017-03-131-2/+2
* Merge branch 'master' into 29326-update-documentationFilipa Lacerda2017-03-1312-47/+54
|\
| * Merge branch '29189-discussion-button' into 'master' Filipa Lacerda2017-03-133-15/+17
| |\
| | * Fix alignment of resolve discussion button29189-discussion-buttonAnnabel Dunstone Gray2017-03-103-15/+17
| * | Merge branch '29328-fix-transient-failure-in-model-user-spec' into 'master' Rémy Coutable2017-03-132-2/+7
| |\ \
| | * | Resolve transient failure in spec/models/user_spec.rbGeorge Andrinopoulos2017-03-132-2/+7
| |/ /
| * | Merge branch 'mrchrisw-update-deploy-key' into 'master' Filipa Lacerda2017-03-131-1/+1
| |\ \
| | * | Fix inconsistent deploy key documentation in UImrchrisw-update-deploy-keyChris Wilson2017-03-081-1/+1
| * | | Merge branch 'zj-update-templates' into 'master' James Lopez2017-03-135-29/+29
| |\ \ \
| | * | | Update templates with new CI variableszj-update-templatesZ.J. van de Weg2017-03-105-29/+29
| * | | | Merge branch 'fix/execute-inflections-initializer-early' into 'master' DJ Mountney2017-03-111-0/+0
| |\ \ \ \
| | * | | | Execute inflections initializer earlierfix/execute-inflections-initializer-earlyDouglas Barbosa Alexandre2017-03-101-0/+0
| | | |_|/ | | |/| |
* | | | | Fix code examples and add code highligthFilipa Lacerda2017-03-101-5/+4
* | | | | Merge branch 'master' into 29326-update-documentationFilipa Lacerda2017-03-108-56/+166
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '29046-fix-github-importer-open-prs' into 'master' Douwe Maan2017-03-105-33/+105
| |\ \ \ \
| | * | | | Using guard clause and added more specs29046-fix-github-importer-open-prsGabriel Mazetto2017-03-104-58/+90
| | * | | | ChangelogGabriel Mazetto2017-03-101-0/+4
| | * | | | Fix GitHub Import for open PRs from a forkGabriel Mazetto2017-03-103-1/+37
| | |/ / /
| * | | | Merge branch 'add-frequently-used-emojis-back-to-menu' into 'master' Filipa Lacerda2017-03-103-23/+61
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add frequently used emojis back to awards menuadd-frequently-used-emojis-back-to-menuEric Eastwood2017-03-093-23/+61
* | | | | Adds best practices regarding context and vue to documentationFilipa Lacerda2017-03-101-1/+32
|/ / / /
* | | | Merge branch 'fix-500-in-notes-polling' into 'master' Rémy Coutable2017-03-101-1/+1
|\ \ \ \
| * | | | Fix notes polling failing after code changesSean McGivern2017-03-101-1/+1
* | | | | Merge branch '29263-merge-button-color' into 'master' 29326-how-to-vue-architectural-decisionsAnnabel Dunstone Gray2017-03-103-5/+5
|\ \ \ \ \
| * | | | | Consistent button colors for disabled buttons29263-merge-button-colorSimon Knox2017-03-103-5/+5
* | | | | | Merge branch '29137-bulk-perform-async-should-specify-queue' into 'master' Douwe Maan2017-03-103-6/+25
|\ \ \ \ \ \
| * | | | | | adds queue option to push bulk in authorized projects worker29137-bulk-perform-async-should-specify-queueTiago Botelho2017-03-103-6/+25
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'enable-snippets-by-default' into 'master' Douwe Maan2017-03-103-2/+6
|\ \ \ \ \ \
| * | | | | | Enable snippets for new projects by defaultenable-snippets-by-defaultSean McGivern2017-03-103-2/+6
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'tc-fix-project-create-500' into 'master'Douwe Maan2017-03-104-0/+22
|\ \ \ \ \ \
| * | | | | | Fix for creating a project through API when import_url is niltc-fix-project-create-500Toon Claes2017-03-104-0/+22
* | | | | | | Merge branch '28307-update-projects-edit-feature-spec' into 'master' Rémy Coutable2017-03-101-19/+11
|\ \ \ \ \ \ \
| * | | | | | | Update feature visibility spec for projects edit pageDavid Piegza2017-03-091-19/+11
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'gitaly-config' into 'master' Sean McGivern2017-03-101-0/+10
|\ \ \ \ \ \ \
| * | | | | | | Document gitaly.socket_path settingJacob Vosmaer2017-03-101-0/+10
* | | | | | | | Merge branch 'adam-prevent-two-issue-trackers' into 'master' Sean McGivern2017-03-104-1/+49
|\ \ \ \ \ \ \ \
| * | | | | | | | Prevent more than one issue tracker to be active for the same projectLuis Del Giudice2017-03-104-1/+49
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch '29316-can-t-select-a-mirror-user' into 'master' Sean McGivern2017-03-101-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix autocomplete in EE when permissions are sent29316-can-t-select-a-mirror-userSean McGivern2017-03-101-2/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch '29209-sign-up-form-name' into 'master' Annabel Dunstone Gray2017-03-102-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Change label for name on sign up form29209-sign-up-form-nametauriedavis2017-03-092-1/+5
* | | | | | | | | Merge branch 'docs/pages-unzip-dep' into 'master' Achilleas Pipinellis2017-03-101-8/+12
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Add zip/unzip as dependencies for Pages source installationsdocs/pages-unzip-depAchilleas Pipinellis2017-03-091-8/+12
* | | | | | | | | Merge branch 'docs/contributing-md-labels' into 'master' Achilleas Pipinellis2017-03-101-0/+5
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Add a section on issue/MR labeling in CONTRIBUTING.mddocs/contributing-md-labelsAchilleas Pipinellis2017-03-101-0/+5
* | | | | | | | | Merge branch 'fe-arch-step' into 'master' Jacob Schatz2017-03-101-2/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adds information about architecture step.Filipa Lacerda2017-03-101-2/+20
|/ / / / / / / / /
* | | | | | | | | Merge branch '24166-close-builds-dropdown' into 'master' Clement Ho2017-03-105-80/+122
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Updates test to use html tags24166-close-builds-dropdownFilipa Lacerda2017-03-091-1/+7
| * | | | | | | | Target all build links inside a dropdown. Use jQuery to handle event delegation.Filipa Lacerda2017-03-092-4/+8
View Lorry Controller Status