Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-06-16fixed merge conflicts on UI branchJames Lopez
2016-06-16fix spinach testJames Lopez
2016-06-15Merge branch 'commits-ui' into 'master' Jacob Schatz
Updated commits UI Closes #14633 See merge request !4271
2016-06-15Fix test.Connor Shea
2016-06-15Implement custom notification level optionsFelipe Artur
2016-06-15Fix admin active tab testsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-14UI and copywriting improvementsRémy Coutable
+ Move 'Edit Project/Group' out of membership-related partial + Show the access request buttons only to logged-in users + Put the request access buttons out of in a more visible button + Improve the copy in the #remove_member_message helper Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-14Add request access for groupsRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-13Merge branches 'feature/project-export-ui-experimental' and ↵James Lopez
'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental # Conflicts: # Gemfile.lock # app/helpers/todos_helper.rb # app/models/todo.rb # app/views/projects/edit.html.haml # lib/gitlab/import_export/import_service.rb
2016-06-10Fix profile testAnnabel Dunstone
2016-06-10Render only issues/mr in subnav depends on contextDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-10CI build page UI updatePhil Hughes
Added sidebar Removed elements not present in design
2016-06-09Fixed failing label subscribe testPhil Hughes
2016-06-09Tests updatePhil Hughes
2016-06-09Fixed failing testsPhil Hughes
2016-06-09Merge branch '18019-fix-wiki-linking' into 'master' Rémy Coutable
Fix wiki linking behavior for markdown wiki pages Related to #18019 - As per the documentation in !4372 ## TODO - [ ] !4432 Have wiki linking behave as per the documentation - [x] Move `WikiLinkFilter` specs to the pipeline level - [x] Verify current behavior on wiki `show` page - [x] Fix current behavior on wiki `show` page - [x] Verify current behaviour on wiki preview - [x] Fix current behaviour on wiki preview - [x] Rewrite all links and get preview links working - [x] Make sure all links are on-par with the wiki `show` page - [x] TDD `WikiLinkFilter` and get it working - [x] Hook `WikiLinkFilter` up - [x] Fix tests - [x] Fix `markdown_spec` - [x] Fix `wiki` spinach feature - [x] Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/4f50dd2/builds) to pass - [x] Make sure all wiki-related pages are working as expected (history, all pages, etc.) - [x] Test in different ruby versions - [x] GitLab instances hosted on a relative URL - [x] Non-markdown rendering formats? - [x] RDoc - [x] ASCIIDoc - [x] Create issues to fix things for RDoc and ASCIIDoc - [x] Gauge performance impact - [x] Refactor - [x] Re-organize commits - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/f860e9a8dcabe7d5f160c32fc549807c98baa4a1/builds) passes - [x] Respond to @rymai's comments - [x] `class WikiLinkFilter < HTML::Pipeline::Filter` - [x] blank line after guard clause - [x] keyword arguments for `wiki` and `slug` - [x] invert the condition - [x] inline `user` in spec - [x] Make sure spec names are not out of date - [x] Comment for each rewrite rule - [x] Add CHANGELOG entry - [x] Reorganize commits - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/19b91e749a6320d12fb299d33f1f6440777e0e26/builds) passes - [ ] Wait for merge See merge request !4432
2016-06-09Hook up the updated `WikiLinkFilter` to the wiki controllers.Timothy Andrew
- Need to pass in a `page_slug` to the filter, so it can rewrite based on the current page (all links are rewritten to the level of the app root). - The earlier `markdown_preview` endpoint was at the level of the wiki. We need to know the current page (for rewriting, as above), so this commit moves the endpoint to the level of a wiki page. - Fix all tests
2016-06-08Updated failing testsPhil Hughes
2016-06-07Merge branch 'notification-dropdown-labels' into 'master' Jacob Schatz
Notifications dropdown on project page now has descriptions ## What does this MR do? Adds descriptions to the notification settings dropdown on project pages. Also changed the order of them to make more sense. ## What are the relevant issue numbers? Part of #12758 ## Screenshots (if relevant) ![Screen_Shot_2016-05-31_at_09.35.24](/uploads/b30d82701a13ec15f672139e1225acf5/Screen_Shot_2016-05-31_at_09.35.24.png) See merge request !4374
2016-06-07Merge branch '18013-compact-sidebar' into 'master' Jacob Schatz
Implement compact side nav ## What does this MR do? Implements new compact nav design Note- new navbar icons are in a separate MR (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4268) ## What are the relevant issue numbers? Closes #18013 ## Screenshots (if relevant) ![Screen_Shot_2016-06-02_at_3.20.37_PM](/uploads/d31bd17ae47743f1a20d7429b4396e84/Screen_Shot_2016-06-02_at_3.20.37_PM.png) ![Screen_Shot_2016-06-02_at_3.20.43_PM](/uploads/d03a080a57707b6a2161127f3904fcd5/Screen_Shot_2016-06-02_at_3.20.43_PM.png) cc @dzaporozhets See merge request !4447
2016-06-07Merge branch 'issue_14189' into 'master' Jacob Schatz
Ability to prioritize labels Closes #14189 See merge request !4009
2016-06-07Remove todos count tests in navAnnabel Dunstone
2016-06-07Fixed failing testsPhil Hughes
2016-06-07Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski
2016-06-06Fix failing testsAlfredo Sumaran
2016-06-06Remove prev/next buttons on issues and merge requestsAlejandro Rodríguez
The buttons were rarely used and added at least 1 query each on every page load.
2016-06-06Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski
# Conflicts: # features/steps/shared/builds.rb # spec/requests/ci/api/builds_spec.rb
2016-06-06Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski
2016-06-06Fix tests offenses: use `pipeline` of Ci::Build and rename viewsKamil Trzcinski
2016-06-04Ensure we are clicking a visible dropdownAlfredo Sumaran
2016-06-03Rename all `[ci_]commit` to `[ci_]pipeline` in specs and featuresKamil Trzcinski
2016-06-03Merge branch 'master' into awardablesZ.J. van de Weg
2016-06-03Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski
2016-06-03Rename Ci::Build commit to pipelineKamil Trzcinski
2016-06-03Fix more tests with new Code tabDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-03Update tests to match new Code tab logicDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-02Refactor. Add tests.Josh Frye
2016-06-02Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski
2016-06-01Incorportate feedbackZ.J. van de Weg
2016-05-30Merge branch 'master' into awardablesZJ van de Weg
2016-05-30Enable Style/SpaceAfterMethodName rubocop copGrzegorz Bizon
See #17478
2016-05-29Improve note factoryGrzegorz Bizon
2016-05-29Update specs to carry out changes in note factoryGrzegorz Bizon
2016-05-26Merge branch 'updated-contrib-calendar' into 'master' Jacob Schatz
POC: Updated contrib calendar In an effort to cut down the JS file size - i've removed the heatmap calendar used for the contributing calendar on users profiles. We already have d3 on the page so why not use it instead of using a library which uses it? ![Screen_Shot_2016-04-27_at_11.08.41](/uploads/64c40f0c766f800fd0e33ac8be7f9644/Screen_Shot_2016-04-27_at_11.08.41.png) cc. @jschatz1 See merge request !3944
2016-05-25Merge branch 'fix-grammar-issues' into 'master' Jacob Schatz
Fix grammar and wording in text on various pages. ## What does this MR do? Fixes various grammatical and/or wording issues I found while copyediting on the plane :) ## Why was this MR needed? Incorrect grammar and weird/confusing wording makes the product look less polished and professional. See merge request !4237
2016-05-25Merge branch 'rs-rubocop-nottonot' into 'master' Dmitriy Zaporozhets
Enable RSpec/NotToNot cop and auto-correct offenses Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17761 See merge request !4267
2016-05-25Remove old tests, and use right factoriesZJ van de Weg
2016-05-25Merge branch 'master' into awardablesZJ van de Weg
2016-05-25Merge branch 'snippets-ui' into 'master' Jacob Schatz
Updated snippets UI ![Screen_Shot_2016-05-18_at_14.11.54](/uploads/2544351e50f19a36c4ba9a7a92d5544b/Screen_Shot_2016-05-18_at_14.11.54.png) Closes #14328 See merge request !4194
2016-05-25Merge branch 'project-settings' into 'master' Jacob Schatz
Project settings UI update ![Screen_Shot_2016-05-16_at_16.42.55](/uploads/2e308cbf26a002fc411c3e84b663a5d1/Screen_Shot_2016-05-16_at_16.42.55.png)![Screen_Shot_2016-05-16_at_16.43.01](/uploads/8d983c43307c65852efe002f6e9482d9/Screen_Shot_2016-05-16_at_16.43.01.png)![Screen_Shot_2016-05-16_at_16.43.16](/uploads/6124e0600cc0e5b309a60b065409d537/Screen_Shot_2016-05-16_at_16.43.16.png)![Screen_Shot_2016-05-16_at_16.43.13](/uploads/177976c2c08034e096e7ebdcad1f369f/Screen_Shot_2016-05-16_at_16.43.13.png) See merge request !4162