- 14 Sep, 2016 12 commits
-
-
Rémy Coutable authored
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Douwe Maan authored
Exclude some pending or inactivated rows in Member scopes An unapproved request or not-yet-accepted invite should not give access rights. Neither should a blocked user be considered a member of anything. One visible outcome of this behaviour is that owners and masters of a group or project may be blocked, yet still receive notification emails for access requests. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21650 See merge request !1994
-
Ruben Davila authored
-
Rémy Coutable authored
Fix merge conflict size limit ## What does this MR do? The merge conflict size limit was set to 100 KB, but the docs (and the test repo, which the feature specs use) say 200 KB! ## Are there points in the code the reviewer needs to double check? Don't think so. ## Why was this MR needed? Derp. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6052
-
Douwe Maan authored
Fix GitLab import button cc @MrChrisW Closes gitlab-org/gitlab-ce#21795 See merge request !6167
-
Yorick Peterse authored
Fix DB schema to match latest migration See merge request !6256
-
Douwe Maan authored
Merge branch '21109-discussion-resolve-runs-a-single-update-query-per-note-but-should-run-a-single-update-query-for-all-notes-instead' into 'master' Optimize discussion notes resolving and unresolving ## What does this MR do? Optimize discussion notes resolving and unresolving ## Are there points in the code the reviewer needs to double check? Some changes had to be made to the discussion spec to account for the fact that notes are not individually updated now. I only focused on adapting them for the purpose of the regression fix, but admittedly they could be further improved in readability. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21109 See merge request !6141
-
Rémy Coutable authored
Fix intermittent spec failures with spec/features/issues/user_uses_slash_commands_spec.rb This MR solves the intermittent spec failure: ``` 1) Issues > User uses slash commands behaves like issuable record that supports slash commands in its description and notes note on issue with a note changing the issue's title when current user cannot change title of issue does not reopen the issue Failure/Error: Gitlab::Routing.url_helpers.namespace_project_url(self.namespace, self) ActionController::UrlGenerationError: No route matches {:action=>"show", :controller=>"projects", :id=>#<Project id: 1, name: "project135", path: "gitlabhq", description: nil, created_at: "2016-08-31 20:45:48", updated_at: "2016-08-31 20:45:48", creator_id: 2, issues_enabled: true, merge_requests_enabled: true, wiki_enabled: true, namespace_id: 2, snippets_enabled: true, last_activity_at: "2016-08-31 20:45:48", import_url: nil, visibility_level: 20, archived: false, avatar: nil, import_status: "none", repository_size: 0.0, star_count: 0, import_type: nil, import_source: nil, commit_count: 0, import_error: nil, ci_id: nil, builds_enabled: true, shared_runners_enabled: true, runners_token: "_rNZHgsHzaDWGbyL3L2F", build_coverage_regex: nil, build_allow_git_fetch: true, build_timeout: 3600, pending_delete: false, public_builds: true, pushes_since_gc: 0, last_repository_check_failed: nil, last_repository_check_at: nil, container_registry_enabled: true, only_allow_merge_if_build_succeeds: false, has_external_issue_tracker: false, repository_storage: "default", request_access_enabled: true, has_external_wiki: false, lfs_enabled: nil>, :namespace_id=>nil} missing required keys: [:namespace_id] Shared Example Group: "issuable record that supports slash commands in its description and notes" called from ./spec/features/issues/user_uses_slash_commands_spec.rb:6 # ./app/models/project.rb:611:in `web_url' # ./app/models/project.rb:975:in `hook_attrs' # ./lib/gitlab/data_builder/note.rb:58:in `build_base_data' # ./lib/gitlab/data_builder/note.rb:38:in `build' # ./app/services/notes/post_process_service.rb:19:in `hook_data' # ./app/services/notes/post_process_service.rb:23:in `execute_note_hooks' # ./app/services/notes/post_process_service.rb:14:in `execute' # ./app/workers/new_note_worker.rb:10:in `perform' # ./app/services/notes/create_service.rb:29:in `execute' # ./app/controllers/projects/notes_controller.rb:26:in `create' # ./lib/gitlab/request_profiler/middleware.rb:15:in `call' # ./lib/gitlab/middleware/go.rb:16:in `call' # ./lib/gitlab/middleware/static.rb:9:in `call' ``` There were a number of issues: 1. Sidekiq async tasks were being run after project namespaces were deleted. Use Sidekiq in fake mode to prevent this from Sidekiq tasks from being enqueued in the first place. 2. Some outstanding Ajax requests (e.g. autocomplete) were still being loaded while `DatabaseCleaner` ran 3. `logout` did not always wait for logout actually to complete Closes #21723 See merge request !6271
-
Jacob Schatz authored
Fix unnecessary horizontal scroll area in pipeline visualizations ## What does this MR do? Removes a min-width attribute for the build pipeline visualization wrapper ## Are there points in the code the reviewer needs to double check? I am curious why this line was there in the first place. Perhaps I'm just not seeing it. ## Why was this MR needed? I was noticing an unnecessary horizontal scroll bar when viewing pipeline visualizations embedded in merge request builds tab: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5627/builds ## What are the relevant issue numbers? Line appears to have been introduced in !5742 ## Screenshots (if relevant) ![Screen_Shot_2016-08-24_at_11.15.13_PM](/uploads/e395ed8d4415187735d06b8386fe4633/Screen_Shot_2016-08-24_at_11.15.13_PM.png) ## Does this MR meet the acceptance criteria? As this is a very simple cosmetic change, I don't think it warrants inclusion in the changelog, documentation, or tests. - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6005
-
Rémy Coutable authored
Fix an error where we were unable to create a CommitStatus for running state Due to severe refactoring of Pipeline we introduced regression in how CommitStatus is handled. We received an report that it's impossible to create a CommitStatus with state `running` when there were not previous status. The support for Commit Statuses should be simplified. Right now I'm doing minimal change to move forward and fix a bug, but I'll create a new MR that will move all logic that is now part of `lib/api/commit_statuses.rb` to separate service to simplify the implementation. This error happens due to the fact that we introduced additional status of builds: `created`. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21345 See merge request !6107
-
Robert Speicher authored
Restore SSH Key title auto-population behavior Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21823 See merge request !6186
-
- 08 Sep, 2016 1 commit
-
-
Ruben Davila authored
-
- 07 Sep, 2016 2 commits
-
-
Ruben Davila authored
-
Fatih Acet authored
Added search for all lists on issue boards Adds a search box to allow the user to search all lists in issue boards rather than just the backlog. ![Screen_Shot_2016-08-30_at_10.33.15](/uploads/67e96055d60a9b3209ce3831a1980c09/Screen_Shot_2016-08-30_at_10.33.15.png) ![Screen_Shot_2016-08-30_at_10.33.19](/uploads/8d5253b8f2ecf1cf9a69d70be8ccf1f9/Screen_Shot_2016-08-30_at_10.33.19.png) Closes #21139 See merge request !6101 Conflicts: app/assets/stylesheets/pages/boards.scss app/views/projects/boards/components/_board.html.haml
-
- 06 Sep, 2016 14 commits
-
-
Annabel Dunstone Gray authored
Merge branch '18851-commit-text-in-activity-commits-page-etc-has-the-wrong-line-height' into 'master' Changed `.commit-row-title` `line-height` to `1.35` from `1` ## What does this MR do? Changes `.commit-row-title` `line-height` to `1.35` from `1`, this is to match the `line-height: 20px;` from before 41c2ea9b. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Not enough space between commit lines ## What are the relevant issue numbers? Closes #18851. ## Screenshots (if relevant) New screenshot below. ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) Closes #18851 See merge request !5996
-
Fatih Acet authored
Reduce intermittent spec failures by making VueJS resource interceptor decrement outstanding resource counts when HTTP response is received Before the count would be reduced 500 ms after a DOM update tick, which could cause race conditions since the `DatabaseCleaner` could run in the middle of a Rails controller handling the response. Partial fix to #21197 and other intermittent spec failures. See merge request !6224
-
Rémy Coutable authored
Support empty PG database too cc @rdavila @axil See merge request !6221
-
Ruben Davila authored
-
Douwe Maan authored
Fix expiration date picker after update @DouweM this object is now on `gl`, not on the window. It would only break when trying to use the date picker on a newly-inserted member element, but I figure it's probably worth sneaking into a patch. See merge request !6184
-
Rubén Dávila Santos authored
Remove gitorious from import_sources on ApplicationSetting model Removes 'gitorious' as import field from the import_sources field on ApplicationSetting Closes #21804 cc @markglenfletcher See merge request !6180
-
Fatih Acet authored
Fix suggested colors options for new labels in the admin area ## What does this MR do? Execute the JS related to the suggested colors options when user access the new label in the admin area. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Clicking in a suggested color when creating a new label in the admin area don't change the background color. ## Screenshots (if relevant) * Before ![2016-08-31_19.56.14](/uploads/3d50236dac578910c5062aa1e83da350/2016-08-31_19.56.14.gif) * After ![2016-08-31_19.58.59](/uploads/376ffdcbb5b80ef51ab1d642fe9486d0/2016-08-31_19.58.59.gif) ## Does this MR meet the acceptance criteria? - [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21726 See merge request !6138
-
Yorick Peterse authored
Optimize branch lookups and force a repository reload for Repository#find_branch See merge request !6087
-
Fatih Acet authored
Add the total number of issues in the JSON response in issue board lists Add the total number of issues in the JSON response in issue board lists The issue board lists should always show the total number of issues in the list, not the current amount fetched by endless scroll. Closes #21327 See merge request !5904 Conflicts: app/assets/stylesheets/pages/boards.scss app/views/projects/boards/components/_board.html.haml
-
Rémy Coutable authored
Fix confidential issues made public after import Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21803 The gitlab.com import was ignoring the confidential attribute, hence making all issues public after being imported. The API has changed in order to also expose this field. See merge request !1992
-
Douwe Maan authored
Scope webhooks/services that will run for confidential issues Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20661 See merge request !1986 Conflicts: db/schema.rb
-
Fatih Acet authored
Fix alignment of icon buttons ## What does this MR do? Fix misalignment of buttons with only an icon which was introduced by !5451. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5451#note_14066627 ## Screenshots ### Before ![with-text](/uploads/aa7f7a98e2015070689e762e0cf99844/witht-text.png) ![without-text](/uploads/72db7c54e3961fd0df34b0ea79455fd0/without-text.png) ### After ![with-text](/uploads/3f19e55773083bcb22f3909f6dc0d147/witht-text.png) ![without-text](/uploads/b6647d4d71eb5cd9d1712908d2b93665/without-text.png) See merge request !5887
-
Jacob Schatz authored
Fix icon alignment of star and fork buttons ## What does this MR do? Fix alignment of star and fork icons. ## Why was this MR needed? Buttons had more padding on the left than on the right. ## What are the relevant issue numbers? fixes #20001 ## Screenshots <table> <thead><th>Before</th><th>After</th></thead> <tr> <td><img alt="fork-button-before" src="/uploads/664c0bc935f4c48899f5b63a1c215cbc/fork-button-before.png"></td> <td><img alt="fork-button-after" src="/uploads/9385427a5b178487bd24cd2f8ec4a5ed/fork.png"></td> </tr> <tr> <td><img alt="project-buttons-before" src="/uploads/48ef41458433b468afc2919eb24849cc/project-buttons-before.png"></td> <td><img alt="project-buttons-after" src="/uploads/3bafe6e68645d787a2cdb79cd164335f/project-actions.png"></td> </tr> </table> See merge request !5451
-
Jacob Schatz authored
Add hover state to todos ## What does this MR do? - Add a hover state to todos like for repository files. - Fix button alignment in todos - Add link to avatar in todos ## Are there points in the code the reviewer needs to double check? The `border-collapse` part—is there any better way? ## Why was this MR needed? Make hover states consistent. ## What are the relevant issue numbers? fixes #19833 ## Screenshots ### Before ![before](/uploads/cd2e7b234bf08fac48aebb60cdfa26a9/before.png) ### After ![todos-list](/uploads/592457050cb3ff2c43dfcce78418c50b/todos-list.png) ![todos-list-last-hover](/uploads/532714333bc74d1656a5c767012b4cdd/todos-list-last-hover.png) ![todos-mobile](/uploads/d542b04ddebc9d4354d57151dd04c0d2/todos-mobile.png) See merge request !5361
-
- 05 Sep, 2016 2 commits
-
-
Rémy Coutable authored
Remove CHANGELOG entries for unmerged !5361 and !5451 ## What does this MR do? See !6189 See merge request !6204
-
Winnie authored
-
- 01 Sep, 2016 4 commits
-
-
Ruben Davila authored
-
Ruben Davila authored
-
Ruben Davila authored
-
Douwe Maan authored
Remove gitorious ## What does this MR do? Remove gitorious as import source ## Are there points in the code the reviewer needs to double check? Did I remove everything? ## Why was this MR needed? This button yielded a 404 ## What are the relevant issue numbers? Closes #17062 /cc @JobV See merge request !5866
-
- 31 Aug, 2016 5 commits
-
-
Ruben Davila authored
-
Stan Hu authored
lib/backup: fix broken permissions when creating repo dir ## What does this MR do? This MR fixes an issue where gitlab:backup:restore will not work because the repositories directory is set up with bad permissions. The bad permissions will prevent access to the repositories by the git user, causing all kinds of troubles (e.g. gitlab-shell won't install hooks). ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Rake task gitlab:backup:restore would complete successfully, but gitlab:check will report errors and gitlab cannot access repos. ## Screenshots (if relevant) * repositories.old.1472478726 was created without the fix * repositories was created with the fix ![gitlab-repo-permissions](/uploads/6cf2de57fe4f1be0bd5b5e1a13234889/gitlab-repo-permissions.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] 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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !6098
-
Ruben Davila authored
-
Robert Speicher authored
GitHub importer use default project visibility for non-private projects ## What does this MR do? GitHub importer use the `Default Project Visibility` setting for all non-private projects. ## Why was this MR needed? This allow users to import projects when `Public` visibility is restricted. ## What are the relevant issue numbers? Fixes #21437 See merge request !6023
-
Robert Speicher authored
Don't create groups for unallowed users when importing projects Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21457 See merge request !1990
-