summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Show friendly message when stage has no dataAlfredo Sumaran2016-11-214-1/+59
* Set stage descriptions dynamicallyAlfredo Sumaran2016-11-217-6/+18
* Move templates to its corresponding componentAlfredo Sumaran2016-11-218-70/+89
* Wrap components with a single element for Vue 2 compatibilityAlfredo Sumaran2016-11-212-55/+59
* Add missing hasError to data object for vue2 compatibilityAlfredo Sumaran2016-11-211-0/+1
* Fix text styles on ItemIssueComponentAlfredo Sumaran2016-11-212-15/+21
* Apply styling to ItemCommitComponentAlfredo Sumaran2016-11-214-19/+49
* Move StagePlanComponent template to component in JS fileAlfredo Sumaran2016-11-212-10/+13
* Move StageIssueComponent template to component in JS fileAlfredo Sumaran2016-11-212-10/+13
* Move ItemIssueComponent template to component JS fileAlfredo Sumaran2016-11-212-25/+36
* Cycle analytics second iterationAlfredo Sumaran2016-11-2121-152/+749
* Improve first implementationAlfredo Sumaran2016-11-214-3/+124
* Load cycle analytics related JS filed only when neededAlfredo Sumaran2016-11-212-0/+2
* Merge branch 'fix/cycle-analytics-no-data' into 'master' Sean McGivern2016-11-211-5/+15
|\
| * Updated code based on feedbackfix/cycle-analytics-no-dataJames Lopez2016-11-211-5/+1
| * rename methodJames Lopez2016-11-211-2/+2
| * Adds a flag to reflect whether or not there is data in cycle analyticsJames Lopez2016-11-211-5/+19
* | Merge branch 'fix-xss-vulnerability' into 'master' Fatih Acet2016-11-215-37/+36
|\ \
| * | Fixes identationfix-xss-vulnerabilityFilipa Lacerda2016-11-212-6/+4
| * | Fix after reviewFilipa Lacerda2016-11-213-12/+6
| * | Remove v-htmlFilipa Lacerda2016-11-214-25/+32
* | | Merge branch 'smarter-cache-invalidation' into 'master' Sean McGivern2016-11-215-228/+261
|\ \ \
| * | | Refactor cache refreshing/expiringYorick Peterse2016-11-214-222/+253
| * | | Use File.exist? to check if a repository existsYorick Peterse2016-11-211-5/+7
| * | | Unify detecting of special repository filesYorick Peterse2016-11-212-16/+16
| |/ /
* | | Merge branch 'issue_24303' into 'master' Sean McGivern2016-11-213-15/+18
|\ \ \ | |_|/ |/| |
| * | Allow JIRA references for project snippetsissue_24303Felipe Artur2016-11-213-15/+18
* | | Merge branch 'fix/cycle-analytics-permissions' into 'master' Sean McGivern2016-11-212-1/+8
|\ \ \
| * | | refactored a couple of things based on feedbackfix/cycle-analytics-permissionsJames Lopez2016-11-212-6/+5
| * | | Added permissions per stage to cycle analytics endpointJames Lopez2016-11-212-3/+11
* | | | Merge branch '24552-js-environment-timeago-is-not-rendered-and-text-shows-obj...Fatih Acet2016-11-211-1/+1
|\ \ \ \
| * | | | Fix timeago rendering for environment timeago24552-js-environment-timeago-is-not-rendered-and-text-shows-object-object-in-mr-widgetClement Ho2016-11-191-1/+1
* | | | | Merge branch '24616-mr-shows-the-build-for-this-merge-request-failed-although...Kamil Trzciński2016-11-212-2/+2
|\ \ \ \ \
| * | | | | Fix a wrong "The build for this merge request failed" message24616-mr-shows-the-build-for-this-merge-request-failed-although-builds-still-runningRémy Coutable2016-11-212-2/+2
* | | | | | Merge branch 'fix/do-not-add-todo-when-build-allowed-to-fail' into 'master' 24710-external-statuses-pipelineKamil Trzciński2016-11-212-2/+11
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Do not create TODO when build is allowed to failGrzegorz Bizon2016-11-212-2/+11
* | | | | | Merge branch 'ee-870-backport' into 'master' Sean McGivern2016-11-2113-17/+85
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Backport some changes done from Time Tracking feature in EE.ee-870-backportRuben Davila2016-11-1813-17/+85
* | | | | | Merge branch 'issue_5541' into 'master' Sean McGivern2016-11-213-24/+22
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Allow enabling and disabling commit and MR events for JIRAissue_5541Felipe Artur2016-11-183-24/+22
* | | | | | Merge branch 'remove-unnecessary-self-from-user-model' into 'master' Rémy Coutable2016-11-211-54/+53
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Remove unnecessary self from user modelSemyon Pupkov2016-11-191-54/+53
* | | | | | Merge branch '24627-fix-bad-mr-error-message' into 'master' Rémy Coutable2016-11-211-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix regression in Merge request formAlex Sanford2016-11-191-2/+2
* | | | | | Merge branch 'super-secret-login-upgrade' into 'master' Fatih Acet2016-11-192-25/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Un-un-revert signin tab order fix.super-secret-login-upgradeBryce Johnson2016-11-182-25/+2
* | | | | | Merge branch '22539-display-folders' into 'master' Fatih Acet2016-11-1921-99/+1351
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix broken testFilipa Lacerda2016-11-191-7/+2
| * | | | | Changes for stop url to pathFilipa Lacerda2016-11-191-7/+1
| * | | | | Expose stop_path for environment to not construct that in frontendKamil Trzcinski2016-11-183-2/+9