Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add CHANGELOG.md entry for !9055replace-npm-with-yarn | Mike Greiling | 2017-02-14 | 1 | -0/+4 |
| | |||||
* | fix eslint builds within .gitlab-ci.yml | Mike Greiling | 2017-02-14 | 1 | -2/+2 |
| | |||||
* | update yarn.lock to reflect latest package.json | Mike Greiling | 2017-02-13 | 1 | -602/+1016 |
| | |||||
* | add yarn check to ensure package.json doesn't diverge from yarn.lock | Mike Greiling | 2017-02-13 | 1 | -1/+2 |
| | |||||
* | display yarn version and node version within CI logs | Mike Greiling | 2017-02-13 | 1 | -0/+2 |
| | |||||
* | add yarn lock file | Mike Greiling | 2017-02-13 | 1 | -0/+3914 |
| | |||||
* | replace npm run calls with yarn | Mike Greiling | 2017-02-13 | 3 | -5/+5 |
| | |||||
* | remove recursive npm calls to avoid dependence on npm after switch to yarn | Mike Greiling | 2017-02-13 | 1 | -3/+3 |
| | |||||
* | remove unnecessary "npm install"s | Mike Greiling | 2017-02-13 | 1 | -5/+0 |
| | |||||
* | Merge branch '27395-reduce-group-activity-sql-queries' into 'master' | Yorick Peterse | 2017-02-13 | 4 | -14/+21 |
|\ | | | | | | | | | | | | | Resolve "GroupsController#activity.json is REALLY slow due to SQL" Closes #27395 See merge request !9088 | ||||
| * | Use preload for Event#target since it's a polymorphic association27395-reduce-group-activity-sql-queries | Rémy Coutable | 2017-02-13 | 2 | -13/+12 |
| | | | | | | | | | | | | Also, don't use limit in subquery, MySQL don't like that. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Include :author, :project, and :target in Event.with_associations | Rémy Coutable | 2017-02-13 | 2 | -1/+5 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Don't instantiate AR objects in Event.in_projects | Rémy Coutable | 2017-02-13 | 2 | -1/+5 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch 'rs-rubocop-rspec' into 'master' | Rémy Coutable | 2017-02-13 | 6 | -74/+67 |
|\ \ | | | | | | | | | | | | | Enable Style/RedundantException, Lint/EmptyWhen, and RSpec/ExpectActual cops See merge request !9151 | ||||
| * | | Enable `Lint/EmptyWhen` cop and correct offense | Robert Speicher | 2017-02-13 | 3 | -5/+5 |
| | | | |||||
| * | | Enable `Style/RedundantException` cop and correct offense | Robert Speicher | 2017-02-10 | 3 | -6/+5 |
| | | | |||||
| * | | Enable the `RSpec/ExpectActual` cop and correct offenses | Robert Speicher | 2017-02-10 | 4 | -59/+53 |
| | | | |||||
| * | | Explicitly disable the RSpec/BeEql cop | Robert Speicher | 2017-02-10 | 2 | -4/+4 |
| | | | | | | | | | | | | This is a little too picky, even for us. | ||||
* | | | Merge branch 'dm-quick-fix-web-edit-new-lines' into 'master' | Robert Speicher | 2017-02-13 | 2 | -0/+19 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Respect autocrlf setting when creating/updating file through web UI Closes gitlab-com/www-gitlab-com#1152 See merge request !9198 | ||||
| * | | | Respect autocrlf setting when creating/updating file through web UIdm-quick-fix-web-edit-new-lines | Douwe Maan | 2017-02-13 | 2 | -0/+19 |
| | | | | |||||
* | | | | Merge branch 'sh-add-labels-index' into 'master' | Yorick Peterse | 2017-02-13 | 3 | -0/+18 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add indices to improve loading of labels page Closes #25413 See merge request !9121 | ||||
| * | | | | Add indices to improve loading of labels pagesh-add-labels-index | Stan Hu | 2017-02-13 | 3 | -0/+18 |
| | | | | | |||||
* | | | | | Merge branch 'silence-webpack' into 'master' | Filipa Lacerda | 2017-02-13 | 1 | -1/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | only print errors and warnings from webpack dev server See merge request !9118 | ||||
| * | | | | | only print errors and warnings from webpack dev serversilence-webpack | Simon Knox | 2017-02-11 | 1 | -1/+2 |
| | | | | | | |||||
* | | | | | | Merge branch '27939-fix-current-build-arrow' into 'master' | Filipa Lacerda | 2017-02-13 | 3 | -1/+9 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix current build arrow Closes #27939 See merge request !9154 | ||||
| * | | | | | | Fix current build arrow27939-fix-current-build-arrow | Eric Eastwood | 2017-02-13 | 3 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27939 | ||||
* | | | | | | | Merge branch '23535-folders-in-wiki-repository' into 'master' | Douwe Maan | 2017-02-13 | 18 | -14/+306 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show directory hierarchy when listing wiki pages Closes #23535 See merge request !8133 | ||||
| * | | | | | | Fix haml-lint violation | Alex Braha Stoll | 2017-02-13 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Add merge request number | Alex Braha Stoll | 2017-01-30 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Add WikiPage.unhyphenize | Alex Braha Stoll | 2017-01-30 | 3 | -2/+14 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into 23535-folders-in-wiki-repository | Alex Braha Stoll | 2017-01-29 | 1671 | -10299/+39818 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Remove directories as one of the attributes of WikiDirectory | Alex Braha Stoll | 2016-12-31 | 2 | -15/+5 |
| | | | | | | | | |||||
| * | | | | | | | Add new wiki related partials | Alex Braha Stoll | 2016-12-31 | 3 | -10/+9 |
| | | | | | | | | |||||
| * | | | | | | | Improve WikiPage.group_by_directory | Alex Braha Stoll | 2016-12-31 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Change WikiPage#directory | Alex Braha Stoll | 2016-12-31 | 2 | -8/+7 |
| | | | | | | | | |||||
| * | | | | | | | Remove WikiPage#full_path | Alex Braha Stoll | 2016-12-31 | 2 | -25/+0 |
| | | | | | | | | |||||
| * | | | | | | | Add a breadcrumb at projects/wikis/show.html.haml | Alex Braha Stoll | 2016-12-31 | 4 | -0/+42 |
| | | | | | | | | |||||
| * | | | | | | | Stop rendering page full path at projects/wikis/show.html.haml | Alex Braha Stoll | 2016-12-31 | 2 | -2/+0 |
| | | | | | | | | |||||
| * | | | | | | | Render wiki entries using a collection of WikiPage and WikiDirectory objects | Alex Braha Stoll | 2016-12-31 | 6 | -24/+13 |
| | | | | | | | | |||||
| * | | | | | | | Add WikiDirectory#to_partial_path | Alex Braha Stoll | 2016-12-31 | 2 | -0/+14 |
| | | | | | | | | |||||
| * | | | | | | | Add WikiPage#to_partial_path | Alex Braha Stoll | 2016-12-31 | 2 | -0/+14 |
| | | | | | | | | |||||
| * | | | | | | | Change WikiPage.group_by_directory to use WikiDirectory | Alex Braha Stoll | 2016-12-31 | 2 | -34/+56 |
| | | | | | | | | |||||
| * | | | | | | | Add model WikiDirectory | Alex Braha Stoll | 2016-12-31 | 3 | -0/+64 |
| | | | | | | | | |||||
| * | | | | | | | Simplify WikiPage.group_by_directory by using Enumerable#group_by | Alex Braha Stoll | 2016-12-31 | 1 | -9/+2 |
| | | | | | | | | |||||
| * | | | | | | | Remove WikiPage.sort_by_directory | Alex Braha Stoll | 2016-12-31 | 1 | -22/+2 |
| | | | | | | | | |||||
| * | | | | | | | Use the icon helper at wikis/_new.html.haml | Alex Braha Stoll | 2016-12-31 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Fix scss style violation | Alex Braha Stoll | 2016-12-31 | 1 | -1/+2 |
| | | | | | | | | |||||
| * | | | | | | | Improve style of wiki page lists | Alex Braha Stoll | 2016-12-31 | 2 | -1/+17 |
| | | | | | | | | |||||
| * | | | | | | | Change WikiPage.group_by_directory to order by directory and file ↵ | Alex Braha Stoll | 2016-12-31 | 2 | -5/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alphabetical order | ||||
| * | | | | | | | Add tip about specifying the full path when creating new wiki pages | Alex Braha Stoll | 2016-12-31 | 2 | -0/+12 |
| | | | | | | | |