- 12 May, 2017 5 commits
-
-
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
[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
-
- 11 May, 2017 6 commits
-
-
Pawel Chojnacki authored
-
Mike Greiling authored
-
Mike Greiling authored
-
kushalpandya authored
-
Douwe Maan authored
-
Toon Claes authored
-
- 10 May, 2017 16 commits
-
-
Marcia Ramos authored
-
Michael Kozono authored
-
Clement Ho authored
-
Phil Hughes authored
-
Rémy Coutable authored
# Conflicts: # app/assets/javascripts/merge_request_widget.js # app/assets/javascripts/notes.js # app/assets/javascripts/pipelines/components/stage.js # app/assets/javascripts/pipelines/components/stage.vue # app/assets/javascripts/project_new.js # app/assets/javascripts/vue_merge_request_widget/components/mr_widget_deployment.js # app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js # app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js # app/assets/javascripts/vue_merge_request_widget/dependencies.js # app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js # app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js # app/assets/javascripts/vue_shared/components/memory_graph.js # app/assets/stylesheets/framework/lists.scss # app/assets/stylesheets/framework/memory_graph.scss # app/assets/stylesheets/pages/merge_requests.scss # app/controllers/projects/branches_controller.rb # app/controllers/projects/merge_requests_controller.rb # app/helpers/merge_requests_helper.rb # app/models/project.rb # app/models/user.rb # app/presenters/merge_request_presenter.rb # app/serializers/environment_entity.rb # app/serializers/merge_request_basic_entity.rb # app/serializers/merge_request_entity.rb # app/services/ci/create_pipeline_service.rb # app/views/projects/blob/_header.html.haml # app/views/projects/merge_requests/_show.html.haml # app/views/projects/tree/_tree_content.html.haml # app/views/shared/issuable/_sidebar.html.haml # app/views/shared/issuable/form/_merge_params.html.haml # app/views/shared/issuable/form/_metadata.html.haml # config/webpack.config.js # db/schema.rb # doc/intro/README.md # doc/user/project/issues/index.md # doc/user/project/issues/issues_functionalities.md # features/steps/project/forked_merge_requests.rb # features/steps/project/merge_requests.rb # features/support/env.rb # lib/gitlab/checks/change_access.rb # spec/controllers/groups_controller_spec.rb # spec/controllers/projects/merge_requests_controller_spec.rb # spec/controllers/projects_controller_spec.rb # spec/features/merge_requests/closes_issues_spec.rb # spec/features/security/project/private_access_spec.rb # spec/fixtures/api/schemas/entities/merge_request.json # spec/fixtures/api/schemas/entities/merge_request_basic.json # spec/helpers/merge_requests_helper_spec.rb # spec/javascripts/vue_mr_widget/components/mr_widget_deployment_spec.js # spec/presenters/merge_request_presenter_spec.rb # spec/serializers/merge_request_entity_spec.rb # spec/serializers/pipeline_serializer_spec.rb [ci skip]
-
Dmitriy Zaporozhets authored
Resolve "Delete `Projects::IssuesController#redirect_old`" Closes #20517 See merge request !11135
-
Phil Hughes authored
Fix broken test - load correct data Closes #32074 See merge request !11237
-
Filipa Lacerda authored
-
Filipa Lacerda authored
Fix icons path and mappings See merge request !1862
-
blackst0ne authored
-
Phil Hughes authored
Use vue file for table pagination component Closes #31349 See merge request !11210
-
Filipa Lacerda authored
-
Robert Speicher authored
Spec fix: Add :redis keyword to some specs clear state of trackable attributes Closes #32041 See merge request !11221
-
kushalpandya authored
-
Clement Ho authored
Fix transient job failures relating to "unhandled Promise rejection" in issue boards Closes #32030 See merge request !11222
-
Clement Ho authored
CE upstream Closes omnibus-gitlab#2234 and gitlab-ce#31271 See merge request !1837
-
- 09 May, 2017 13 commits
-
-
Fatih Acet authored
Adds left connector class to the rendered graph Closes #31053 See merge request !11179
-
Fatih Acet authored
Fix test failure in job vue componenFix test failure in job vue componentt Closes #32021 See merge request !11208
-
Mike Greiling authored
-
Fatih Acet authored
Make tree, blob and blame pages more consistent See merge request !11194
-
Mike Greiling authored
This reverts commit 8785aa64.
-
Mike Greiling authored
-
Clement Ho authored
-
Toon Claes authored
This reverts commit 73f448e5.
-
Douwe Maan authored
Add German translation for Cycle Analytics See merge request !11161
-
Clement Ho authored
-
Toon Claes authored
The specs that rely on a correct value of the trackable attributes, should include the `:redis` keyword in the spec to ensure the state is reset between various specs. The trackable attributes being: - sign_in_count : Increased every time a sign in is made (by form, openid, oauth) - current_sign_in_at : A timestamp updated when the user signs in - last_sign_in_at : Holds the timestamp of the previous sign in - current_sign_in_ip : The remote ip updated when the user sign in - last_sign_in_ip : Holds the remote ip of the previous sign in The limiting of writing trackable attributes was introduced in gitlab-org/gitlab-ce!11053.
-
Robert Speicher authored
Fix OpenID spec failure that assumed current_sign_in_at would be set Closes #32041 See merge request !11219
-