Commit Graph
361 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets f2eb668348 Feature test for New file feature
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-05 10:45:23 +02:00
Johannes Schleifenbaum d9deb24f3a Preselect the current issue tracker with selected="selected"
The previous behavior was, that the first element of the select was
preselected, thus upon saving the project, the previous selected could
be overwritten.
2013-11-01 15:33:47 +01:00
Dmitriy Zaporozhets 2b555306a1 Prevent 500 error if cant detect branches for commit 2013-10-23 19:29:29 +03:00
Jacob Vosmaer 5717304098 Merge pull request #5359 from dpursehouse/update-some-labels
Minor grammatical updates in some of the labels.
2013-10-21 07:45:09 -07:00
Dmitriy Zaporozhets be7eb8e3c2 Fix test 2013-10-21 14:06:17 +03:00
Dmitriy Zaporozhets 92b3612025 Improve project_merge_requests.rb feature steps 2013-10-21 09:55:41 +03:00
David Pursehouse 20ea670e67 Remove "is" from labels 2013-10-18 13:28:49 +09:00
Angus MacArthur aefe2e952f Fixing unsafe use of Thread.current variable :current_user 2013-10-16 01:20:53 -04:00
Marin Jankovski e649ea2fc5 Links in Readme in tree view. 2013-10-14 16:47:46 +02:00
Marin Jankovski ad3defa3c2 Skip relative links render in help page. 2013-10-11 21:41:33 +02:00
Marin Jankovski f40e0171db Test if markdown is rendered properly. 2013-10-11 13:44:00 +02:00
Dmitriy Zaporozhets e50c0d5cb7 Fix spinach profile tests 2013-10-09 17:01:04 +03:00
Dmitriy Zaporozhets 87ffd67617 Improve Profile settings UI 2013-10-09 12:30:49 +03:00
Steven Thonus 65cad57a35 avatar upload on profile page 2013-10-09 09:05:09 +02:00
Boyan Tabakov d8562cc9a1 Added Flowdock integration support via a service.
Added test for the FlowdockService.
2013-09-29 20:31:08 +03:00
Dmitriy Zaporozhets 72dd8011a7 rewrite issues search test to prevent ajax requests running after test 2013-09-27 16:25:24 +03:00
Dmitriy Zaporozhets 12dd7d2a9a Fix issues search test 2013-09-26 19:05:55 +03:00
Dmitriy Zaporozhets 8063672add Add sleep in tests to prevent random failing when next test starts before ajax requests for old one in progress 2013-09-26 16:00:11 +03:00
Dmitriy Zaporozhets ff765bb27e Remove issues search rspec since we test it with spinach too 2013-09-26 15:56:05 +03:00
Dmitriy Zaporozhets 0a2a34a4d1 Ignore owner_id for Group in tests 2013-09-26 14:52:17 +03:00
Dmitriy Zaporozhets a59330998e Fix remove snippet test 2013-09-25 21:33:35 +03:00
Dmitriy Zaporozhets b6adabb45d Merge branch '6-1-stable'
Conflicts:
	lib/tasks/gitlab/check.rake
2013-09-25 18:34:50 +03:00
Johannes Becker 64e012a378 Added spinach Tests for pivotaltracker service 2013-09-25 16:49:39 +02:00
Dmitriy Zaporozhets 0a01994466 Fix public project tests 2013-09-25 14:23:06 +03:00
Dmitriy Zaporozhets 2f6342978b Public projects feature - step2
* Render right layout depends on current_user
* show sample git username/email when repo is empty
* Show extra info when browsing public area
* Fixed some tests related to public projects
* show comments in read-only for public projects
* Remove old public routing
2013-09-24 22:14:28 +03:00
Dmitriy Zaporozhets 642398285d Force user to provide old password in order to change it 2013-09-24 10:48:36 +03:00
Izaak Alpert 61a86101e8 Prevent empty public projects from throwing exceptions
GITLAB-1279 (GITLAB-1264)

