summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fix new offensesdm-meer-blauw-op-straatDouwe Maan2017-02-231-4/+4
|
* Revert "Enable Style/DotPosition"Douwe Maan2017-02-2357-225/+225
| | | | | | | | | | | | | | | This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9. # Conflicts: # .rubocop.yml # .rubocop_todo.yml # lib/gitlab/ci/config/entry/global.rb # lib/gitlab/ci/config/entry/jobs.rb # spec/lib/gitlab/ci/config/entry/factory_spec.rb # spec/lib/gitlab/ci/config/entry/global_spec.rb # spec/lib/gitlab/ci/config/entry/job_spec.rb # spec/lib/gitlab/ci/status/build/factory_spec.rb # spec/lib/gitlab/incoming_email_spec.rb
* Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-23117-524/+524
| | | | This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
* Revert "Enable Style/BarePercentLiterals"Douwe Maan2017-02-232-2/+2
| | | | This reverts commit 96bef54154e669f9a3e92c3a4bc76c0be3a52e48.
* 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 '26900-pipelines-tabs' into 'master' Kamil Trzciński2017-02-234-9/+33
|\ | | | | | | | | | | | | Resolve "CI - Pipelines and Builds screens are inconsistent" Closes #26900 See merge request !9265
| * Merge branch 'master' into 26900-pipelines-tabs26900-pipelines-tabsFilipa Lacerda2017-02-23286-1830/+1751
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (361 commits) Code style improvements remove require.context from network_bundle remove require.context from graphs_bundle remove require.context from filtered_search_bundle Ignore two Rails CVEs in bundler:audit job Remove Pages readme Change Pages redirect Add missing index.md to Pages docs Added double newline after file upload markdown insert Reorder main index items in Pages overview remove html comments remove <> wrapping text - part 3 wrapping text - part 2 [ci skip] fix link wrap text - part 1 - [ci skip] typo fix spelling, add intermediate cert link Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag remove link to unfinished video ...
| * | Adds Pending and Finished tabs to pipelines pageFilipa Lacerda2017-02-164-9/+33
| | | | | | | | | | | | Fix broken test
* | | Merge branch 'fix-test-for-build-attributes' into 'master' Kamil Trzciński2017-02-231-3/+4
|\ \ \ | | | | | | | | | | | | | | | | Fix build attributes test See merge request !9409
| * | | We actually want to clone project and remove gl_project_idfix-test-for-build-attributesLin Jen-Shin2017-02-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | in the future. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9409#note_23859361
| * | | Fix build attributes test, see:Lin Jen-Shin2017-02-211-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9021#note_23782188 This is discovered by https://gitlab.com/gitlab-org/gitlab-ce/builds/10815456 I removed `gl_project_id` and this is failing. I took some look, realizing that: * `trace` is duplicated in `attributes` * `tag_list` is not included in `build.attributes` * `artifacts_expire_at` is missing in `attributes` So we need to: * Remove duplicated `trace` in `attributes` (40 -> 39) * Remove `tag_list` in `attributes` (39 -> 38) * Add `artifacts_expire_at` to `attributes` (38 -> 39) * Add `gl_project_id` to `attributes` (39 -> 40)
* | | | Merge branch '26570-optimize-latest-pipeline-query' into 'master' Kamil Trzciński2017-02-231-2/+5
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Optimize Ci::Pipeline.latest query Closes #26570 See merge request !9306
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we already know which ref we want, we could filter it out first. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/issues/26570#note_23423376 Closes #26570
* | | | Merge branch '28495-content-shifting' into 'master' Filipa Lacerda2017-02-231-10/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep right padding the same whether sidebar is open or not Closes #28495 See merge request !9422
| * | | | 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_bundle See merge request !9460
| * | | | | 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_bundle See merge request !9459
| * | | | | | 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_bundle See merge request !9458
| * | | | | | remove require.context from network_bundleremove-require-context-network-bundleMike Greiling2017-02-221-3/+2
| |/ / / / /
* | | | | | Merge branch 'update-ci-skip-regex-to-accept-underscores-and-hyphens' into ↵Robert Speicher2017-02-221-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' updated ci skip regex to accept underscores and hyphens See merge request !9130
| * | | | | updated ci skip regex to accept underscores and hyphensupdate-ci-skip-regex-to-accept-underscores-and-hyphensLuke "Jared" Bennett2017-02-221-1/+2
| | | | | |
* | | | | | Merge branch '22466-task-list-alignment' into 'master' Annabel Dunstone Gray2017-02-223-11/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align Task List Checkboxes Closes #22466 See merge request !6487
| * | | | | | Position task list checkbox to match the list indentJared Deckard2017-02-103-11/+31
| | | | | | |
* | | | | | | Merge branch 'add-issues-tooltip' into 'master' Alfredo Sumaran2017-02-221-3/+39
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tooltip to add issues button on issue boards Closes #27985 See merge request !9142
| * | | | | | | Added tooltip to add issues button on issue boardsPhil Hughes2017-02-211-3/+39
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Closes #27985
* | | | | | | Merge branch 'newline-after-file-attachment-notes' into 'master' Alfredo Sumaran2017-02-221-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added double newline after file upload markdown insert Closes #28511 See merge request !9430
View Lorry Controller Status