- 22 Sep, 2016 27 commits
-
-
Rémy Coutable authored
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Achilleas Pipinellis authored
Describe how the recent changes of CI permissions affect builds ## What does this MR do? This describes how the CI permission changes See merge request !6451
-
Douwe Maan authored
Revert the "accurate issuable counts in issuable list" feature ## Why was this MR needed? !6455 introduced a performance killer, so we revert it until we find a proper solution that's not killing performance. ## What are the relevant issue numbers? Revert !6455 and !4960. See merge request !6476
-
Fatih Acet authored
fix dropdowns for mr-versions ## What does this MR do? Change markup of mr version dropdowns to be in line with ui guidelines so that the dropdown content is scrollable. ## Why was this MR needed? Dropdowns were not scrolling. ## 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/21427 cc @brycepj @dzaporozhets See merge request !6460
-
Rémy Coutable authored
API: Return 404 when trying to fork to unaccessible namespace Closes #22417 See merge request !6452
-
Rémy Coutable authored
Fixes protected branches not removing active item ## What does this MR do? Fixes an problem where protected branches weren't getting their active item removed on a second click because they dont have a field value. ## Why was this MR needed? Protected branches could not have their clicked items removed once clicked. See merge request !6440
-
Rémy Coutable authored
Intercept issues search form submit to preserve filters. ## What does this MR do? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/896 by intercepting manual search form submission and redirecting it to use existing logic (now factored out into `executeSearch`). ## Why was this MR needed? Manual form submission (keying in 'enter') in issues search did not preserve applied filters. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/896 See merge request !6054
-
Rémy Coutable authored
Fix pipeline error when trying to read empty merge request diff When a user pushed something which resulted an empty merge request diff, `st_commits` would be `nil`. Therefore we also need to check if there exists `st_commits`. We could tell this from: ``` ruby def commits @commits ||= load_commits(st_commits || []) end ``` and ``` ruby def save_commits new_attributes = {} commits = compare.commits if commits.present? commits = Commit.decorate(commits, merge_request.source_project).reverse new_attributes[:st_commits] = dump_commits(commits) end update_columns_serialized(new_attributes) end ``` Closes #22438 See merge request !6470
-
Rémy Coutable authored
Hotfix the issuable counters when filtering by multiple labels This is an ugly fix, but it make the counters work when multiple labels are selected so I think we should include it in 8.12, and try to find a proper fix afterward. Closes #22421 See merge request !6455
-
Rémy Coutable authored
Update merge request versions documentation with new screenshots For #13570 based on https://gitlab.com/gitlab-org/gitlab-ce/issues/21427 See merge request !6454
-
Rémy Coutable authored
Fixups for Frontend for Merge Request Diff ## What does this MR do? Makes a few revisions to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6343, as per feedback from @DouweM. Specifically, it removes a duplicate in the changelog, removes colons in dropdowns, uses icon helper, and fixes the 'Show original' link path. ## Why was this MR needed? https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6343 was already merged and this is a needed patch. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6343 See merge request !6448
-
Rémy Coutable authored
Update db/schema.rb per most recent migrations See merge request !6446
-
Achilleas Pipinellis authored
Change location and refactor issue closing pattern documentation Split into user and administrator docs: - administration/issue_closing_pattern.md - user/project/issues/automatic_issue_closing.md From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6466 See merge request !753
-
Achilleas Pipinellis authored
Refactor repo restrictions docs See merge request !750
-
Achilleas Pipinellis authored
Reorganize sections in Admin area settings From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5449 See merge request !749
-
Achilleas Pipinellis authored
Bump gitlab-shell upgrade version to 3.6.0 for 8.12 [ci skip] Closes #22442 See merge request !6469
-
Achilleas Pipinellis authored
Fix typos in cycle analytics docs See merge request !6467
-
Achilleas Pipinellis authored
Change location and refactor issue closing pattern documentation ## Moving docs to a new location? See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location - [x] Make sure the old link is not removed and has its contents replaced with a link to the new location. - [x] Make sure internal links pointing to the document in question are not broken. - [x] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory. - [x] If working on CE, submit an MR to EE with the changes as well. See merge request !6466
-
Achilleas Pipinellis authored
Reorganize sections in Admin area settings ## What does this MR do? Some settings were under the "wrong" category. This is an attempt to provide proper categories and move relevant settings there. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20126 See merge request !5449
-
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>
-
Ruben Davila authored
-
Ruben Davila authored
-
Ruben Davila authored
-
Ruben Davila authored
-
Rubén Dávila Santos authored
This reverts merge request !6429
-
- 21 Sep, 2016 13 commits
-
-
Ruben Davila authored
-
Ruben Davila authored
Conflicts: VERSION app/assets/stylesheets/pages/groups.scss app/models/project.rb app/models/snippet.rb config/routes.rb db/schema.rb
-
Douwe Maan authored
Enforce repository size limit across all projects and groups, includes LFS objects in that limit. Limit can be set globally, and overridden per group, and/or project. Backend functionality is there and comprehensive tests are included, but there is still some frontend work to be done and documentation to be added. I'm submitting early for review as we are close to the release. @DouweM @dbalexandre I'd appreciate it if you both could start with the review while I finish the documentation and the missing frontend parts. /cc @JobV @regisF Fixes #559 Replaces gitlab-org/gitlab-ce!6020 ## Screenshots (see gitlab-org/gitlab-ce!6020 for more) ![Screen_Shot_2016-09-18_at_9.55.38_PM](/uploads/66eeaced1f27c7e2115feaa4775a6e99/Screen_Shot_2016-09-18_at_9.55.38_PM.png) ![Screen_Shot_2016-09-18_at_9.57.12_PM](/uploads/d811d6c184044df527bd2f81cff651ce/Screen_Shot_2016-09-18_at_9.57.12_PM.png) ![Screen_Shot_2016-09-18_at_9.58.03_PM](/uploads/a2c5b2695454dda639537304a1bcd99b/Screen_Shot_2016-09-18_at_9.58.03_PM.png) ![Screen_Shot_2016-09-19_at_1.44.19_PM](/uploads/4cc6cca7536787bde49c0b086086cbcb/Screen_Shot_2016-09-19_at_1.44.19_PM.png) See merge request !740
-
Douwe Maan authored
Add ssh key attribute to return attributes I realized that https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/712 would cause a regression with the SSH public key sync. This merge request fixes that functionality. Also, this uses the `Module#prepend` method that @DouweM told me about a while ago. It ends up being a **really** slick way to override a CE method and make future merges really smooth. I like this a lot! Part of this has to be changed in CE because the `#user_attributes` method didn't exist before. I made that change here, and in CE at <LINK MR HERE>. @DouweM What do you think about this usage of `prepend`? cc/ @jacobvosmaer-gitlab See merge request !736
-
Douwe Maan authored
Active Directory ranged member retrieval Related to gitlab-org/gitlab-ee!422 See merge request !719
-
James Lopez authored
-
Rémy Coutable authored
Fix Import/Export security specs Related https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1987#note_83855 See merge request !1997
-
Douwe Maan authored
Import/Export security specs Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20857 Related: https://gitlab.com/gitlab-org/gitlab-ce/issues/20821/ See merge request !1987
-
Robert Speicher authored
Fixed slash commands not loading ## What does this MR do? Fixes an issue with slash commands not working when the autocomplete source is loading & then the new issue button is clicked. This also fixes an issue where the autocomplete source is loaded on pages where it isn't actually needed. ## What are the relevant issue numbers? Closes #21774, #21807 See merge request !6207
-
Achilleas Pipinellis authored
Add docs on Cycle Analytics Document Cycle Analytics first iteration https://gitlab.com/gitlab-org/gitlab-ce/issues/21170 See merge request !6437
-
Yorick Peterse authored
Test if issue authors can access private projects See merge request !6419
-
Rémy Coutable authored
Post-merge improve of CI permissions Improves code from !6409 See merge request !6432
-
Douwe Maan authored
Bump GITLAB_SHELL_VERSION to 3.6.0 for SSH support for LFS. cc @rdavila See merge request !6441
-