summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Satisfy Rubocopjrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan2015-10-181-7/+6
|
* Fix spec.Douwe Maan2015-10-181-33/+53
|
* Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan2015-10-184-53/+38
|\
| * Merge branch 'master' into git-archive-golanggit-archive-golangDouwe Maan2015-10-153-25/+38
| |\
| | * Fix: Images cannot show when projects' path was changeduploads_path_fixValery Sizov2015-10-141-2/+2
| | |
| | * Merge branch 'cleanup-ci-pages' into 'master' Dmitriy Zaporozhets2015-10-071-23/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup CI pages - [x] Remove `ci/projects/:id` page - [x] Remove Continuous integration from project menu - [x] Remove unused css/js - [x] Remove Ci::Commit and Ci::Build controllers - [x] Move CI services to project settings area cc @ayufan Part of #2594 See merge request !1529
| | | * Move CI services to project settings areaDmitriy Zaporozhets2015-10-071-23/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Add directory feature buttonStan Hu2015-10-071-0/+36
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change "+" icon under "Files" section to have three options: * Create file * Upload file * New directory Upload file is no longer accessible from the "Create file" page. Users can now select a target branch in upload file as well. Closes #2799: Fixes a bug where file modes were overwritten after a commit Closes https://github.com/gitlabhq/gitlabhq/issues/8253: Existing files can no longer be overwritten in the "Create file" section. Closes #2557
| * | Remove archive file sending specJacob Vosmaer2015-10-141-28/+0
| |/ | | | | | | This is done by gitlab-git-http-server now.
* | Send an email (to support) when a user is reported for spamJonathan Rochkind2015-10-081-0/+53
|/
* Merge branch 'master' into flevour/gitlab-ce-project-path-insensitive-lookupDouwe Maan2015-10-017-104/+76
|\
| * WIPKamil Trzcinski2015-09-291-8/+4
| |
| * Merge branch 'fxposter/gitlab-ce-login-from-admin'Douwe Maan2015-09-281-0/+15
| |\
| | * Move login button to user page, switched to POST methodPavel Forkert2015-09-241-3/+3
| | |
| | * Add option to admin area to sign in as a specific userPavel Forkert2015-09-241-0/+15
| | | | | | | | | | | | Closes #2291
| * | Add user preference to view project activity and starred project activity as ↵Stan Hu2015-09-261-1/+23
| |/ | | | | | | | | | | default dashboard Closes #2662
| * Remove test for non existing functionalitycleanup-ci-dashboardDmitriy Zaporozhets2015-09-231-50/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * 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
| * | Remove milestones from merge requests when milestones are deletedStan Hu2015-09-211-0/+6
| | | | | | | | | | | | Reported by https://github.com/gitlabhq/gitlabhq/issues/9643
| * | 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
| * | remove API calls from CE to CIci_closer_integrationValery Sizov2015-09-181-43/+0
| |/
* | Fix indentationFrancesco Levorato2015-09-181-2/+2
| |
* | Redirect case sensitive project path to the normalized oneFrancesco Levorato2015-09-182-0/+20
| |
* | Refactor spec to go through ApplicationController#projectFrancesco Levorato2015-09-181-4/+4
|/
* 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 branch 'fix-issue-2382' into 'master'Stan Hu2015-09-171-0/+4
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | 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-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | 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 remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2015-09-153-18/+8
|\ \ | |/ | | | | | | | | | | 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-142-14/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |
| | * Make all group publicValery Sizov2015-09-092-12/+2
| | |
| * | Merge branch 'master' into dashboard-titlesdashboard-titlesDouwe Maan2015-09-101-0/+39
| |\ \ | | |/
| * | Move partial to right place and fix tests.Douwe Maan2015-09-081-4/+4
| | |
* | | Fix ci/projects_controller_spec.rbKamil Trzcinski2015-09-151-27/+9
| | |
* | | fix specs. Stage 5Valery Sizov2015-09-151-5/+8
| | |
* | | rubocop satisfyValery Sizov2015-09-141-9/+9
| | |
* | | Fix more testsDmitriy Zaporozhets2015-09-101-3/+3
| | |
* | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-092-0/+76
|\ \ \ | | |/ | |/|
| * | FogBugz project importJared Szechy2015-09-081-0/+39
| |/
| * add Content-Type header of raw image filepilsner2015-09-041-0/+14
| | | | | | | | | | | | | | | | | | Add Content-Type header to fix a bug which IE can't show image in markdown when the image is from raw. modified: CHANGELOG modified: app/controllers/projects/raw_controller.rb modified: spec/controllers/projects/raw_controller_spec.rb
| * Remove the filename argument from Content-Disposition header to avoidStan Hu2015-09-021-0/+23
| | | | | | | | | | | | | | | | | | | | | | RFC 5987 and RFC 6266 encoding issues. This change allows the browser to determine the filename based on the URL. See: http://greenbytes.de/tech/tc2231/ Closes https://github.com/gitlabhq/gitlabhq/issues/9595 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1829
* | Refactor CI testsDmitriy Zaporozhets2015-09-091-9/+9
| |
* | Merge CI factories and CI spec/support with GitLabDmitriy Zaporozhets2015-09-092-0/+135
|/
* Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLabStan Hu2015-08-233-23/+48
| | | | | | | | | | | | | | | | | | | | | | | and request them each session. Pass these tokens to the project import data. This prevents the need to encrypt these tokens and clear them in case they expire or get revoked. For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get an Error 500 with no way to recover: ``` Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000 Processing by Import::BitbucketController#status as HTML Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms) NameError (uninitialized constant Import::BitbucketController::Unauthorized): app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions' app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions' app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized' ``` Closes #1871
* Merge branch 'fix-email-autocomplete' into 'master'Douwe Maan2015-08-211-1/+1
|\ | | | | | | | | | | | | | | | | | | Fix bug preventing invite by e-mail This was broken in 70f5291808 as a result of introducing the ability to filter by current user. Closes #2320 See merge request !1181
| * Fix bug preventing invite by e-mailStan Hu2015-08-211-1/+1
| | | | | | | | | | | | This was broken in 70f5291808 as a result of introducing the ability to filter by current user. Closes #2320
* | Fix blame view line groupingsStan Hu2015-08-201-0/+43
|/ | | | Closes #2305
* Merge branch 'disable-internal-tracker-when-external-in-use' into 'master'Dmitriy Zaporozhets2015-08-141-0/+37
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable internal issue tracker if external tracker in use ### What does this MR do? This MR disables routes to the internal issue tracker if an external issue tracker (e.g. Redmine) is in use. A 404 page is returned if a user attempts to access any of the issue routes. ### Why was this MR needed? Enabling the external issue tracker would still keep the internal one active, which would lead to odd behavior where users could create issues but not close them. ### What are the relevant issue numbers? Closes #2006 See merge request !993