- 25 Jan, 2018 40 commits
-
-
Filipa Lacerda authored
* master: (34 commits) Add a lint check to restrict use of Rugged, EE version Fix EE offenses to the RSpec/SingleLineHook cop Update qa.rb Use flash message instead of regular text block Update common.rb Update gitlab-styles and re-enable the RSpec/SingleLineHook cop again Move EE-specific migrations under ee/db/ Make Gitlab::Git::Repository#run_git private Update secret_values to support dynamic elements within parent Improve PostgreSQL warning message in Rake task Improve warning message about the replication status Add a warning for Postgresql < 9.6 when show replication status Refactored expand_section to use name instead of selector Refactored view/element definition to dry up add view/element, some small fixes and code refactor Small fixes and codestyle changes Reduced rename replication spec steps to the bare minimum. Dont send enter key Refactor to address codestyle feedback Make AdvancedSettings a Page and move `rename_to to it. ...
-
Rémy Coutable authored
Add a lint check to restrict use of Rugged, EE version See merge request gitlab-org/gitlab-ee!4251
-
Jacob Vosmaer (GitLab) authored
-
Filipa Lacerda authored
-
Stan Hu authored
Geo: Improve replication status. Using pg_stat_wal_receiver Closes #3256 See merge request gitlab-org/gitlab-ee!4187
-
Rémy Coutable authored
Make Gitlab::Git::Repository#run_git private, EE version See merge request gitlab-org/gitlab-ee!4228
-
Tim Zallmann authored
Add Epic information for selected issue in Issue boards sidebar Closes #4289 See merge request gitlab-org/gitlab-ee!4104
-
Filipa Lacerda authored
Update secret_values to support dynamic elements within parent -- EE merge edition See merge request gitlab-org/gitlab-ee!4222
-
Filipa Lacerda authored
-
Filipa Lacerda authored
Fix conflicts for app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
-
Filipa Lacerda authored
Fix conflicts for app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue
-
Filipa Lacerda authored
Fix conflicts for app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue
-
Robert Speicher authored
[EE] Resolve "Re-enable the `RSpec/SingleLineHook` cop" See merge request gitlab-org/gitlab-ee!4248
-
Grzegorz Bizon authored
Move EE-specific migrations under ee/db/ Closes #3094 See merge request gitlab-org/gitlab-ee!3831
-
Grzegorz Bizon authored
Geo project replication QA See merge request gitlab-org/gitlab-ee!3893
-
GitLab Bot authored
# Conflicts: # app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue # app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue # app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue # app/assets/javascripts/vue_merge_request_widget/dependencies.js [ci skip]
-
Douwe Maan authored
Make Gitaly RepositoryExists opt-out See merge request gitlab-org/gitlab-ce!16680
-
Jacob Vosmaer (GitLab) authored
-
Rémy Coutable authored
Look at system notes created just before merge as well as after, when deciding if an MR can be reverted Closes #42377 See merge request gitlab-org/gitlab-ce!16678
-
Jacob Schatz authored
Add note within ux documentation that further changes should be made within the… See merge request gitlab-org/gitlab-ce!16686
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Grzegorz Bizon authored
Resolve "Asset was not declared to be precompiled in production, favicon-green.ico" Closes #4666 See merge request gitlab-org/gitlab-ee!4212
-
Douwe Maan authored
Resolve "High rate of config.lock file errors on Geo testbed" Closes #4693 See merge request gitlab-org/gitlab-ee!4249
-
Marin Jankovski authored
CE upstream - Wednesday Closes gitaly#921 and gitaly#929 See merge request gitlab-org/gitlab-ee!4242
-
Rémy Coutable authored
Default to HTTPS for all Gravatar URLs See merge request gitlab-org/gitlab-ce!16666
-
Grzegorz Bizon authored
Generate ssh key on the fly for QA See merge request gitlab-org/gitlab-ce!16562
-
Grzegorz Bizon authored
-
Phil Hughes authored
Moves status icon into a vue file and adds tests See merge request gitlab-org/gitlab-ce!16703
-
Phil Hughes authored
Add modal for deleting a milestone (EE port) Closes gitlab-ce#41314 See merge request gitlab-org/gitlab-ee!4157
-
Phil Hughes authored
Add modal for deleting a milestone Closes #41314 See merge request gitlab-org/gitlab-ce!16229
-
Marin Jankovski authored
Revert "Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'" See merge request gitlab-org/gitlab-ce!16707
-
Nick Thomas authored
On MySQL, at least, `Note#created_at` doesn't seem to store fractional seconds, while `MergeRequest::Metrics#merged_at` does. This breaks the optimization assumption that we only need to search for notes created *after* the MR has been merged. Unsynchronized system clocks also make this a dangerous assumption to make. Adding a minute of leeway still optimizes away most notes, but allows both cases to be handled more gracefully. If the system clocks are more than a minute out, we'll still be broken, of course.
-
Oswaldo Ferreira authored
This reverts commit 9f5390d8, reversing changes made to c28ffa1d.
-
Nick Thomas authored
-
Valery Sizov authored
-
Douwe Maan authored
Revert "Merge branch 'remove-rugged-walk' into 'master'" See merge request gitlab-org/gitlab-ce!16676
-
Douwe Maan authored
This reverts merge request !16626
-
Grzegorz Bizon authored
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Can parse root .gitattributes file for a ref See merge request gitlab-org/gitlab-ce!16418
-