summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* additional fixesDimitrie Hoekstra2016-11-224-9/+5
* Converted all status icons to be managed by scss colors only and deleted any ...Dimitrie Hoekstra2016-11-2216-77/+118
* fixed mini pipeline graph connector lines offsetDimitrie Hoekstra2016-11-221-8/+1
* 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
| * | | | | Bring back the `commit_url` as it's used by CycleAnalyticsKamil Trzcinski2016-11-181-0/+7
| * | | | | Merge branch '22539-display-folders' of gitlab.com:gitlab-org/gitlab-ce into ...Kamil Trzcinski2016-11-1812-98/+151
| |\ \ \ \ \
| | * | | | | Fix css classFilipa Lacerda2016-11-182-2/+4
| | * | | | | Remove comment from htmlFilipa Lacerda2016-11-181-1/+0
| | * | | | | Removes unnecessary commentsFilipa Lacerda2016-11-182-3/+0
| | * | | | | Improvements after reviewFilipa Lacerda2016-11-181-9/+1
| | * | | | | Remove unused CSSFilipa Lacerda2016-11-181-4/+0
| | * | | | | Remove slotsFilipa Lacerda2016-11-182-20/+22
| | * | | | | Fixes typoFilipa Lacerda2016-11-181-4/+4
| | * | | | | Try to use slotsFilipa Lacerda2016-11-183-24/+29
| | * | | | | Improve after reviewFilipa Lacerda2016-11-181-1/+1
| | * | | | | Improvements after reviewFilipa Lacerda2016-11-171-13/+41
| | * | | | | Adds helper to verify empty objectFilipa Lacerda2016-11-171-3/+18
| | * | | | | Fix after reviewFilipa Lacerda2016-11-171-4/+1
| | * | | | | Merge branch 'master' into 22539-display-foldersGrzegorz Bizon2016-11-1717-75/+261
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into 22539-display-foldersGrzegorz Bizon2016-11-17165-296/+634
| | |\ \ \ \ \ \
| | * | | | | | | Adds fixed layout to prevent the columns from jumping when opening a folderFilipa Lacerda2016-11-171-0/+2
| | * | | | | | | Undo last commitFilipa Lacerda2016-11-171-236/+0
| | * | | | | | | Adds fixed layout to prevent the columns from jumping when opening a folderFilipa Lacerda2016-11-171-0/+236
| | * | | | | | | Fix broken button in empty stateFilipa Lacerda2016-11-171-8/+7
| | * | | | | | | inline conditionsFilipa Lacerda2016-11-171-4/+2
| | * | | | | | | Changes url to pathFilipa Lacerda2016-11-172-10/+10
| | * | | | | | | Fix iifeFilipa Lacerda2016-11-171-1/+1
| | * | | | | | | Fix spacesFilipa Lacerda2016-11-171-3/+3