summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Enable Rails/DelegateDouwe Maan2017-02-233-9/+3
|
* Enable Style/WordArrayDouwe Maan2017-02-2344-121/+116
|
* Enable Style/MultilineHashBraceLayoutDouwe Maan2017-02-2312-83/+77
|
* Enable Style/MultilineArrayBraceLayoutDouwe Maan2017-02-235-70/+100
|
* Enable Style/EmptyLineBetweenDefsDouwe Maan2017-02-231-0/+2
|
* Enable Style/ClassCheckDouwe Maan2017-02-233-3/+3
|
* Prefer leading style for Style/DotPositionDouwe Maan2017-02-23295-2424/+2424
|
* Fix another specDouwe Maan2017-02-231-1/+1
|
* Fix code for copsDouwe Maan2017-02-2311-32/+35
|
* Fix specsDouwe Maan2017-02-235-11/+12
|
* Enable Style/ConditionalAssignmentDouwe Maan2017-02-233-9/+9
|
* Enable Style/ColonMethodCallDouwe Maan2017-02-2315-20/+20
|
* Enable Style/BarePercentLiteralsDouwe Maan2017-02-2321-40/+40
|
* Enable Security/JSONLoadDouwe Maan2017-02-233-4/+4
|
* Enable Lint/UnifiedIntegerDouwe Maan2017-02-235-10/+10
|
* Enable Performance/RedundantMergeDouwe Maan2017-02-232-3/+3
|
* Enable Style/SpaceInsideBracketsDouwe Maan2017-02-2319-52/+52
|
* Enable Style/MutableConstantDouwe Maan2017-02-237-45/+45
|
* Enable Style/DotPositionDouwe Maan2017-02-23110-558/+558
|
* Merge branch 'cs-upgrade-licensee' into 'master' 27950-check-ci-statusRémy Coutable2017-02-234-14/+14
|\ | | | | | | | | Update Licensee from 8.0.0 to 8.7.0. See merge request !9451
| * Update Licensee from 8.0.0 to 8.7.0.cs-upgrade-licenseeConnor Shea2017-02-224-14/+14
| | | | | | | | Changelog: https://github.com/benbalter/licensee/releases
* | Merge branch '26900-pipelines-tabs' into 'master' Kamil Trzciński2017-02-233-16/+65
|\ \ | | | | | | | | | | | | | | | | | | Resolve "CI - Pipelines and Builds screens are inconsistent" Closes #26900 See merge request !9265
| * | Adds missing tests for all status accepted in scopeFilipa Lacerda2017-02-232-16/+28
| | |
| * | Merge branch 'master' into 26900-pipelines-tabs26900-pipelines-tabsFilipa Lacerda2017-02-23176-1416/+5057
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-163-3/+40
| | | | | | | | | | | | | | | | Fix broken test
* | | | Merge branch 'fix-test-for-build-attributes' into 'master' Kamil Trzciński2017-02-231-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix build attributes test See merge request !9409
| * | | | Fix build attributes test, see:Lin Jen-Shin2017-02-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'api-notes-entity-fields' into 'master' Sean McGivern2017-02-232-0/+509
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deprecated `upvotes` and `downvotes` from the notes API Closes #28441 See merge request !9384
| * \ \ \ \ Merge branch 'master' into 'api-notes-entity-fields'api-notes-entity-fieldsRobert Schilling2017-02-229-8/+173
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # doc/api/v3_to_v4.md
| * | | | | | Remove deprecated `upvotes` and `downvotes` from the notes APIRobert Schilling2017-02-222-0/+509
| | | | | | |
* | | | | | | Rebase to master for avoiding failing testsGeorge Andrinopoulos2017-02-231-0/+14
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'update-ci-skip-regex-to-accept-underscores-and-hyphens' into ↵Robert Speicher2017-02-221-42/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-42/+29
| | | | | | |
* | | | | | | Merge branch 'add-issues-tooltip' into 'master' Alfredo Sumaran2017-02-222-2/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tooltip to add issues button on issue boards Closes #27985 See merge request !9142
| * | | | | | | Added testsadd-issues-tooltipPhil Hughes2017-02-212-2/+8
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'newline-after-file-attachment-notes' into 'master' Alfredo Sumaran2017-02-221-0/+9
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added double newline after file upload markdown insert Closes #28511 See merge request !9430
| * | | | | | Added double newline after file upload markdown insertLuke "Jared" Bennett2017-02-221-0/+9
| | | | | | |
* | | | | | | Merge branch ↵Clement Ho2017-02-225-1/+97
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'gamesover/gitlab-ce-broken_iamge_when_doing_offline_update_check(help_page)' into 'master' Gamesover/gitlab ce broken iamge when doing offline update check(help page) See merge request !8539
| * | | | | | added specs for version check imagegamesover/gitlab-ce-broken_iamge_when_doing_offline_update_check(help_page)Luke "Jared" Bennett2017-02-225-1/+97
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'connection-pool-host' into 'master'Rémy Coutable2017-02-221-3/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow setting of a custom connection pool host See merge request !9445
| * | | | | | Allow setting of a custom connection pool hostYorick Peterse2017-02-221-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows you to set a custom host when calling Gitlab::Database.create_connection_pool. This is necessary for load balancing as in this case we want to inherit all settings except for the hostname.
* | | | | | | Merge branch 'feature/brand-logo-in-emails' into 'master' Sean McGivern2017-02-221-0/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Custom brand header logo in emails Closes #24969 and #25570 See merge request !9049
| * | | | | | | restrict height of the custom brand logo in emailsAlexis Reigel2017-02-221-1/+1
| | | | | | | |
| * | | | | | | use custom brand logo in pipeline mailsAlexis Reigel2017-02-221-0/+32
| | | | | | | |
* | | | | | | | Merge branch 'add_mr_info_to_issues_list' into 'master'Sean McGivern2017-02-221-0/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add merge request count to each issue on issues list Closes #19786 and #23208 See merge request !9252
| * | | | | | | | Refactored specsblackst0ne2017-02-221-2/+2
| | | | | | | | |
| * | | | | | | | Refactored specsblackst0ne2017-02-221-8/+8
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into add_mr_info_to_issues_listblackst0ne2017-02-21129-830/+2525
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Improved specsblackst0ne2017-02-211-7/+11
| | | | | | | | | |
| * | | | | | | | | Fixed rubocop offensesblackst0ne2017-02-181-4/+4
| | | | | | | | | |
View Lorry Controller Status