summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-meer-blauw-op-straat' into 'master' Robert Speicher2017-02-2386-314/+285
|\
| * Fix new offensesdm-meer-blauw-op-straatDouwe Maan2017-02-231-4/+4
| * Revert "Enable Style/DotPosition"Douwe Maan2017-02-2357-225/+225
| * Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-23117-524/+524
| * Revert "Enable Style/BarePercentLiterals"Douwe Maan2017-02-232-2/+2
| * Manually correct autocorrectDouwe Maan2017-02-231-2/+2
| * Move up delegate callsDouwe Maan2017-02-237-27/+23
| * ActiveSupport delegation is preferred over ForwardableDouwe Maan2017-02-231-4/+5
| * Fix new offensesDouwe Maan2017-02-233-3/+3
| * Enable Rails/DelegateDouwe Maan2017-02-2311-60/+21
| * Enable Style/WordArrayDouwe Maan2017-02-2312-22/+22
| * Enable Style/MultilineHashBraceLayoutDouwe Maan2017-02-236-17/+16
| * Enable Style/EmptyLineBetweenDefsDouwe Maan2017-02-231-0/+1
| * Enable Style/ClassCheckDouwe Maan2017-02-235-5/+5
| * Prefer leading style for Style/DotPositionDouwe Maan2017-02-23117-525/+525
| * Fix code for copsDouwe Maan2017-02-2316-91/+106
| * Enable Style/ConditionalAssignmentDouwe Maan2017-02-2315-46/+46
| * Enable Style/ColonMethodCallDouwe Maan2017-02-236-9/+9
| * Enable Style/BarePercentLiteralsDouwe Maan2017-02-232-2/+2
| * Enable Rails/ValidationDouwe Maan2017-02-2311-16/+16
| * Enable Performance/RedundantMatchDouwe Maan2017-02-231-1/+1
| * Enable Performance/RedundantBlockCallDouwe Maan2017-02-231-1/+1
| * Enable Performance/RedundantMergeDouwe Maan2017-02-237-12/+10
| * Enable Style/SpaceInsideBracketsDouwe Maan2017-02-234-8/+8
| * Enable Style/MutableConstantDouwe Maan2017-02-2333-45/+45
| * Enable Style/DotPositionDouwe Maan2017-02-2357-229/+229
* | Merge branch 'fix/gb/pipeline-retry-skipped-jobs' into 'master' Kamil Trzciński2017-02-231-0/+6
|\ \
| * | Process skipped jobs in the pipeline when retrying itGrzegorz Bizon2017-02-231-10/+9
| * | Reprocess jobs in stages once when retrying pipelineGrzegorz Bizon2017-02-221-5/+10
| * | Fix reprocessing skipped jobs when retrying pipelineGrzegorz Bizon2017-02-221-0/+2
* | | Merge branch 'fix-mr-size-with-over-100-files' into 'master' Sean McGivern2017-02-231-1/+5
|\ \ \ | |_|/ |/| |
| * | Fix MR changes tab size countfix-mr-size-with-over-100-filesSean McGivern2017-02-231-1/+5
* | | Merge branch '26900-pipelines-tabs' into 'master' Kamil Trzciński2017-02-234-9/+33
|\ \ \
| * \ \ Merge branch 'master' into 26900-pipelines-tabs26900-pipelines-tabsFilipa Lacerda2017-02-23286-1830/+1751
| |\ \ \ | | |/ /
| * | | Adds Pending and Finished tabs to pipelines pageFilipa Lacerda2017-02-164-9/+33
* | | | Merge branch 'fix-test-for-build-attributes' into 'master' Kamil Trzciński2017-02-231-3/+4
|\ \ \ \
| * | | | We actually want to clone project and remove gl_project_idfix-test-for-build-attributesLin Jen-Shin2017-02-211-2/+2
| * | | | Fix build attributes test, see:Lin Jen-Shin2017-02-211-3/+4
* | | | | Merge branch '26570-optimize-latest-pipeline-query' into 'master' Kamil Trzciński2017-02-231-2/+5
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Consider the case where we don't specify ref for pipelineLin Jen-Shin2017-02-201-3/+5
| * | | | Optimize Ci::Pipeline.latest queryLin Jen-Shin2017-02-201-0/+1
* | | | | Merge branch '28495-content-shifting' into 'master' Filipa Lacerda2017-02-231-10/+6
|\ \ \ \ \
| * | | | | Keep right padding the same whether sidebar is open or not28495-content-shiftingAnnabel Dunstone Gray2017-02-211-10/+6
* | | | | | Code style improvementsAlfredo Sumaran2017-02-239-19/+47
* | | | | | Merge branch 'remove-require-context-filtered-search-bundle' into 'master' Alfredo Sumaran2017-02-231-3/+9
|\ \ \ \ \ \
| * | | | | | remove require.context from filtered_search_bundleremove-require-context-filtered-search-bundleMike Greiling2017-02-221-3/+9
* | | | | | | Merge branch 'remove-require-context-graphs-bundle' into 'master' Alfredo Sumaran2017-02-231-3/+4
|\ \ \ \ \ \ \
| * | | | | | | remove require.context from graphs_bundleremove-require-context-graphs-bundleMike Greiling2017-02-221-3/+4
| |/ / / / / /
* | | | | | | Merge branch 'remove-require-context-network-bundle' into 'master' Alfredo Sumaran2017-02-231-3/+2
|\ \ \ \ \ \ \
| * | | | | | | remove require.context from network_bundleremove-require-context-network-bundleMike Greiling2017-02-221-3/+2
| |/ / / / / /
View Lorry Controller Status