summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rs-fix-spec-warnings' into 'master' Robert Speicher2015-09-214-4/+8
|\ | | | | | | | | Ensure raise_error expectations provide arguments See merge request !1381
| * Ensure raise_error expectations provide argumentsrs-fix-spec-warningsRobert Speicher2015-09-214-4/+8
| |
* | Merge branch 'fix-issue-2593' into 'master' Robert Speicher2015-09-211-0/+26
|\ \ | | | | | | | | | | | | | | | | | | Fix Error 500 when comparing non-existing branches Closes #2593 See merge request !1355
| * | Fix Error 500 when comparing non-existing branchesfix-issue-2593Stan Hu2015-09-181-0/+26
| | | | | | | | | | | | Closes #2593
* | | Merge branch 'rs-relative-link-up-one' into 'master' Robert Speicher2015-09-211-4/+22
|\ \ \ | |_|/ |/| | | | | | | | Allow relative links to go up one directory level See merge request !1352
| * | Allow RelativeLinkFilter to go up multiple directoriesrs-relative-link-up-oneRobert Speicher2015-09-201-0/+8
| | |
| * | Allow relative links to go up one directory levelRobert Speicher2015-09-181-4/+14
| | |
* | | Merge branch 'rename-reply-by-email' into 'master' Robert Speicher2015-09-215-91/+66
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Rename reply_by_email to incoming_email to prepare for the future. Closes #2579. See merge request !1367
| * \ \ Merge branch 'master' into rename-reply-by-emailDouwe Maan2015-09-212-0/+24
| |\ \ \
| * | | | Rename reply_by_email to incoming_email to prepare for the future.Douwe Maan2015-09-215-91/+66
| | | | |
* | | | | Remove milestones from merge requests when milestones are deletedStan Hu2015-09-211-0/+6
| |/ / / |/| | | | | | | | | | | Reported by https://github.com/gitlabhq/gitlabhq/issues/9643
* | | | Merge branch 'fail-ci-builds-without-yml' into 'master' Dmitriy Zaporozhets2015-09-211-0/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fail ci builds without yml Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/2551 See merge request !1349
| * | | | Rubocop fixfail-ci-builds-without-ymlKamil Trzcinski2015-09-201-1/+1
| | | | |
| * | | | Fail builds if no .gitlab-ci.yml is foundKamil Trzcinski2015-09-201-0/+13
| |/ / /
* | | | Merge branch 'fix-markdown-links-in-dashboard' into 'master' Douwe Maan2015-09-211-0/+11
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix Markdown links not showing up in dashboard activity feed Closes #2586 See merge request !1353
| * | | Fix Markdown links not showing up in dashboard activity feedStan Hu2015-09-201-0/+11
| | | | | | | | | | | | | | | | Closes #2586
* | | | Merge branch 'jwt' into 'master' Douwe Maan2015-09-201-3/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed format validation **What does this MR do?** Removals format validation for drone token **Are there points in the code the reviewer needs to double check?** Nothing **Why was this MR needed?** because drone migrated to JWT tokens and JWT token doesn't valid with current format ( i don't know how many symbols JWT can use for this ) See merge request !1359
| * | | | Removed format validationKirilll Zaitsev2015-09-191-3/+0
| |/ / /
* | | | Bump devise-two-factor to 2.0.0rs-bump-two-factorRobert Speicher2015-09-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605 See https://github.com/tinfoil/devise-two-factor/pull/43
* | | | Devise 3.5.x deprecates `confirm!` in favor of `confirm`Robert Speicher2015-09-192-4/+4
|/ / /
* | | remove API calls from CE to CIci_closer_integrationValery Sizov2015-09-189-152/+11
|/ /
* | Fix CI status in the MR pageValery Sizov2015-09-182-22/+5
|/
* Merge branch 'ci_projects_order' into 'master' Valery Sizov2015-09-181-1/+1
|\ | | | | | | | | | | | | Fix: ci projects order https://gitlab.com/gitlab-org/gitlab-ce/issues/2553 See merge request !1333
| * Fix: ci projects orderci_projects_orderValery Sizov2015-09-171-1/+1
| |
* | Merge pull request #9618 from pjknkda/repo-info-to-issue-hookStan Hu2015-09-171-0/+16
|\ \ | | | | | | add repository field to issue hook data
| * | add repository field to issue hook dataJungkook Park2015-09-171-0/+16
| | | | | | | | | | | | | | | | | | add a test for to_hook_data of issue model update CHANGELOG
* | | Merge branch 'fix-issue-2382' into 'master'Stan Hu2015-09-172-0/+14
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a "destroyed Milestone" event and keep Milestone events around in the DB for posterity Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone". Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c89cc8a0a9fa549deac433f17b890913/image.png) Closes #2382 See merge request !1227
| * | Create a "destroyed Milestone" event and keep Milestone events around in the DBStan Hu2015-09-152-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for posterity. Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone". Add "in" preposition when creating and destroying milestones Closes #2382
* | | Merge branch 'restrict-user-api-integers' into 'master'Dmitriy Zaporozhets2015-09-171-0/+56
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | Restrict users API endpoints to use integer IDs Closes #2267 See merge request !1156
| * | Restrict users API endpoints to use integer IDsStan Hu2015-08-231-0/+56
| | | | | | | | | | | | Closes #2267
* | | Merge branch 'ldap-attributes' into 'master'Robert Speicher2015-09-164-5/+70
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow configuration of LDAP attributes GitLab will use for the new user account. Fixes #2412. See merge request !1261
| * | | Test overriding LDAP attributesDouwe Maan2015-09-091-0/+65
| | | |
| * | | Add attributes to LDAP::Config.Douwe Maan2015-09-081-1/+1
| | | |
| * | | Allow configuration of LDAP attributes GitLab will use for the new user account.Douwe Maan2015-09-082-4/+4
| | | |
* | | | Make rubocop happyKamil Trzcinski2015-09-161-1/+1
| | | |
* | | | Fix CI testsKamil Trzcinski2015-09-161-2/+2
| | | |
* | | | Fix ordering issueKamil Trzcinski2015-09-161-0/+18
| | | |
* | | | Merge remote-tracking branch 'origin/master' into ↵ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gKamil Trzcinski2015-09-161-12/+13
|\ \ \ \ | | | | | | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
| * | | | Fix broken sort in merge request APIStan Hu2015-09-151-12/+13
| | |_|/ | |/| | | | | | | | | | Closes #2266
* | | | Fix backup testsKamil Trzcinski2015-09-162-3/+4
| | | |
* | | | Fix: models/ci/project_spec.rb once againKamil Trzcinski2015-09-151-1/+1
| | | |
* | | | Fix models/ci/mail_service_spec.rbKamil Trzcinski2015-09-151-10/+10
| | | | | | | | | | | | | | | | | | | | - Change Notify to Ci::Notify - Downgrade sidekiq to fix CE errors: otherwise we need to check deliverables
* | | | Revert "Fix: models/ci/mail_service_spec.rb"Kamil Trzcinski2015-09-151-18/+33
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 345ff6cbf93eca5d61218f28d5f4d9eb2d4abf67. This requires sidekiq >= 3.4 and fixed all other CE tests
* | | | Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2015-09-1511-32/+61
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g # Conflicts: # Gemfile.lock
| * | | Merge branch 'public_profiles' into 'master'Dmitriy Zaporozhets2015-09-143-17/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make all group public https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1219# Internal issue - https://dev.gitlab.org/gitlab/gitlabhq/issues/1361 See merge request !1247
| | * | | Fix tests and improve wordingDmitriy Zaporozhets2015-09-141-2/+2
| | | | |
| | * | | Fix tests for group accessDmitriy Zaporozhets2015-09-141-6/+6
| | | | |
| | * | | Make all group publicValery Sizov2015-09-093-21/+11
| | | | |
| * | | | Merge branch 'forked-repo-creation-async' into 'master'Dmitriy Zaporozhets2015-09-143-3/+42
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import forked repositories asynchronously to prevent large repositories from timing out Preserve synchronous mode of adding a repository since some tasks (e.g. restore/check) require the former. One side bug fix is that the `ProjectCacheWorker` is also run, updating the repository size and commit numbers properly. Previously all the values were set to 0 when a project were forked. * Closes #2388 * Closes #2400 See merge request !1231
| | * | | | Import forked repositories asynchronously to prevent large repositories from ↵Stan Hu2015-09-113-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timing out Use import_status to track async import status and give feedback to the user Closes #2388 Closes #2400
View Lorry Controller Status