summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update GITLAB_SHELL_VERSIONupdate-shell-5-0-5Alejandro Rodríguez2017-05-311-1/+1
* Revert "Update GITLAB_SHELL_VERSION"Alejandro Rodríguez2017-05-311-1/+1
* Update GITLAB_SHELL_VERSIONAlejandro Rodríguez2017-05-311-1/+1
* Merge branch 'feature-flags-flipper' into 'master'Dmitriy Zaporozhets2017-05-3117-5/+483
|\
| * Add feature toggles through FlipperAlejandro Rodríguez2017-05-3117-5/+483
|/
* Merge branch 'dm-gitmodules-parsing' into 'master'Grzegorz Bizon2017-05-313-17/+47
|\
| * Remove entry variabledm-gitmodules-parsingDouwe Maan2017-05-311-10/+9
| * Make .gitmodules parsing more resilient to syntax errorsDouwe Maan2017-05-303-16/+47
* | Merge branch 'rename-builds-controller' into 'master'Kamil Trzciński2017-05-3169-337/+637
|\ \
| * | Rename the other jobsrename-builds-controllerLin Jen-Shin2017-05-311-8/+8
| * | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-3147-125/+1011
| |\ \
| * | | Update jobs_spec for changes from builds_specLin Jen-Shin2017-05-312-496/+18
| * | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-31315-1972/+4730
| |\ \ \
| * | | | Use another scope to add the - prefix, feedback:Lin Jen-Shin2017-05-311-25/+27
| * | | | Update changelog to reflect the new schemeLin Jen-Shin2017-05-271-1/+1
| * | | | Should escape the routes because we added -Lin Jen-Shin2017-05-271-1/+1
| * | | | Use - as the prefix so we don't conflict with namespacesLin Jen-Shin2017-05-2611-26/+13
| * | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-261029-5552/+10902
| |\ \ \ \
| * | | | | Routing helpers are no longer neededLin Jen-Shin2017-05-241-3/+0
| * | | | | Add checks before redirect, remove status/traceLin Jen-Shin2017-05-244-38/+8
| * | | | | Use controllers to redirectLin Jen-Shin2017-05-233-44/+100
| * | | | | Separate artifacts from builds, reusing artifacts_action_pathLin Jen-Shin2017-05-192-22/+39
| * | | | | Complete all legacy builds URL. Tests are addedLin Jen-Shin2017-05-196-23/+176
| * | | | | Use a single route, reducing duplicationLin Jen-Shin2017-05-181-27/+16
| * | | | | Disable rubocop hash check for blocksLin Jen-Shin2017-05-182-1/+7
| * | | | | Fix JS dispatcher for job traceLin Jen-Shin2017-05-181-1/+1
| * | | | | Add backward compatible routes for buildsLin Jen-Shin2017-05-182-0/+576
| * | | | | Add changelog entryLin Jen-Shin2017-05-181-0/+4
| * | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-1866-180/+479
| |\ \ \ \ \
| * | | | | | Add migration to rename projects named jobsLin Jen-Shin2017-05-172-1/+15
| * | | | | | Rename BuildsController to JobsControllerLin Jen-Shin2017-05-1760-182/+190
* | | | | | | Merge branch 'git-checkout-variable-documentation' into 'master'Achilleas Pipinellis2017-05-311-0/+30
|\ \ \ \ \ \ \
| * | | | | | | Add Documentation for GIT_CHECKOUT variableJan Christophersen2017-05-311-0/+30
|/ / / / / / /
* | | | | | | Merge branch 'task-list-2' into 'master'Filipa Lacerda2017-05-319-266/+19
|\ \ \ \ \ \ \
| * | | | | | | Include deckar01-task_list with import instead of requireJared Deckard2017-05-231-1/+1
| * | | | | | | Use native change event in the spec to trigger addEventListenerJared Deckard2017-05-232-2/+6
| * | | | | | | Add changelogJared Deckard2017-05-231-0/+4
| * | | | | | | Upgrade to task_list v2Jared Deckard2017-05-236-264/+9
* | | | | | | | Merge branch 'issue-edit-inline' into 'master'Filipa Lacerda2017-05-3146-96/+2057
|\ \ \ \ \ \ \ \
| * | | | | | | | enable meta+enter shortcut to quick submitissue-edit-inlinePhil Hughes2017-05-304-6/+21
| * | | | | | | | fixed issuable shortcuts not workingPhil Hughes2017-05-308-8/+32
| * | | | | | | | Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-30413-3321/+7417
| |\ \ \ \ \ \ \ \
| * | | | | | | | | fixed up weird karma specs with tooltipPhil Hughes2017-05-263-8/+4
| * | | | | | | | | Merge branch 'issue-edit-inline-project-move-warning' into 'issue-edit-inline'Filipa Lacerda2017-05-265-7/+36
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'issue-edit-inline' into issue-edit-inline-project-move-warningPhil Hughes2017-05-266-8/+11
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | fixed issuable templates dropdown not showingPhil Hughes2017-05-251-1/+1
| * | | | | | | | | | fixed GFM references not workingPhil Hughes2017-05-252-2/+3
| * | | | | | | | | | fixed move issue specsPhil Hughes2017-05-253-5/+7
| | * | | | | | | | | use formState to update loading of save buttonissue-edit-inline-project-move-warningPhil Hughes2017-05-263-15/+7
| | * | | | | | | | | Warn before moving issue in inline edit formPhil Hughes2017-05-254-4/+41
| |/ / / / / / / / /