Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Enable RSpec/NotToNot cop and auto-correct offensesrs-rubocop-nottonot | Robert Speicher | 2016-05-24 | 8 | -20/+20 |
| | | | | Also removes the note from the development/testing.md guide | ||||
* | Merge branch 'master' into project-navigation-redesign | Dmitriy Zaporozhets | 2016-05-23 | 12 | -33/+470 |
|\ | |||||
| * | Added due date tests | Phil Hughes | 2016-05-23 | 1 | -0/+37 |
| | | |||||
| * | Fix some specs which would have broken in 2017 to not break anymore by using ↵ | Connor Shea | 2016-05-22 | 2 | -6/+6 |
| | | | | | | | | a dynamic year value. | ||||
| * | Allow anonymous user to access pipelines | Kamil Trzcinski | 2016-05-23 | 1 | -0/+6 |
| | | |||||
| * | Merge branch 'issuable-new-due-date' into 'master' | Jacob Schatz | 2016-05-21 | 1 | -1/+59 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issuable form due date For some reason, this was never in the original merge request for due date? ![Screen_Shot_2016-04-22_at_21.49.44](/uploads/7d4e2b07f75a33009e3170fdb076a4bd/Screen_Shot_2016-04-22_at_21.49.44.png) Closes #15516 See merge request !3895 | ||||
| | * | Fixed rubocop issues | Phil Hughes | 2016-05-16 | 1 | -3/+3 |
| | | | |||||
| | * | Added tests | Phil Hughes | 2016-05-16 | 1 | -1/+59 |
| | | | |||||
| * | | Merge branch 'zj-gitignore-dropdown' | Douwe Maan | 2016-05-20 | 1 | -0/+30 |
| |\ \ | |||||
| | * | | Dropdown implementation | Alfredo Sumaran | 2016-05-20 | 1 | -0/+30 |
| | | | | |||||
| * | | | Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename' | Douwe Maan | 2016-05-20 | 1 | -0/+4 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | # Conflicts: # app/services/system_note_service.rb | ||||
| | * | | Create DiffFilter and change SystemNoteService#change_title to use ↵ | Adam Butler | 2016-05-18 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | Gitlab::Diff::InlineDiff | ||||
| * | | | Merge branch 'feature/runner-config-untagged-jobs' into 'master' | Robert Speicher | 2016-05-19 | 1 | -0/+33 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add config for CI Runner that prevents it from picking untagged jobs Closes #3456 See merge request !4039 | ||||
| | * | | | Minor runner-related code refactorings | Grzegorz Bizon | 2016-05-19 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Update specs to be valid only for tagged runner | Grzegorz Bizon | 2016-05-19 | 1 | -9/+13 |
| | | | | | |||||
| | * | | | Extend runner config options for untagged jobs | Grzegorz Bizon | 2016-05-19 | 1 | -0/+29 |
| | | | | | |||||
| * | | | | Merge branch 'with-pipeline-view' into 'master' | Douwe Maan | 2016-05-19 | 1 | -0/+153 |
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pipeline view This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3653 cc @DouweM @grzesiek Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17551 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15625 See merge request !3703 | ||||
| | * | | | Use pipelines.errors when communicating the error | Kamil Trzcinski | 2016-05-18 | 1 | -4/+11 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'origin/master' into with-pipeline-view | Kamil Trzcinski | 2016-05-16 | 4 | -11/+54 |
| | |\ \ \ | | | |/ / | |||||
| | * | | | Merge remote-tracking branch 'origin/master' into with-pipeline-view | Kamil Trzcinski | 2016-05-13 | 9 | -0/+475 |
| | |\ \ \ | |||||
| | * | | | | Fix specs | Kamil Trzcinski | 2016-05-13 | 1 | -9/+12 |
| | | | | | | |||||
| | * | | | | Added pipelines spec | Kamil Trzcinski | 2016-05-13 | 1 | -5/+123 |
| | | | | | | |||||
| | * | | | | Initial specs for pipelines | Kamil Trzcinski | 2016-05-13 | 1 | -0/+25 |
| | | | | | | |||||
| * | | | | | Merge branch 'project-variables-ui' into 'master' | Jacob Schatz | 2016-05-19 | 1 | -16/+45 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project variables UI ![Screen_Shot_2016-04-27_at_09.01.23](/uploads/cb9b1ac42aa734cfd3271c03dfaccc12/Screen_Shot_2016-04-27_at_09.01.23.png) ![Screen_Shot_2016-04-27_at_09.01.29](/uploads/4f317014d60f205a0e29497ad20f8a2e/Screen_Shot_2016-04-27_at_09.01.29.png) Closes #14091 See merge request !3942 | ||||
| | * | | | | | Updated project variable tests | Phil Hughes | 2016-05-16 | 1 | -16/+45 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Use container registry config stub | Kamil Trzcinski | 2016-05-16 | 1 | -6/+1 |
| | | | | | | |||||
| * | | | | | Improve test coverage | Kamil Trzcinski | 2016-05-16 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge remote-tracking branch 'origin/master' into docker-registry-view | Kamil Trzcinski | 2016-05-16 | 4 | -11/+54 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge branch 'issue_14684' into 'master' | Douwe Maan | 2016-05-16 | 1 | -10/+35 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Toggle email signup confirmation in admin settings Implements toggling verification email #14684 See merge request !3862 | ||||
| | | * | | | | Change landing page when skipping confirmation email and add documentation | Felipe Artur | 2016-05-16 | 1 | -11/+34 |
| | | | | | | | |||||
| | | * | | | | Change skip_user_confirmation_email to send_user_confirmation_email | Felipe Artur | 2016-05-16 | 1 | -0/+2 |
| | | |/ / / | |||||
| | * | | | | Merge branch 'unexpected-filtering-on-merge-requests' into 'master' | Rémy Coutable | 2016-05-16 | 1 | -0/+15 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests for unintentional filtering bug in MR !3872 has a lack of tests for Merge Requests while !3872 has only ones for Issues. This MR has complementary tests for MR list. See merge request !4154 | ||||
| | | * | | | | Add tests for unintentional filtering bug in MR (cf. !3872) | Takuya Noguchi | 2016-05-15 | 1 | -0/+15 |
| | | |/ / / | |||||
| | * | | | | Force password change after admin reset13691-allow-admin-to-reset-user-password-and-force-password-reset-on-next-login | Sean McGivern | 2016-05-16 | 1 | -0/+3 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | When an admin changes a user's password for them, force the user to reset the password after logging in by expiring the new password immediately. | ||||
| * | | | | Merge branch 'docker-registry' into docker-registry-view | Kamil Trzcinski | 2016-05-14 | 1 | -1/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Merge branch 'docker-registry' into docker-registry-view | Kamil Trzcinski | 2016-05-13 | 9 | -0/+475 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | Merge branch 'docker-registry' into docker-registry-view | Kamil Trzcinski | 2016-05-13 | 1 | -1/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/jwt_controller.rb # app/services/jwt/container_registry_authentication_service.rb | ||||
| * | | | | Fix CI tests | Kamil Trzcinski | 2016-05-12 | 1 | -3/+9 |
| | | | | | |||||
| * | | | | Added Docker Registry View tests | Kamil Trzcinski | 2016-05-09 | 1 | -0/+43 |
| |/ / / | |||||
* | | | | Fix spec for new project navigation | Dmitriy Zaporozhets | 2016-05-16 | 2 | -5/+2 |
| |_|/ |/| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Update specs | Douwe Maan | 2016-05-13 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Fix minor typos in admin health check page | Drew Blessing | 2016-05-12 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'default-scope-on-builds-page' into 'master' | Robert Speicher | 2016-05-12 | 2 | -0/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a description for default scope on builds Should be "**All* builds (from this project)" for the {project,admin} builds page without scope. Fix a regression on !2243 (#4240). See merge request !4118 | ||||
| * | | Fix a description for default scope on builds | Takuya Noguchi | 2016-05-13 | 2 | -0/+2 |
| | | | |||||
* | | | Merge branch 'health-check-route' | Douwe Maan | 2016-05-12 | 1 | -0/+55 |
|\ \ \ | |/ / |/| | | | | | | | | # Conflicts: # db/schema.rb | ||||
| * | | Add tests for the health check feature | DJ Mountney | 2016-05-10 | 1 | -0/+55 |
| | | | |||||
* | | | Fix an issue when filtering merge requests with more than one label | Rémy Coutable | 2016-05-10 | 1 | -0/+137 |
|/ / | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Add integration specs for tags | Rémy Coutable | 2016-05-10 | 4 | -0/+218 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch 'rs-backport-ee-372' into 'master' | Rémy Coutable | 2016-05-09 | 1 | -0/+63 |
|\ \ | |/ |/| | | | | | | | | | Backport changes from gitlab-org/gitlab-ee!372 Mostly replaces several Spinach tests with RSpec Feature tests. See merge request !4043 | ||||
| * | Backport changes from gitlab-org/gitlab-ee!372rs-backport-ee-372 | Robert Speicher | 2016-05-04 | 1 | -0/+63 |
| | | | | | | | | Mostly replaces several Spinach tests with RSpec Feature tests. |