- 19 Dec, 2016 16 commits
-
-
Alfredo Sumaran authored
Geo: Improve project view UI to teach users how to clone from a secondary Geo node and push to a primary. This Merge request adds a new button into the "repository clone widget" to guide Geo (#76) users how to define a different remote URL for pushing code. We can infer the primary's node URL when using `HTTP` method, but not for `SSH` or `Kerberos` (as they can vary according to configuration defined into config files). For the `HTTP` method the instruction will be "complete", while for the others there will be a placeholder instead of the primary's node URL for that repository. (See screenshots below) Checklist - [x] Display a button after the clipboard icon only in secondary Geo nodes - [x] Clicking in the Geo info button, shows up a dialog with instructions - [x] Instructions use the selected clone mode to display correct text (HTTP/SSH/KERBEROS) Closes #789 ---- ![http_clone](/uploads/4e0298faab6ea602aba158e61d7a3d2c/http_clone.png) ![ssh_clone](/uploads/2e9d421de842db0a938c181326522fd2/ssh_clone.png) See merge request !905
-
Douglas Barbosa Alexandre authored
CE upstream Unmerged paths: (use "git add/rm ..." as appropriate to mark resolution) ``` both modified: Gemfile.lock both modified: app/assets/javascripts/diff_notes/diff_notes_bundle.js.es6 both modified: app/assets/javascripts/merge_request_widget.js.es6 both modified: app/assets/javascripts/protected_branches/protected_branch_dropdown.js.es6 both modified: app/assets/javascripts/protected_branches/protected_branch_edit.js.es6 both modified: app/assets/stylesheets/framework/variables.scss both added: app/controllers/concerns/oauth_applications.rb both modified: app/controllers/concerns/service_params.rb both modified: app/helpers/projects_helper.rb both modified: app/helpers/sorting_helper.rb both modified: app/models/project.rb both modified: app/policies/group_member_policy.rb both modified: app/policies/group_policy.rb both modified: app/views/projects/merge_requests/widget/_open.html.haml both modified: app/views/projects/merge_requests/widget/open/_accept.html.haml both added: changelogs/unreleased/25482-fix-api-sudo.yml both modified: config/application.rb both modified: config/gitlab.yml.example both modified: db/schema.rb both modified: doc/README.md deleted by them: features/admin/settings.feature both modified: features/steps/shared/paths.rb both modified: lib/api/helpers.rb both modified: public/500.html both modified: public/502.html both modified: spec/features/admin/admin_settings_spec.rb both modified: spec/javascripts/awards_handler_spec.js both modified: spec/lib/gitlab/auth_spec.rb both modified: spec/models/project_services/chat_message/pipeline_message_spec.rb both modified: spec/requests/api/helpers_spec.rb ``` See merge request !974
-
Rémy Coutable authored
Since 9f97fa4d, we don't always set label_ids, meaning that we don't call `issuable.update` is `params` are empty. The issue is that if you only send a `/spent 5m` command, it builds an associated `timelogs` record on the issuable that is only save when we update the issuable. For now, we check that if we have a `spent_time`, we need to update the issuable in order to save the associated record. This should be improved. Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Douglas Barbosa Alexandre authored
This reverts commit 25b842d1.
-
Rémy Coutable authored
EE: Accept environment variables from the `pre-receive` script - EE version of gitlab-org/gitlab-ce!7967 See merge request !964
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Stan Hu authored
Fix broken specs related to Jenkins service. See merge request !976
-
Stan Hu authored
Check if selected object is valid before passing to calback See: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/974#note_20210158 See merge request !977
-
Ruben Davila authored
-
Alfredo Sumaran authored
-
Stan Hu authored
-
Stan Hu authored
-
Stan Hu authored
Always use `fixture_file_upload` helper to upload files in tests. See merge request !975
-
Ruben Davila authored
* Also is not a good idea to use File.open without closing the file handler. We should use it with a block or close it explicitly.
-
- 17 Dec, 2016 24 commits
-
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
Port of "Add Mattermost Service" to EE See merge request !972
-
Sean McGivern authored
Update the "remove an estimation" command. The current documentation is not up to date with the current Gitlab version. The current command is `/remove_estimate` to remove estimation time of an issue. See merge request !970
-
Sean McGivern authored
Enable Style/MultilineOperationIndentation in Rubocop Fixes #25741 See merge request !8125
-
Douglas Barbosa Alexandre authored
-
Felipe Artur authored
-
Felipe Artur authored
-
Grzegorz Bizon authored
Mattermost session This branch is based of tag v8.14.4 so I could test on an instance better. But stuck on the tests, as setting up the whole doorkeeper stuff doesn't seem to be supported for testing. See merge request !8033
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-
Z.J. van de Weg authored
-
Z.J. van de Weg authored
-
Z.J. van de Weg authored
-
Stan Hu authored
Don't delete branches/tags that contains changes only in the remote mirror. Closes #588 See merge request !968
-
Nick Thomas authored
Fix restart link on doc/pages/administration.md The links for `restart_gitlab.md` and `backup_restore.md` both had an extra `../`, resulting in a `404` on https://docs.gitlab.com/ee/pages/administration.html#nginx-configuration As mentioned in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/967#note_20134955 See merge request !973
-
Sean McGivern authored
Cleaner merge commit messages Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23462 See merge request !7722
-
James Edwards-Jones authored
-
Douglas Barbosa Alexandre authored
Add sorting functionality for group/project members ## What does this MR do? This MR adds sort functionality to group/project members list. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? This MR helps the user to manage and find users of a group/project fast. It also improves UX. ## Screenshots (if relevant) **Before** ![before-pr-member](/uploads/412bfdfddc63e48a62e2095d664660b5/before-pr-member.png) **After** ![pr-after](/uploads/ae23a5c7689b46d26a948f22a0ac2360/pr-after.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21622 Closes #23573 See merge request !7032
-