summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix knapsack for masterknapsack-for-masterKamil Trzcinski2016-06-072-1/+2
|
* Remove stage notifications [ci skip]Kamil Trzcinski2016-06-071-1/+0
|
* Remove knapsack_merger since we don't use it anywayKamil Trzcinski2016-06-072-42/+0
|
* Fix knapsack spinach executionKamil Trzcinski2016-06-071-1/+1
|
* Fix .gitlab-ci.ymlknapsackKamil Trzcinski2016-06-071-6/+6
|
* Rerun failed spinach testsKamil Trzcinski2016-06-072-73/+101
|
* Fix license_finderKamil Trzcinski2016-06-071-1/+1
|
* Install knapsackKamil Trzcinski2016-06-071-1/+1
|
* Use ruby:2.1 and ruby:2.2 imagesKamil Trzcinski2016-06-072-2/+16
|
* Merge remote-tracking branch 'origin/master' into knapsackKamil Trzcinski2016-06-07197-1241/+6048
|\ | | | | | | | | # Conflicts: # .gitlab-ci.yml
| * Merge branch 'license-finder-gem' into 'master' Rémy Coutable2016-06-077-0/+289
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | License finder gem Every time a gem is added to the Gemfile, or a gem is updated with a new dependency or change of license, LicenseFinder will check to ensure that the license in use has been whitelisted for use in the project. GPLv2 and GPLv3 libraries are not allowed to be linked-to from non-GPL projects (e.g. the MIT-licensed GitLab CE or proprietary EE), otherwise we're violating the license. https://github.com/pivotal/LicenseFinder See also: gitlab-com/operations#164 See merge request !3775
| | * Resolve feedback.Connor Shea2016-06-062-2/+2
| | |
| | * Add relevant commands to the licensing document, resolve some feedback.Connor Shea2016-06-062-3/+34
| | |
| | * Make sure to mention the GNU Project and OSI-provided information regarding ↵Connor Shea2016-06-061-2/+6
| | | | | | | | | | | | the GPL so no one tries to disagree with that decision.
| | * Add Licensing information and guidelines to the Documentation.Connor Shea2016-06-063-1/+60
| | |
| | * Fix up all the decisions in the YML file.Connor Shea2016-06-061-115/+96
| | |
| | * Add gems and licenses that were previously missing. Approve a number of ↵Connor Shea2016-06-062-8/+116
| | | | | | | | | | | | licenses after a bunch of research today.
| | * Add some gems' licenses not caught by License Finder.Connor Shea2016-06-063-0/+96
| | | | | | | | | | | | Also add License Finder to CI (only runs on master).
| | * Add License Finder gem.Connor Shea2016-06-062-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to rehost all our gems in our own gem host, we need to have the legal rights to do so for every gem should they be taken down from RubyGems. License Finder automates checking of gems to ensure that we're in the clear legally. Approved the MIT License because it essentially allows us to do "whatever" with those gems. I am not a lawyer. https://github.com/pivotal/LicenseFinder
| * | Merge branch 'colorize-db-seed' into 'master' Rémy Coutable2016-06-072-7/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missed colorize methods. Fix #18250. cc: @twk3 See merge request !4495
| | * | Fix missed colorize methods.Connor Shea2016-06-062-7/+7
| | | |
| * | | Merge branch 'bump-rouge' into 'master' Stan Hu2016-06-073-3/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump rouge to 1.11.0 See: https://github.com/jneen/rouge/blob/master/CHANGELOG.md See merge request !4491
| | * | | Bump rouge to 1.11.0Stan Hu2016-06-063-3/+4
| |/ / /
| * | | Merge branch '18254-use-better_errors-editor-links-in-sherlock' into 'master' Robert Speicher2016-06-072-3/+11
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use better_errors editor links in sherlock Closes #18254. Uses the same editor configuration of `better_errors` so that you don't have to configure things twice. Remember to have a custom initializer that specifies your editor. Example for atom. File `config/initializers/better_errors.rb`: ````ruby if defined?(BetterErrors) BetterErrors.editor = "atm://open?url=file://%{file}&line=%{line}" end ```` See merge request !4497
| | * | Use better_errors editor links in sherlock18254-use-better_errors-editor-links-in-sherlockAlejandro Rodríguez2016-06-062-3/+11
| |/ / | | | | | | | | | Remember to configure your `better_errors` editor to point to your program of preference
| * | Merge branch 'wiki-bottom-padding' into 'master' Jacob Schatz2016-06-061-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add padding to bottom of wiki page, fix #12921. ## What does this MR do? Adds padding to the bottom of the wiki page so it's not right up against the edge of the browser window. ## What are the relevant issue numbers? #12921 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-06_at_12.21.22_PM](/uploads/9710682a57f5e521253f17a65f896f4d/Screen_Shot_2016-06-06_at_12.21.22_PM.png) After: ![Screen_Shot_2016-06-06_at_12.20.50_PM](/uploads/002068b072050e0f8146757a0386d30f/Screen_Shot_2016-06-06_at_12.20.50_PM.png) cc: @jschatz1 See merge request !4490
| | * Add padding to bottom of wiki page, fix #12921.Connor Shea2016-06-061-1/+1
| | |
| * | Merge branch 'issue_3359' into 'master' Yorick Peterse2016-06-065-6/+30
| |\ \ | | | | | | | | | | | | | | | | Remove duplicated notification settings and add unique index See merge request !4472
| | * | change add_concurrent_index function argumentsissue_3359Felipe Artur2016-06-062-10/+13
| | | |
| | * | Add index to notification settingsFelipe Artur2016-06-034-1/+22
| | | |
| * | | Merge branch 'activity-links' into 'master' Jacob Schatz2016-06-061-3/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with activity links not being consistent ## What does this MR do? Previously, links for opening an issue/merge request & commenting where different. Opening would only have a link on the number whereas commenting would have link on the text as well. This standardises it to include the type as well (ie. issue) ## What are the relevant issue numbers? Closes #17621 ## Screenshots (if relevant) ![Screen_Shot_2016-06-01_at_12.12.09](/uploads/c778b007e6b6c068fcae30e34409ce98/Screen_Shot_2016-06-01_at_12.12.09.png) See merge request !4400
| | * | | Fixed issue with activity links not being consistentactivity-linksPhil Hughes2016-06-021-3/+7
| | | | | | | | | | | | | | | | | | | | Closes #17621
| * | | | Merge branch 'edit-mobile' into 'master' Jacob Schatz2016-06-063-9/+26
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shows the edit comment button on mobile ## What does this MR do? Shows the edit comment button on mobile. ## What are the relevant issue numbers? Closes #17214 ## Screenshots (if relevant) ![Screen_Shot_2016-06-01_at_12.33.13](/uploads/d46b800c175a53821ea8e8af49c07641/Screen_Shot_2016-06-01_at_12.33.13.png) See merge request !4402
| | * | | | Shows the edit comment button on mobileedit-mobilePhil Hughes2016-06-023-9/+26
| | |/ / / | | | | | | | | | | | | | | | Closes #17214
| * | | | Merge branch ↵Jacob Schatz2016-06-067-70/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '18026-consider-removing-issue-merge-request-previous-next-buttons' into 'master' Remove prev/next buttons on issues and merge requests ## What does this MR do? Remove prev/next buttons on issues and merge requests sidebar ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? The buttons were rarely used and added at least 1 query each on every page load which we could live without. ## What are the relevant issue numbers? #18026 ## Screenshots (if relevant) Below is how it looks. Not sure if it's too much empty space. #17697 discusses a possible substitute for what to put there. ![Captura_de_pantalla_2016-06-06_a_las_11.09.26_a.m.](/uploads/7b379327aa6c608775f99bf47a9c3352/Captura_de_pantalla_2016-06-06_a_las_11.09.26_a.m..png) ![Captura_de_pantalla_2016-06-06_a_las_11.09.38_a.m.](/uploads/68bcae6754ed5ac48f1a6925fdd17d3f/Captura_de_pantalla_2016-06-06_a_las_11.09.38_a.m..png) See merge request !4442
| | * | | | Remove prev/next buttons on issues and merge requests18026-consider-removing-issue-merge-request-previous-next-buttonsAlejandro Rodríguez2016-06-067-70/+1
| | | | | | | | | | | | | | | | | | | | | | | | The buttons were rarely used and added at least 1 query each on every page load.
| * | | | | Merge branch 'confidential-issue-notice' into 'master' Jacob Schatz2016-06-063-0/+40
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add confidential issue notice in comment box. ## What does this MR do? Adds a warning about confidential issues to the comment field when the issue is confidential. ## Are there points in the code the reviewer needs to double check? I don't think so. ## Why was this MR needed? It wasn't clear to users that they were commenting on a confidential issue, this makes it more explicit. ## What are the relevant issue numbers? Fixes #15288 ## Screenshots (if relevant) This is what it looks like at various screen sizes: ![Screen_Shot_2016-06-03_at_2.56.54_PM](/uploads/eb7f318bc19101f8514d7a4f10a77d73/Screen_Shot_2016-06-03_at_2.56.54_PM.png) ![Screen_Shot_2016-06-03_at_2.58.51_PM](/uploads/13674c3f1227b0d566b1d2aafc6712ed/Screen_Shot_2016-06-03_at_2.58.51_PM.png) ![Screen_Shot_2016-06-03_at_2.58.37_PM](/uploads/14ad419ed3ed86b7fbc080152e4030fa/Screen_Shot_2016-06-03_at_2.58.37_PM.png) cc: @jschatz1 @dzaporozhets See merge request !4473
| | * | | | Fix error on non-issue pages with comment areas.Connor Shea2016-06-051-1/+1
| | | | | |
| | * | | | Add Changelog entry.Connor Shea2016-06-031-0/+1
| | | | | |
| | * | | | Add confidential issue notice in comment box.Connor Shea2016-06-032-0/+39
| | | | | |
| * | | | | Merge branch 'notes-are-awardables' into 'master' Douwe Maan2016-06-0622-136/+1501
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes are awardables ## What does this MR do? Makes sure we can :thunder_cloud_rain: comments/notes. ## What are the relevant issue numbers? Follows up upon !2901, depends on !3785 Closes #3655 ## Screenshots (if relevant) TODO See merge request !4291
| | * | | | | Updated MR notes.notes-are-awardablesFatih Acet2016-06-066-22/+21
| | | | | | |
| | * | | | | Update tests on wordingZ.J. van de Weg2016-06-061-2/+2
| | | | | | |
| | * | | | | Fix scss-lint.Fatih Acet2016-06-061-1/+1
| | | | | | |
| | * | | | | Added tests for award emoji feature.Fatih Acet2016-06-068-24/+1235
| | | | | | |
| | * | | | | Create and show emoji loader on the fly.Fatih Acet2016-06-062-6/+21
| | | | | | |
| | * | | | | Some design related tweaks.Fatih Acet2016-06-066-7/+24
| | | | | | |
| | * | | | | Be consistent on naming.Fatih Acet2016-06-061-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It was named as $emojiBtn before I was using $emojiButton so updated them to be consistent.
| | * | | | | Animate emoji when rendered.Fatih Acet2016-06-061-1/+12
| | | | | | |
| | * | | | | Fix mutual exclusivity for emoji only comments.Fatih Acet2016-06-061-1/+4
| | | | | | |