home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
7,883 Commits 48 Branches 340 Tags
8f0a97da0498dbfab0ad98402bea577ee68abdab
Commit Graph
172 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 4e2c34d81b Test hook properly 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-15 16:38:48 +02:00
Dmitriy Zaporozhets 9247490109 Tests for accept MR with custom message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 11:49:54 +02:00
Jeroen van Baarsen 2eb1220f67 Removed expiration from snippets 
* Removed the expiration from the project snippets
* Fixed the layout for the project snippets
 2014-01-11 18:24:20 +01:00
Dmitriy Zaporozhets 04ad19dc5c Include missing helper for project_forked_merge_requests tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-11 16:05:41 +02:00
Dmitriy Zaporozhets 54b908afb7 Remove include of un-existing helper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-11 15:45:29 +02:00
Dmitriy Zaporozhets 047a76009a Remove chosen from tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-11 15:35:39 +02:00
Dmitriy Zaporozhets ac6c050773 Fix network tests. Removed console.log 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-05 13:41:09 +02:00
Dmitriy Zaporozhets a81002d920 Fix wiki tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-02 13:11:52 +02:00
Dmitriy Zaporozhets 21b028b548 Improve tests and make preview for notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-25 23:21:26 +02:00
Dmitriy Zaporozhets b8b8a34b52 Fix 500 error when rename repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-23 13:19:13 +02:00
Dmitriy Zaporozhets 078b3f580e Rename Services to Project services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 16:27:52 +02:00
Dmitriy Zaporozhets 68f8ffb551 Add spinach tests for email on push service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 16:29:08 +02:00
Steven Thonus 37383966ef Archiving old projects; archived projects aren't shown on dashboard 
features for archive projects
abilities for archived project
other abilities for archive projects

only limit commits and merges for archived projects

ability changed to prohibited actions on archived projects

added spec and feature tests for archive projects

changed search bar not to include archived projects
 2013-12-16 14:39:14 +01:00
Jason Hollingsworth c099074fcc Fix 404 on project page for unauthenticated user 
Eliminate a 404 error when user is not logged in and attempts to visit
a project page.

The 404 page will still show up when user is logged in and the project
doesn’t exist or the user doesn’t have access.
 2013-12-04 13:10:20 -06:00
Sytse Sijbrandij 7f3ff69e3e Merge pull request #5737 from Popl7/type_fix_for_project_network_graph 
type_fix_for_project_network_graph
 2013-12-01 03:10:16 -08:00
Steven Thonus e3d4eb2140 type_fix_for_project_network_graph 2013-11-30 17:27:02 +01:00
Dmitriy Zaporozhets db0c353a78 Merge pull request #5708 from jhollingsworth/feature/multiline-blob-select 
Enable multiline select for blobs.
 2013-11-29 00:18:34 -08:00
Jason Hollingsworth 568e05a73b Enable multiline select for blobs. 
Holding shift will allow users to click and select multiple lines.
The behavior is similar to GitHub.
Complete with tests.
 2013-11-27 20:08:37 -06:00
Sytse Sijbrandij 68726c5bb4 Button name has an upcase in it. 2013-11-27 17:57:55 +01:00
Sytse Sijbrandij ca1526e7ff Conventional naming for diff modes. 2013-11-27 09:00:14 +01:00
Dmitriy Zaporozhets b51c2c8118 Merge pull request #5308 from Popl7/parallel-diffs-side-by-side 
diff view on commit with parallel diff view
 2013-11-26 03:31:42 -08:00
Carlos Paramio 4db87f7c4b Integration with Assembla 2013-11-21 13:18:02 +01:00
Steven ThonusandSteven Thonus 856d4088fb diff view on commit with parallel diff view 
TODO: fix comment forms to respect left and right columns
 2013-11-17 16:35:34 +01:00
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
Dmitriy Zaporozhets 92b3612025 Improve project_merge_requests.rb feature steps 2013-10-21 09:55:41 +03: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
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 a59330998e Fix remove snippet test 2013-09-25 21:33:35 +03:00
Johannes Becker 64e012a378 Added spinach Tests for pivotaltracker service 2013-09-25 16:49:39 +02: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 df9cbbc924 Drop support of root namespace in routing 2013-09-13 07:00:24 +09: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 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 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