- 12 Dec, 2017 17 commits
-
-
Rémy Coutable authored
Resolve conflicts in doc/development/limit_ee_conflicts.md and doc/development/automatic_ce_ee_merge.md Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Michael Kozono authored
-
Micaël Bergeron authored
-
Mayra Cabrera authored
-
Marcia Ramos authored
-
Marcia Ramos authored
-
Kamil Trzcinski authored
-
James Edwards-Jones authored
-
Eric Eastwood authored
-
Eric Eastwood authored
-
Eric Eastwood authored
-
Jarka Kadlecová authored
-
Francisco Javier López authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Phil Hughes authored
[ci skip]
-
GitLab Bot authored
# Conflicts: # app/assets/javascripts/sidebar/sidebar_mediator.js # app/assets/stylesheets/pages/groups.scss # app/controllers/projects/merge_requests_controller.rb # app/models/epic.rb # app/models/user.rb # app/policies/group_policy.rb # app/services/ci/create_pipeline_service.rb # app/services/protected_branches/access_level_params.rb # app/services/protected_branches/api_service.rb # app/views/layouts/_search.html.haml # app/views/layouts/nav/sidebar/_group.html.haml # app/views/projects/commits/_commit.html.haml # app/views/projects/issues/show.html.haml # app/views/shared/_outdated_browser.html.haml # config/routes/group.rb # doc/administration/index.md # doc/administration/operations/index.md # doc/development/automatic_ce_ee_merge.md # doc/development/limit_ee_conflicts.md # lib/api/entities.rb # lib/api/projects.rb # lib/banzai/filter/epic_reference_filter.rb # lib/banzai/filter/upload_link_filter.rb # lib/banzai/reference_parser/epic_parser.rb # lib/gitlab/ci/pipeline/chain/command.rb # lib/gitlab/git_access.rb # lib/gitlab/utils.rb # spec/helpers/boards_helper_spec.rb # spec/helpers/merge_requests_helper_spec.rb # spec/javascripts/boards/boards_store_spec.js # spec/lib/banzai/filter/upload_link_filter_spec.rb # spec/lib/gitlab/ci/pipeline/chain/validate/abilities_spec.rb # spec/models/namespace_spec.rb [ci skip]
-
- 11 Dec, 2017 23 commits
-
-
Fatih Acet authored
rename remaining issue_ prefixed files See merge request gitlab-org/gitlab-ce!15818
-
Stan Hu authored
Ignore temporary table in schema Closes #40976 See merge request gitlab-org/gitlab-ce!15866
-
Achilleas Pipinellis authored
Docs: move contributor analytics doc to correct location See merge request gitlab-org/gitlab-ee!3712
-
Robert Speicher authored
Gitaly mirroring migration prep Closes gitaly#816 See merge request gitlab-org/gitlab-ce!15775
-
Robert Speicher authored
[EE] gitaly mirroring prep See merge request gitlab-org/gitlab-ee!3703
-
Jacob Schatz authored
Backport epic in issue See merge request gitlab-org/gitlab-ce!15799
-
Michael Kozono authored
-
Rémy Coutable authored
fixes some markup issues in the js style guide docs See merge request gitlab-org/gitlab-ce!15828
-
Christiaan Van den Poel authored
-
Rémy Coutable authored
Remove the Plan seed entirely and add factories to create them on-demand Closes #4247 See merge request gitlab-org/gitlab-ee!3678
-
Oswaldo Ferreira authored
CE upstream - Wednesday Closes gitlab-ce#40543, gitaly#780, and gitaly#764 See merge request gitlab-org/gitlab-ee!3654
-
Clement Ho authored
Containing epic See merge request gitlab-org/gitlab-ee!3696
-
Victor Wu authored
-
Filipa Lacerda authored
Moved URL utility methods into exported es modules See merge request gitlab-org/gitlab-ce!15783
-
Filipa Lacerda authored
EE port of url-utility-es-module See merge request gitlab-org/gitlab-ee!3685
-
Filipa Lacerda authored
EE- 35724 animate sidebar See merge request gitlab-org/gitlab-ee!3681
-
Filipa Lacerda authored
Animate contextual sidebar; change class names for easier readability Closes #35724 See merge request gitlab-org/gitlab-ce!15797
-
Marcia Ramos authored
-
Achilleas Pipinellis authored
Docs: add index for doc/administration/operations/ See merge request gitlab-org/gitlab-ee!3708
-
Marcia Ramos authored
-
Achilleas Pipinellis authored
Docs: add index for `doc/administration/operations/` See merge request gitlab-org/gitlab-ce!15852
-
Achilleas Pipinellis authored
Standardise on self-signed certificates for PostgreSQL TLS See merge request gitlab-org/gitlab-ee!3547
-
Rémy Coutable authored
Add cop for use of remove_column See merge request gitlab-org/gitlab-ce!15855
-