delta/gitlab/gitlab-ce.git/spec/controllers/commits_controller_spec.rb, branch bump_gitlab_shell gitlab.com: gitlab-org/gitlab-ce.git Fix Style/AlignHash cop violations 2015-06-23T05:24:39+00:00 Stan Hu stanhu@gmail.com 2015-06-23T05:24:39+00:00 359ed48638a7442f36b271f283d6a7b8d31225c4 






Upgrade to Rails 4.1.9
2015-02-14T18:09:23+00:00

Vinnie Okada
vokada@mrvinn.com

2015-01-24T18:02:58+00:00

76aad9b76ed756ca9ba2cbcdb399c815e542b3ae

Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.





Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.







Updated rspec to rspec 3.x syntax
2015-02-12T18:17:35+00:00

Jeroen van Baarsen
jeroenvanbaarsen@gmail.com

2015-02-12T18:17:35+00:00

0c4a70a306b871899bf87ce4673918abfee4d95f

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>





Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>







Move logic to image_service.
2014-05-26T12:54:03+00:00

Marin Jankovski
marin@gitlab.com

2014-05-26T12:53:34+00:00

3b2b3cff04993c7247e953c10aa8c6fb5e8d6ddb












Implements drag and drop upload in creating issues
2014-05-23T08:22:42+00:00

Earle Bunao & Neil Calabroso
earle.bunao@gmail.com & nmcalabroso@gmail.com

2014-05-23T08:22:00+00:00

6a85cdf1627629ecaa762fa60a7abdbd092cc20a












Make changes to tests
2014-01-22T19:03:52+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2014-01-22T19:03:52+00:00

c227aa44f9c54dd88f2ac8de7a3463a23f516dff

* project_with_code -> project
* project -> ermpty_project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>





* project_with_code -> project
* project -> ermpty_project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>







Drop support of root namespace in routing
2013-09-12T22:00:24+00:00

Hiroyuki Sato
sathiroyuki@gmail.com

2013-09-05T11:46:34+00:00

df9cbbc924466d2343f399adde0cea7cf2553fdb












Merge Request on forked projects
2013-07-18T02:41:30+00:00

Izaak Alpert
ihalpert@blackberry.com

2013-04-25T14:15:33+00:00

3d7194f0112da12e8732df9ffe8b34fe7d0a9f6b

The good:

 - You can do a merge request for a forked commit and it will merge properly (i.e. it does work).
 - Push events take into account merge requests on forked projects
 - Tests around merge_actions now present, spinach, and other rspec tests
 - Satellites now clean themselves up rather then recreate

The questionable:

 - Events only know about target projects
 - Project's merge requests only hold on to MR's where they are the target
 - All operations performed in the satellite

The bad:

  -  Duplication between project's repositories and satellites (e.g. commits_between)

(for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos)

Fixes:

Make test repos/satellites only create when needed
-Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap)
-project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually
-fixed remote removal
-How to merge renders properly
-Update emails to show project/branches
-Edit MR doesn't set target branch
-Fix some failures on editing/creating merge requests, added a test
-Added back a test around merge request observer
-Clean up project_transfer_spec, Remove duplicate enable/disable observers
-Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well
-Signifant speed ups for tests
-Update formatting ordering in notes_on_merge_requests
-Remove wiki schema update
Fixes for search/search results
-Search results was using by_project for a list of projects, updated this to use in_projects
-updated search results to reference the correct (target) project
-udpated search results to print both sides of the merge request

Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8





The good:

 - You can do a merge request for a forked commit and it will merge properly (i.e. it does work).
 - Push events take into account merge requests on forked projects
 - Tests around merge_actions now present, spinach, and other rspec tests
 - Satellites now clean themselves up rather then recreate

The questionable:

 - Events only know about target projects
 - Project's merge requests only hold on to MR's where they are the target
 - All operations performed in the satellite

The bad:

  -  Duplication between project's repositories and satellites (e.g. commits_between)

(for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos)

Fixes:

Make test repos/satellites only create when needed
-Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap)
-project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually
-fixed remote removal
-How to merge renders properly
-Update emails to show project/branches
-Edit MR doesn't set target branch
-Fix some failures on editing/creating merge requests, added a test
-Added back a test around merge request observer
-Clean up project_transfer_spec, Remove duplicate enable/disable observers
-Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well
-Signifant speed ups for tests
-Update formatting ordering in notes_on_merge_requests
-Remove wiki schema update
Fixes for search/search results
-Search results was using by_project for a list of projects, updated this to use in_projects
-updated search results to reference the correct (target) project
-udpated search results to print both sides of the merge request

Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8







Fix routing/controller specs for refactored controllers
2013-06-23T17:25:06+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2013-06-23T17:25:06+00:00

40bca5246b6e1cea36932c5e0eae89a63d8f0a03












Use project_with_code factory where necessary
2013-04-01T15:16:08+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2013-04-01T15:16:08+00:00

f5dec306fda53a6b2e90f64c0407077ab0022e8f