Change-Id: Ifb5b4313bc91fae720f8ef5c36152c45e9d38934
2013-09-20 11:42:38 -04:00
Izaak Alpert ca1b67ce38 Don't show users password change page if ldap users 2013-09-17 22:38:08 -04:00
Dmitriy Zaporozhets 2898d92397 Merge pull request #4996 from hiroponz/drop-support-of-root-namespace
[WIP]Drop support of root namespace in routing
2013-09-14 07:47:41 -07:00
Marin Jankovski c606df8fdf Test. 2013-09-13 11:37:13 +02:00
Hiroyuki Sato 553841eced Improve timing problem in spinach test 2013-09-13 07:30:49 +09:00
Hiroyuki Sato df9cbbc924 Drop support of root namespace in routing 2013-09-13 07:00:24 +09:00
Dmitriy Zaporozhets edb3368c93 Merge pull request #5048 from Nullreff/image-diff
Fix bug with rendering changing images in commits
2013-09-12 07:05:16 -07:00
Joerg Bornschein 5c2d3c8e50 Fix typo in tests 2013-09-12 14:30:55 +02:00
Ryan Mendivil 0a05ab9126 Fix bug with rendering changing images in commits
When viewing the diff for a changed image file, two bugs occur:

- Both the 'before' and 'after' images link to the 'after' commit
- Visiting the link for either image will cause a error

The first is caused by both image links referencing '@commit.id' rather
than '@commit.parent_id'.  The second is caused by the use of
'project_tree_path' which is used for creating links to directories in
the git file tree. 'project_blob_path' which links to files should be
used instead.
2013-09-11 18:53:37 -08:00
Dmitriy Zaporozhets 7bf8d22f17 Remove commented tests since nobody is going to fix them 2013-09-11 22:50:08 +03:00
Dmitriy Zaporozhets 0235c2a7f3 Fix feature test 2013-09-11 20:27:50 +03:00
Boyan Tabakov 01ff084a4d Improved large commit handling.
Previously, only number of changed files mattered. Now, number of lines to render in the diff are also taken into account.

A hard limit is set, above which diffs are not rendered and users are not allowed to override that. This prevents high server
resource usage with huge commits.

Related to #1745, #2259

In addition, handle large commits for MergeRequests and Compare controllers.

Also fixes a bug where diffs are loaded twice, if user goes directly to merge_requests/:id/diffs URL.
2013-09-07 14:44:03 +03:00
Dmitriy Zaporozhets c2f1040006 Few fixes to spinach tests 2013-08-27 13:49:29 +03:00
Dmitriy Zaporozhets 95f032c4fa Fix spinach tests 2013-08-27 13:14:55 +03:00
Hiroyuki Sato 1101ceb3f4 A little improvement
1. Replace params key 'q' with 'extended_sha1'. A extended SHA1 syntax is explained in 'man gitrevisions'.
2. Change the placeholder of looking for commit.
3. Change the label of ref filter.
2013-08-21 19:20:29 +09:00
Hiroyuki Sato 5f24bdb7d0 Render not found when failing to look for a commit 2013-08-21 17:53:51 +09:00
Dmitriy Zaporozhets 083990c795 Minor UI improvements 2013-08-12 12:08:52 +03:00
Dmitriy Zaporozhets 02c3bb7a32 fix chosen ui. fixed network tests 2013-08-08 16:14:38 +03:00
Dmitriy Zaporozhets ca52f84841 Update chosen, improve ui, fix MR fork tests 2013-08-08 15:14:59 +03:00
Dmitriy Zaporozhets 4537623d12 Merge branch 'master' into karlhungus-mr-on-fork
Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb
2013-08-08 12:22:09 +03:00
Dmitriy Zaporozhets 4e6f131c8a fix tests 2013-08-08 10:27:52 +03:00
Dmitriy Zaporozhets eb0590b063 FIx wiki tests. Fixed margin for issues page 2013-08-02 12:15:30 +03:00
Dmitriy Zaporozhets e834742407 Dont load bootstrap buttons. Modified css with new buttons 2013-08-01 22:35:40 +03:00
Dmitriy Zaporozhets e6affad928 Fix spinach tests 2013-07-31 20:45:25 +03:00