home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 13:16:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,056 Commits 48 Branches 340 Tags
v8.5.13
Commit Graph
52 Commits
Author SHA1 Message Date
Robert SpeicherandRémy Coutable 03a156224b Merge branch 'issue_13539' into 'master' 
Reopened MRs should also be considered as open.

Fixes #13539 

See merge request !2866
 2016-02-18 13:00:45 +01:00
Rémy Coutable 3d3ac87af9 Redirect /import to project page if no importing at all and repo exists 
Fixes #13367.
 2016-02-17 15:05:44 +01:00
Robert Speicher f5ab126fd0 Ensure Commit#show responds 404 instead of 500 when given an invalid ID 
Closes #13467
 2016-02-15 15:48:16 -05:00
Robert Speicher 551ce0f245 Add spec for assigning view param from cookie 2016-02-05 16:03:20 -05:00
Rémy Coutable f6d816f9fe Add a controller test for the new 'diff_view' cookie 2016-02-05 15:40:44 +01:00
Douglas Barbosa Alexandre 46c36e0e01 Fixi import redirect loop 2016-01-25 21:00:23 -02:00
Jacob Vosmaer 41b8a238ce Merge branch 'master' of github.com:gitlabhq/gitlabhq 2016-01-07 12:56:18 +01:00
Douwe Maan 3639ebd081 Fix specs 2015-12-18 17:09:58 +01:00
Douwe Maan d9c82d679f Automatically fork a project when not allowed to edit a file. 2015-12-18 10:03:34 +01:00
Douwe Maan 51ed5225ad Merge branch 'serve_lfs_object' into 'master' 
Serve LFS object

Depends on gitlab-org/gitlab_git!57

See merge request !1976
 2015-12-08 14:19:52 +00:00
Marin Jankovski 6245be083d All for you rubocop. 2015-12-08 14:00:15 +01:00
Marin Jankovski ea5b462a14 Stub the calls to disk and check what send_file returns. 2015-12-08 13:33:12 +01:00
Marin Jankovski 9bf51ae47d Fix specs caused by update of gitlab-test repo. 2015-12-08 10:58:15 +01:00
Douglas Barbosa Alexandre 7d836a0c0a Merge branch 'master' into fix-merge-request-that-removes-submodule 2015-12-07 13:09:01 -02:00
Marin Jankovski e53b350cb6 Add specs for showing lfs object in UI. 2015-12-07 15:03:50 +01:00
Stan Hu 4fab178850 Fix spec that broke due to fact that iid is needed, not id, for MilestonesController 2015-12-05 00:04:44 -08:00
Douglas Barbosa Alexandre 12fdc13ad3 Fix 500 error when creating a merge request that removes a submodule 2015-12-04 17:35:14 -02:00
Minsik Yoonand윤민식 3d0efa8e0a Add ignore white space option in merge request diff 
fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393).

Add ignore whitespace optoin to Commits Compare view
 2015-11-13 16:53:53 +09:00
Stan Hu 9bfc531ec6 Redirect to a default path if HTTP_REFERER is not set 
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
 2015-10-20 07:45:48 -07:00
Douwe Maan c993481d99 Merge branch 'master' into git-archive-golang 2015-10-15 11:47:36 +02:00
Valery Sizov 8f584d5f2c Fix: Images cannot show when projects' path was changed 2015-10-14 18:50:35 +03:00
Jacob Vosmaer 381ca79bfa Remove archive file sending spec 
This is done by gitlab-git-http-server now.
 2015-10-14 15:21:14 +02:00
Stan Hu 0ab6ca93aa Add directory feature button 
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
 2015-10-07 04:22:55 -07:00
Douwe Maan 7c7b664c01 Merge branch 'master' into flevour/gitlab-ce-project-path-insensitive-lookup 2015-10-01 12:33:51 +02:00
Robert Speicher ba71542a5a Merge branch 'fix-issue-2593' into 'master' 
Fix Error 500 when comparing non-existing branches

Closes #2593

See merge request !1355
 2015-09-21 20:46:15 +00:00
