- 03 Jun, 2016 33 commits
-
-
Rémy Coutable authored
Replace colorize gem with rainbow. ## What does this MR do? It replaces the [colorize](https://github.com/fazibear/colorize) gem with [rainbow](https://github.com/sickill/rainbow). ## Are there points in the code the reviewer needs to double check? Make sure all relevant modified rake tasks still work. I checked repeatedly using `git grep 'color'` that all uses of any `.color` method were replaced by their Rainbow equivalent, you'll want to double check. We (should have, at least) [only used ANSI colors](https://github.com/sickill/rainbow#ansi-colors), so black, red, green, yellow, blue, magenta, cyan, and white. Note that colorize will still be required by Spinach, but since we only use Spinach in the test/dev environments, this isn't a problem. To ensure 100% that tasks run without requiring colorize, you may wish to try removing all spinach-related gems, running `bundle install`, and then `gem uninstall colorize` before running them. I tested all tasks that could be run in dev with Spinach enabled, and then a handful after removing Spinach and uninstalling colorize, and saw no failures or errors in either case. ## Why was this MR needed? Colorize is a GPLv2 gem, which means that we cannot use it without ourselves being GPL'd, which we are not. This is the last gem we use that was breaking the terms of the GPL, so I took it upon myself to remove it. Some argue that libraries can be used without GPL'ing the product itself, but the [GNU Project](http://www.gnu.org/licenses/gpl-faq.html#IfLibraryIsGPL), as well as [the Open Source Initiative](https://opensource.org/faq#linking-proprietary-code) disagrees. Out of an abundance of caution, having researched various software licenses extensively, and in the interest of covering ourselves legally, I'm going to go with that interpretation of the license. An attempt at relicensing Colorize was made, but didn’t succeed as the library owner hasn't responded more than four weeks after attempting contact. ## What are the relevant issue numbers? !3775, gitlab-com/operations#164 cc: @sytses, @rspeicher, @rabbitfang, @rymai See merge request !4425
-
Phil Hughes authored
-
Phil Hughes authored
Closes #15649
-
Connor Shea authored
-
Connor Shea authored
Colorize is a gem licensed under the GPLv2, so we can’t use it in GitLab without relicensing GitLab under the terms of the GPL. Rainbow is licensed under the MIT license and does the exact same thing as Colorize, so Rainbow was added in place of Colorize. The syntax is slightly different for Rainbow vs. Colorize, and was updated in accordance. The gem is still a dependency of Spinach, so it’s included in the development/test environments, but won’t be packaged with the actual product, and therefore doesn’t require we relicense the product. An attempt at relicensing Colorize was made, but didn’t succeed as the library owner never responded. Rainbow library: https://github.com/sickill/rainbow Relevant issue regarding licensing in GitLab's gems: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3775
-
Robert Speicher authored
Enable Style/EmptyLinesAroundAccessModifier rubocop cop Keep blank lines around access modifiers. See #17478 See merge request !4452
-
Jacob Schatz authored
Awardables TODO: - [x] Fix specs - [x] Write new specs - [X] Check if the migrations can stay offline migrations -- (seems not to make 8.8) - [X] API expose Awards -> Next merge window See merge request !3785
-
Dmitriy Zaporozhets authored
Shorter name for Container Registry tab cc @markpundsack @jschatz1 Based on https://gitlab.com/gitlab-org/gitlab-ce/issues/17983#note_12208183 See merge request !4430
-
🚓 Z.J. van de Weg authored -
Z.J. van de Weg authored
-
Douwe Maan authored
Let contributors know where to start Needed becuase: https://gitlab.com/gitlab-org/gitlab-ce/issues/14905#note_12235996 See merge request !4455
-
Douwe Maan authored
Ensure branch cleanup regardless of whether the GitHub import process succeeds Closes #17766 See merge request !4450
-
Douwe Maan authored
Resolve "SHA parameter in accept merge request API" Add a `sha` parameter to the MR merge API, which must match the source SHA for the branch to be merged. Also add the same parameter to the UI: ![MR_SHA](/uploads/616da728695dc19fa7ef7ef6a016ff81/MR_SHA.gif) @DouweM and I discussed adding some smart feature to that, like updating the source SHA on navigating to the diff tab, but for now it will just require a refresh
😃 Closes #14139. See merge request !4414 -
Douwe Maan authored
-
Douwe Maan authored
Ensure we don't show TODOS for projects pending delete ## What does this MR do? Joins the todos on the projects table in order to run the default scope. Also includes a where clause because the default scope is being removed soon. ## Are there points in the code the reviewer needs to double check? An alternative approach, more like the Issues page, would be to filter down the list by passing user.authorized_projects into the where clause. Or we could just be more defensive in the view when iterating. ## Why was this MR needed? Todos page throws 500 error for users with todos in a project pending deletion. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17813 cc\ @stanhu See merge request !4300
-
Robert Speicher authored
Fix deprecation warnings in spec/services/issues/bulk_update_service_spec.rb Fixes #13313. See merge request !4441
-
Robert Speicher authored
Remove unused Issuable#is_assigned? method Fixes #13312. See merge request !4440
-
Zeger-Jan van de Weg authored
gitlab-org/gitlab-ce/issues/14905#note_12235996
-
Dmitriy Zaporozhets authored
See merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4431
-
Grzegorz Bizon authored
See #17478
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Add icons and buttons to UI guide cc @jschatz1 @skyruler See merge request !4445
-
Robert Speicher authored
Fix import error handling Fixes https://gitlab.com/gitlab-com/support-forum/issues/745 This improves import error handling: - Now if there's an error during importing before the job is scheduled, we also mark the project status as failed. - Refactored setting the status to failed into one single method. - Fixed some situations where the error message was missing or simply empty. See merge request !4366
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
- 02 Jun, 2016 7 commits
-
-
Douglas Barbosa Alexandre authored
-
DJ Mountney authored
-
DJ Mountney authored
-
Yorick Peterse authored
See merge request !4436
-
Dmitriy Zaporozhets authored
Add tooltips to todo target links See merge request !4370
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-