- 10 Aug, 2017 6 commits
-
-
Jose Ivan Vargas authored
-
Rémy Coutable authored
Based on: 1. 0e85c50252dd43148488eacde57a882bd0b0a4ec 2. d19eaaed2d48e008abf94301a98e8ee806219071 3. 44c7f872219659d107fc01a62c8b5d6778ebbd74 Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Based on d19eaaed2d48e008abf94301a98e8ee806219071. Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Based on d19eaaed2d48e008abf94301a98e8ee806219071. Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Based on d19eaaed2d48e008abf94301a98e8ee806219071. Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Based on 7d96866eddd7602be19effcce11a3568ed54666d. Signed-off-by: Rémy Coutable <remy@rymai.me>
-
- 09 Aug, 2017 34 commits
-
-
Simon Knox authored
-
Mike Greiling authored
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Phil Hughes authored
[ci skip]
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Nick Thomas authored
-
Nick Thomas authored
-
Nick Thomas authored
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Oswaldo Ferreira authored
-
Oswaldo Ferreira authored
-
Oswaldo Ferreira authored
-
Annabel Dunstone Gray authored
-
Phil Hughes authored
[ci skip]
-
Rémy Coutable authored
# Conflicts: # .haml-lint.yml # Gemfile # Gemfile.lock # app/assets/javascripts/api.js # app/assets/javascripts/dispatcher.js # app/assets/javascripts/new_sidebar.js # app/assets/javascripts/project_select.js # app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js # app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js # app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.js # app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js # app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js # app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.js # app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js # app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js # app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js # app/assets/stylesheets/framework/variables.scss # app/assets/stylesheets/new_sidebar.scss # app/assets/stylesheets/pages/merge_requests.scss # app/controllers/admin/health_check_controller.rb # app/controllers/omniauth_callbacks_controller.rb # app/helpers/dropdowns_helper.rb # app/models/merge_request.rb # app/models/project_import_data.rb # app/models/repository.rb # app/views/layouts/nav/_new_group_sidebar.html.haml # app/views/projects/jobs/_sidebar.html.haml # app/views/projects/tree/_tree_content.html.haml # app/views/projects/tree/_tree_header.html.haml # app/views/shared/_import_form.html.haml # app/views/shared/_sidebar_toggle_button.html.haml # app/views/shared/issuable/_sidebar.html.haml # config/webpack.config.js # db/schema.rb # lib/api/entities.rb # lib/gitlab/usage_data.rb # spec/features/merge_requests/closes_issues_spec.rb # spec/fixtures/api/schemas/entities/merge_request.json # spec/initializers/6_validations_spec.rb # spec/javascripts/vue_mr_widget/components/mr_widget_related_links_spec.js # spec/lib/gitlab/shell_spec.rb # spec/serializers/merge_request_entity_spec.rb # spec/services/wiki_pages/update_service_spec.rb [ci skip]
-
Phil Hughes authored
Align all nav items in sidebar Closes #36179 See merge request !13392
-
Phil Hughes authored
Fix height of collapsed sidebar items See merge request !13385
-
Sean McGivern authored
Explain why we use select all for project_url_constrainer.rb See merge request !13425
-
Tim Zallmann authored
Fix Pikaday being undefined Closes #36207 See merge request !13422
-
Dmitriy Zaporozhets authored
-
Phil Hughes authored
Closes #36207
-