summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* add CHANGELOG.md entry for !9055replace-npm-with-yarnMike Greiling2017-02-141-0/+4
|
* fix eslint builds within .gitlab-ci.ymlMike Greiling2017-02-141-2/+2
|
* update yarn.lock to reflect latest package.jsonMike Greiling2017-02-131-602/+1016
|
* add yarn check to ensure package.json doesn't diverge from yarn.lockMike Greiling2017-02-131-1/+2
|
* display yarn version and node version within CI logsMike Greiling2017-02-131-0/+2
|
* add yarn lock fileMike Greiling2017-02-131-0/+3914
|
* replace npm run calls with yarnMike Greiling2017-02-133-5/+5
|
* remove recursive npm calls to avoid dependence on npm after switch to yarnMike Greiling2017-02-131-3/+3
|
* remove unnecessary "npm install"sMike Greiling2017-02-131-5/+0
|
* Merge branch '27395-reduce-group-activity-sql-queries' into 'master' Yorick Peterse2017-02-134-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-queriesRémy Coutable2017-02-132-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_associationsRémy Coutable2017-02-132-1/+5
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Don't instantiate AR objects in Event.in_projectsRémy Coutable2017-02-132-1/+5
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'rs-rubocop-rspec' into 'master' Rémy Coutable2017-02-136-74/+67
|\ \ | | | | | | | | | | | | Enable Style/RedundantException, Lint/EmptyWhen, and RSpec/ExpectActual cops See merge request !9151
| * | Enable `Lint/EmptyWhen` cop and correct offenseRobert Speicher2017-02-133-5/+5
| | |
| * | Enable `Style/RedundantException` cop and correct offenseRobert Speicher2017-02-103-6/+5
| | |
| * | Enable the `RSpec/ExpectActual` cop and correct offensesRobert Speicher2017-02-104-59/+53
| | |
| * | Explicitly disable the RSpec/BeEql copRobert Speicher2017-02-102-4/+4
| | | | | | | | | | | | This is a little too picky, even for us.
* | | Merge branch 'dm-quick-fix-web-edit-new-lines' into 'master' Robert Speicher2017-02-132-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-linesDouwe Maan2017-02-132-0/+19
| | | |
* | | | Merge branch 'sh-add-labels-index' into 'master' Yorick Peterse2017-02-133-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-indexStan Hu2017-02-133-0/+18
| | | | |
* | | | | Merge branch 'silence-webpack' into 'master' Filipa Lacerda2017-02-131-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | only print errors and warnings from webpack dev server See merge request !9118
| * | | | | only print errors and warnings from webpack dev serversilence-webpackSimon Knox2017-02-111-1/+2
| | | | | |
* | | | | | Merge branch '27939-fix-current-build-arrow' into 'master' Filipa Lacerda2017-02-133-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix current build arrow Closes #27939 See merge request !9154
| * | | | | | Fix current build arrow27939-fix-current-build-arrowEric Eastwood2017-02-133-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27939
* | | | | | | Merge branch '23535-folders-in-wiki-repository' into 'master' Douwe Maan2017-02-1318-14/+306
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show directory hierarchy when listing wiki pages Closes #23535 See merge request !8133
| * | | | | | Fix haml-lint violationAlex Braha Stoll2017-02-131-1/+1
| | | | | | |
| * | | | | | Add merge request numberAlex Braha Stoll2017-01-301-1/+1
| | | | | | |
| * | | | | | Add WikiPage.unhyphenizeAlex Braha Stoll2017-01-303-2/+14
| | | | | | |
| * | | | | | Merge branch 'master' into 23535-folders-in-wiki-repositoryAlex Braha Stoll2017-01-291671-10299/+39818
| |\ \ \ \ \ \
| * | | | | | | Remove directories as one of the attributes of WikiDirectoryAlex Braha Stoll2016-12-312-15/+5
| | | | | | | |
| * | | | | | | Add new wiki related partialsAlex Braha Stoll2016-12-313-10/+9
| | | | | | | |
| * | | | | | | Improve WikiPage.group_by_directoryAlex Braha Stoll2016-12-311-1/+1
| | | | | | | |
| * | | | | | | Change WikiPage#directoryAlex Braha Stoll2016-12-312-8/+7
| | | | | | | |
| * | | | | | | Remove WikiPage#full_pathAlex Braha Stoll2016-12-312-25/+0
| | | | | | | |
| * | | | | | | Add a breadcrumb at projects/wikis/show.html.hamlAlex Braha Stoll2016-12-314-0/+42
| | | | | | | |
| * | | | | | | Stop rendering page full path at projects/wikis/show.html.hamlAlex Braha Stoll2016-12-312-2/+0
| | | | | | | |
| * | | | | | | Render wiki entries using a collection of WikiPage and WikiDirectory objectsAlex Braha Stoll2016-12-316-24/+13
| | | | | | | |
| * | | | | | | Add WikiDirectory#to_partial_pathAlex Braha Stoll2016-12-312-0/+14
| | | | | | | |
| * | | | | | | Add WikiPage#to_partial_pathAlex Braha Stoll2016-12-312-0/+14
| | | | | | | |
| * | | | | | | Change WikiPage.group_by_directory to use WikiDirectoryAlex Braha Stoll2016-12-312-34/+56
| | | | | | | |
| * | | | | | | Add model WikiDirectoryAlex Braha Stoll2016-12-313-0/+64
| | | | | | | |
| * | | | | | | Simplify WikiPage.group_by_directory by using Enumerable#group_byAlex Braha Stoll2016-12-311-9/+2
| | | | | | | |
| * | | | | | | Remove WikiPage.sort_by_directoryAlex Braha Stoll2016-12-311-22/+2
| | | | | | | |
| * | | | | | | Use the icon helper at wikis/_new.html.hamlAlex Braha Stoll2016-12-311-2/+2
| | | | | | | |
| * | | | | | | Fix scss style violationAlex Braha Stoll2016-12-311-1/+2
| | | | | | | |
| * | | | | | | Improve style of wiki page listsAlex Braha Stoll2016-12-312-1/+17
| | | | | | | |
| * | | | | | | Change WikiPage.group_by_directory to order by directory and file ↵Alex Braha Stoll2016-12-312-5/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alphabetical order
| * | | | | | | Add tip about specifying the full path when creating new wiki pagesAlex Braha Stoll2016-12-312-0/+12
| | | | | | | |