Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move a few controller specs to their correct locationsrs-move-controller-specs | Robert Speicher | 2016-02-18 | 3 | -0/+158 |
| | |||||
* | Reopened MRs should also be considered as open.issue_13539 | Rubén Dávila | 2016-02-17 | 1 | -0/+34 |
| | |||||
* | Merge branch 'git-archive-refactor' into 'master' | Douwe Maan | 2016-02-17 | 1 | -8/+3 |
|\ | | | | | | | | | | | | | | | | | Refactor 'git archive' hand-off to gitlab-workhorse We have a nicer way now to hand off HTTP responses to gitlab-workhorse. Companion MR: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/36 See merge request !2675 | ||||
| * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵ | Jacob Vosmaer | 2016-02-17 | 2 | -1/+64 |
| |\ | | | | | | | | | | git-archive-refactor | ||||
| * | | First version of "git archive" headers | Jacob Vosmaer | 2016-02-02 | 1 | -8/+3 |
| | | | |||||
* | | | Redirect /import to project page if no importing at all and repo existsfix/13367-redirect-to-project-page-if-no-import | Rémy Coutable | 2016-02-17 | 1 | -0/+12 |
| |/ |/| | | | | | Fixes #13367. | ||||
* | | Ensure Commit#show responds 404 instead of 500 when given an invalid IDrs-issue-13467 | Robert Speicher | 2016-02-15 | 1 | -0/+37 |
| | | | | | | | | Closes #13467 | ||||
* | | Add spec for assigning view param from cookiekkm/gitlab-ce-user-diff-view-pref-cookie | Robert Speicher | 2016-02-05 | 1 | -5/+19 |
| | | |||||
* | | Add a controller test for the new 'diff_view' cookie | Rémy Coutable | 2016-02-05 | 1 | -1/+13 |
|/ | |||||
* | Fixi import redirect loop | Douglas Barbosa Alexandre | 2016-01-25 | 1 | -0/+109 |
| | |||||
* | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Jacob Vosmaer | 2016-01-07 | 1 | -0/+66 |
| | |||||
* | Fix specs | Douwe Maan | 2015-12-18 | 1 | -2/+2 |
| | |||||
* | Automatically fork a project when not allowed to edit a file. | Douwe Maan | 2015-12-18 | 1 | -2/+2 |
| | |||||
* | Merge branch 'serve_lfs_object' into 'master' | Douwe Maan | 2015-12-08 | 1 | -0/+34 |
|\ | | | | | | | | | | | | | Serve LFS object Depends on gitlab-org/gitlab_git!57 See merge request !1976 | ||||
| * | All for you rubocop. | Marin Jankovski | 2015-12-08 | 1 | -2/+2 |
| | | |||||
| * | Stub the calls to disk and check what send_file returns. | Marin Jankovski | 2015-12-08 | 1 | -1/+3 |
| | | |||||
| * | Fix specs caused by update of gitlab-test repo.serve_lfs_object | Marin Jankovski | 2015-12-08 | 1 | -1/+1 |
| | | |||||
| * | Add specs for showing lfs object in UI. | Marin Jankovski | 2015-12-07 | 1 | -0/+32 |
| | | |||||
* | | Merge branch 'master' into fix-merge-request-that-removes-submodule | Douglas Barbosa Alexandre | 2015-12-07 | 1 | -3/+2 |
|\ \ | |||||
| * | | Fix spec that broke due to fact that iid is needed, not id, for ↵ | Stan Hu | 2015-12-05 | 1 | -3/+2 |
| |/ | | | | | | | MilestonesController | ||||
* | | Fix 500 error when creating a merge request that removes a submodule | Douglas Barbosa Alexandre | 2015-12-04 | 1 | -0/+24 |
|/ | |||||
* | Add ignore white space option in merge request diff | Minsik Yoon | 2015-11-13 | 2 | -0/+44 |
| | | | | | | fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393). Add ignore whitespace optoin to Commits Compare view | ||||
* | Redirect to a default path if HTTP_REFERER is not set | Stan Hu | 2015-10-20 | 1 | -15/+32 |
| | | | | | | | | | | Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode, and it's possible load balancers/proxies strip the HTTP_REFERER from the request header. In these cases, default to some default path. Closes #3122 Closes https://github.com/gitlabhq/gitlabhq/issues/9731 | ||||
* | Merge branch 'master' into git-archive-golanggit-archive-golang | Douwe Maan | 2015-10-15 | 2 | -2/+38 |
|\ | |||||
| * | Fix: Images cannot show when projects' path was changeduploads_path_fix | Valery Sizov | 2015-10-14 | 1 | -2/+2 |
| | | |||||
| * | Add directory feature button | Stan Hu | 2015-10-07 | 1 | -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 spec | Jacob Vosmaer | 2015-10-14 | 1 | -28/+0 |
|/ | | | | This is done by gitlab-git-http-server now. | ||||
* | Merge branch 'master' into flevour/gitlab-ce-project-path-insensitive-lookup | Douwe Maan | 2015-10-01 | 2 | -0/+32 |
|\ | |||||
| * | Merge branch 'fix-issue-2593' into 'master' | Robert Speicher | 2015-09-21 | 1 | -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-2593 | Stan Hu | 2015-09-18 | 1 | -0/+26 |
| | | | | | | | | | | | | Closes #2593 | ||||
| * | | Remove milestones from merge requests when milestones are deleted | Stan Hu | 2015-09-21 | 1 | -0/+6 |
| |/ | | | | | | | Reported by https://github.com/gitlabhq/gitlabhq/issues/9643 | ||||
* | | Redirect case sensitive project path to the normalized one | Francesco Levorato | 2015-09-18 | 1 | -0/+6 |
| | | |||||
* | | Refactor spec to go through ApplicationController#project | Francesco Levorato | 2015-09-18 | 1 | -4/+4 |
|/ | |||||
* | Create a "destroyed Milestone" event and keep Milestone events around in the DB | Stan Hu | 2015-09-15 | 1 | -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 | ||||
* | add Content-Type header of raw image file | pilsner | 2015-09-04 | 1 | -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 avoid | Stan Hu | 2015-09-02 | 1 | -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 | ||||
* | Merge branch 'disable-internal-tracker-when-external-in-use' into 'master' | Dmitriy Zaporozhets | 2015-08-14 | 1 | -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 | ||||
| * | Disable internal issue tracker if external tracker in use | Stan Hu | 2015-07-17 | 1 | -0/+37 |
| | | | | | | | | Closes #2006 | ||||
* | | Provide more feedback what went wrong if HipChat service failed test | Stan Hu | 2015-08-12 | 1 | -0/+35 |
| | | | | | | | | Issue gitlab-com/support-forum#213 | ||||
* | | Fix 404 error in files view after deleting the last file in a repository | Stan Hu | 2015-07-21 | 1 | -0/+91 |
|/ | | | | Closes #1362 | ||||
* | Add support for destroying project milestones | Stan Hu | 2015-07-17 | 1 | -0/+28 |
| | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/1504 | ||||
* | Merge branch 'master' into rubocop-for-tests | Dmitriy Zaporozhets | 2015-06-23 | 1 | -4/+4 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/features/issues_spec.rb spec/models/forked_project_link_spec.rb spec/models/hooks/service_hook_spec.rb spec/models/hooks/web_hook_spec.rb spec/models/project_services/hipchat_service_spec.rb spec/requests/api/project_members_spec.rb spec/requests/api/projects_spec.rb spec/requests/api/system_hooks_spec.rb spec/services/archive_repository_service_spec.rb spec/support/matchers.rb spec/tasks/gitlab/backup_rake_spec.rb | ||||
| * | Change `to_not` calls to `not_to` | Robert Speicher | 2015-06-22 | 1 | -4/+4 |
| | | | | | | | | Both work, but now we're consistent across the entire app. | ||||
* | | Fix Style/AlignHash cop violations | Stan Hu | 2015-06-22 | 3 | -26/+60 |
|/ | |||||
* | Load the Merge Request > Commits tab lazily | Robert Speicher | 2015-06-17 | 1 | -15/+64 |
| | |||||
* | Move Projects::MergeRequestsController spec to its correct location | Robert Speicher | 2015-06-17 | 1 | -0/+101 |
| | |||||
* | Fix bug where avatar filenames were not actually deleted from the database ↵ | Stan Hu | 2015-05-07 | 1 | -0/+18 |
| | | | | | | | | | | | during removal. This would result in a 404 error in certain views. The `save` call was being rolled back due to an error in the validation step. Relax the validation step so that this works. Closes #1570 | ||||
* | Unescape branch names in compare commit | Stan Hu | 2015-04-30 | 1 | -0/+22 |
| | | | | | Closes #1399 Closes https://github.com/gitlabhq/gitlabhq/issues/9105 | ||||
* | Add tests. | Douwe Maan | 2015-04-17 | 1 | -0/+223 |
| | |||||
* | Render a 404 when RefsController#logs_tree gets an HTML request | Robert Speicher | 2015-04-06 | 1 | -0/+41 |
| | | | | Fixes #2152 |