Stan Hu ea5c25bb4e Remove milestones from merge requests when milestones are deleted 
Reported by https://github.com/gitlabhq/gitlabhq/issues/9643
 2015-09-21 07:00:55 -07:00
Stan Hu de8497ca56 Fix Error 500 when comparing non-existing branches 
Closes #2593
 2015-09-18 12:02:01 -07:00
Francesco Levorato 1bbcc29687 Redirect case sensitive project path to the normalized one 2015-09-18 16:37:21 +02:00
Francesco Levorato 6bff207dfd Refactor spec to go through ApplicationController#project 2015-09-18 16:37:21 +02:00
Stan Hu d3d03d1362 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".

Add "in" preposition when creating and destroying milestones

Closes #2382
 2015-09-15 05:51:11 -07:00
pilsner 4144c59941 add Content-Type header of raw image file 
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
 2015-09-04 13:06:02 +09:00
Stan Hu 551157960e Remove the filename argument from Content-Disposition header to avoid 
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
 2015-09-02 00:20:05 -07:00
Dmitriy Zaporozhets 3483024d93 Merge branch 'disable-internal-tracker-when-external-in-use' into 'master' 
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
 2015-08-14 11:01:43 +00:00
Stan Hu 2379057002 Provide more feedback what went wrong if HipChat service failed test 
Issue gitlab-com/support-forum#213
 2015-08-12 07:31:25 -07:00
Stan Hu 643557dabc Fix 404 error in files view after deleting the last file in a repository 
Closes #1362
 2015-07-21 14:12:43 -07:00
Stan Hu f33fe50f0d Disable internal issue tracker if external tracker in use 
Closes #2006
 2015-07-17 22:59:31 -07:00
Stan Hu df2bb60f90 Add support for destroying project milestones 
Closes https://github.com/gitlabhq/gitlabhq/issues/1504
 2015-07-17 06:54:32 -07:00
Dmitriy Zaporozhets f40b99d02e Merge branch 'master' into rubocop-for-tests 
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
 2015-06-23 10:44:03 +02:00
Stan Hu 359ed48638 Fix Style/AlignHash cop violations 2015-06-22 22:24:39 -07:00
Robert SpeicherandDmitriy Zaporozhets bf71d53f63 Change to_not calls to not_to 
Both work, but now we're consistent across the entire app.
 2015-06-22 12:13:49 +02:00
Robert Speicher bc027c5183 Load the Merge Request > Commits tab lazily 2015-06-17 16:59:51 -04:00
Robert Speicher 5c78d7fce8 Move Projects::MergeRequestsController spec to its correct location 2015-06-17 16:37:11 -04:00
Stan Hu bf4b438459 Fix bug where avatar filenames were not actually deleted from the database 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
 2015-05-07 10:00:35 -07:00
Stan Hu ee92dd1683 Unescape branch names in compare commit 
Closes #1399
Closes https://github.com/gitlabhq/gitlabhq/issues/9105
 2015-04-30 12:44:46 -07:00
Douwe Maan 1615d3de39 Add tests. 2015-04-17 11:33:58 +02:00
Robert Speicher 167a6b9eef Render a 404 when RefsController#logs_tree gets an HTML request 
Fixes #2152
 2015-04-06 23:08:28 -04:00
Douwe Maan 91761b0685 Add tests. 2015-03-31 13:37:21 +02:00
Stan Hu 4bc5c66fe1 Fix broken project_url routing when protected branches are accessed with an empty repo 2015-03-01 20:26:21 -08:00
Douwe Maan 769d1ce64b Fix spec. 2015-02-24 16:10:55 +01:00
Douwe Maan 0283fff591 Merge branch 'master' into extend_markdown_upload 
# Conflicts:
#	app/views/projects/issues/_form.html.haml
#	app/views/projects/merge_requests/_form.html.haml
#	app/views/projects/merge_requests/_new_submit.html.haml
#	app/views/projects/milestones/_form.html.haml
#	app/views/projects/notes/_form.html.haml
#	app/views/projects/wikis/_form.html.haml
#	config/routes.rb
#	spec/controllers/projects_controller_spec.rb
 2015-02-24 14:54:39 +01:00