summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'retried-in-database-mysql' into 'master' Regis Boudinot2017-05-105-14/+36
|\
| * Fix rubocop failureKamil Trzcinski2017-05-091-1/+1
| * Make retried to be nullableKamil Trzcinski2017-05-093-4/+4
| * Store retried in database for CI buildsretried-in-database-mysqlKamil Trzcinski2017-05-075-14/+36
* | Merge branch 'winh-pending-ajax-cache' into 'master' Clement Ho2017-05-101-24/+46
|\ \
| * | Track pending requests in AjaxCacheWinnie Hellmann2017-05-101-24/+46
* | | Merge branch 'enforce-current-user-usage-on-entities' into 'master' Kamil Trzciński2017-05-101-1/+1
|\ \ \ | |/ / |/| |
| * | Remove unnecessary user hash being passed to DeploymentSerializerenforce-current-user-usage-on-entitiesOswaldo Ferreira2017-05-101-1/+1
| * | Ensure all Serializers receive `current_user` instead `user`Oswaldo Ferreira2017-05-101-1/+1
* | | Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into 'mas...Robert Speicher2017-05-1053-62/+62
|\ \ \
| * | | Enable the Style/TrailingCommaInArguments copRémy Coutable2017-05-1013-13/+13
| * | | Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-1042-49/+49
| |/ /
* | | Merge branch 'bvl-security-patches' into 'master' Robert Speicher2017-05-1018-121/+135
|\ \ \
| * | | Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan2017-05-103-6/+18
| * | | Merge branch 'fix-hamlit-xss' into 'security-9-1' Robert Speicher2017-05-103-3/+3
| * | | Merge branch 'snippets-finder-visibility' into 'security'Douwe Maan2017-05-1010-81/+69
| * | | Merge branch 'snippets_visibility' into 'security'Sean McGivern2017-05-101-9/+9
| * | | Merge branch 'rs-sanitize-submodule-urls' into 'security'Douwe Maan2017-05-101-16/+30
| * | | Merge branch 'bvl-security-9-1-markup-pipeline'Robert Speicher2017-05-101-6/+6
* | | | Merge branch '31474-issue-boards-sidebar-milestone-dropdown-should-not-be-mul...Phil Hughes2017-05-105-13/+34
|\ \ \ \
| * | | | Disallow multiselect for Milestone dropdownSam Rose2017-05-105-13/+34
* | | | | Merge branch 'tc-clean-pending-delete-projects' into 'master' Douwe Maan2017-05-101-0/+43
|\ \ \ \ \
| * | | | | No user needed to cleanup namespaceless pending delete projectsToon Claes2017-05-101-4/+1
| * | | | | Use worker to destroy namespaceless projects in post-deployToon Claes2017-05-101-0/+46
* | | | | | Merge branch 'cycle-analytics-stage-title-translation-fix' into 'master' Filipa Lacerda2017-05-101-1/+1
|\ \ \ \ \ \
| * | | | | | Fixed the stage title translation in cycle analyticsPhil Hughes2017-05-101-1/+1
* | | | | | | Center all empty statesAnnabel Dunstone Gray2017-05-105-28/+9
* | | | | | | Merge branch 'center-related-merge-request-items-horizontally' into 'master' Filipa Lacerda2017-05-101-1/+9
|\ \ \ \ \ \ \
| * | | | | | | Added @annabeldunstone vertical-align fixcenter-related-merge-request-items-horizontallyLuke "Jared" Bennett2017-05-101-0/+8
| * | | | | | | Remove related issue ci icon top marginLuke "Jared" Bennett2017-05-091-1/+0
| * | | | | | | Center related merge request items horizontallyLuke "Jared" Bennett2017-05-081-0/+1
* | | | | | | | Merge branch 'dm-discussion-diff-header-toggle' into 'master' Douwe Maan2017-05-102-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unused toggle from diff discussion diff headersdm-discussion-diff-header-toggleDouwe Maan2017-05-092-2/+6
* | | | | | | | | Merge branch 'dm-async-tree-readme' into 'master' Douwe Maan2017-05-108-14/+29
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Load tree readme asynchronouslydm-async-tree-readmeDouwe Maan2017-05-108-14/+29
| |/ / / / / / /
* | | | | | | | Replace old isObject for underscore methodsFilipa Lacerda2017-05-104-41/+14
* | | | | | | | Tech debt: Creates vue component for loading iconFilipa Lacerda2017-05-1019-105/+134
* | | | | | | | Fix broken margin in pipeline graphFilipa Lacerda2017-05-101-5/+5
* | | | | | | | Merge branch 'fix-reassigned-mr-email' into 'master' Douwe Maan2017-05-102-19/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Fix reassigned MR emailfix-reassigned-mr-emailSean McGivern2017-05-102-19/+10
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'search-restrict-projects-to-group' into 'master' Filipa Lacerda2017-05-102-9/+27
|\ \ \ \ \ \ \
| * | | | | | | Filter projects by group on search pagesearch-restrict-projects-to-groupPhil Hughes2017-05-082-9/+27
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'fix-search-not-highlighting' into 'master' Filipa Lacerda2017-05-101-1/+6
|\ \ \ \ \ \ \
| * | | | | | | Fixed search terms not highlightPhil Hughes2017-05-101-1/+6
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'issue-boards-sidebar-create-new-label-404-error' into 'master' Filipa Lacerda2017-05-101-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixed create label form not working on issue boards in a sub-group projectissue-boards-sidebar-create-new-label-404-errorPhil Hughes2017-05-081-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'use_relative_path_for_project_avatars' into 'master' Douwe Maan2017-05-105-17/+34
|\ \ \ \ \ \ \
| * | | | | | | Use relative paths for group/project/user avatarsblackst0ne2017-05-105-17/+34
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'patch-5' into 'master' Douwe Maan2017-05-101-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | update yield to return string pathzzjin2017-05-101-1/+1
View Lorry Controller Status