- 23 Sep, 2016 2 commits
-
-
Katrin Leinweber authored
-
Katrin Leinweber authored
-
- 22 Sep, 2016 2 commits
-
-
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
Split into user and administrator docs: - administration/issue_closing_pattern.md - user/project/issues/automatic_issue_closing.md [ci skip]
-
- 21 Sep, 2016 16 commits
-
-
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
Refactor repo restrictions docs See merge request !750
-
Achilleas Pipinellis authored
-
Achilleas Pipinellis authored
- Create new 'Abuse reports' group - Create new 'Usage statistics' group - Create new 'Email' group
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Achilleas Pipinellis authored
-
Douwe Maan authored
Active Directory ranged member retrieval Related to gitlab-org/gitlab-ee!422 See merge request !719
-
Achilleas Pipinellis authored
-
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
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
-
Patricio Cano authored
-
Drew Blessing authored
-
Patricio Cano authored
-
Drew Blessing authored
-
Patricio Cano authored
Merge branch 'repository-size-restrictions' of gitlab.com:gitlab-org/gitlab-ee into repository-size-restrictions
-
Patricio Cano authored
-
- 20 Sep, 2016 20 commits
-
-
Douwe Maan authored
# Conflicts: # lib/gitlab/git_access.rb
-
Rubén Dávila Santos authored
8-12-stable-ee to EE See merge request !747
-
Patricio Cano authored
-
Rubén Dávila Santos authored
Fixes protected branches not removing active item /cc @alfredo1 @lbennett See merge request !746
-
Luke Bennett authored
-
Rubén Dávila Santos authored
Disable default access level in protected branch spec EE protected branches allow for multiple push and merge access levels per branch, whereas CE protected branches only allow one level per branch. The `ProtectedBranch` factory was by default adding Master access by default. This fix forces the spec to use one access level. See merge request !745
-
Stan Hu authored
-
Ruben Davila authored
-
Ruben Davila authored
It was accidentally intropduced when doing a cherry-pick of a merge request commit.
-
Ruben Davila authored
Conflicts: VERSION doc/api/projects.md lib/api/groups.rb lib/api/projects.rb spec/lib/gitlab/backend/shell_spec.rb spec/models/repository_spec.rb
-
Robert Speicher authored
Add more usage data to EE ping This MR loads the EE usage ping asynchronously on the admin application settings page and now includes the counts of the following items: * Comments * Groups * Users * Projects * Issues * Labels * CI builds * Snippets * Milestones * Todos * Pushes * Merge requests * Environments * Triggers * Deploy keys * Pages * Project Services * Issue Boards * CI Runners * Deployments * Geo Nodes * LDAP Groups * LDAP Keys * LDAP Users * LFS objects * Protected branches * Releases * Remote mirrors * Web hooks Closes #997 See merge request !735
-
Jacob Schatz authored
Fix branch title trailing space on hover ## What does this MR do? Removes the unnecessary encapsulation of the `<span>` inside of the `<a>` which was creating the trailing space on hover. ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Makes the UI look more polished ## What are the relevant issue numbers? Closes #20676 ## Screenshots (if relevant) Before (When hovering on branch title): ![Screen_Shot_2016-08-05_at_2.54.43_PM](/uploads/1c90ae1ed69268a2fdcdafdede267028/Screen_Shot_2016-08-05_at_2.54.43_PM.png) After (When hovering on branch title): ![Screen_Shot_2016-08-05_at_2.54.19_PM](/uploads/6eab261a343e7acb6223ed205443b644/Screen_Shot_2016-08-05_at_2.54.19_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] 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 !5688
-
Jacob Schatz authored
Add delimiter to project stars and forks count ## What does this MR do? Adds the `number_with_delimiter()`to the project stars and fork counts on the projects dashboard. ## Are there points in the code the reviewer needs to double check? Shouldn't be any
😃 ## Why was this MR needed? Improve readability and adhere to the [UI guide](https://gitlab.com/help/development/ui_guide.md#counts) ## What are the relevant issue numbers? Closes #20746 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-09_at_1.30.44_PM](/uploads/69592ce220d64774e265cfbcfcb6864a/Screen_Shot_2016-08-09_at_1.30.44_PM.png) After: ![Screen_Shot_2016-08-09_at_1.30.58_PM](/uploads/1470179256614c2e47cc9d0e49aeaf09/Screen_Shot_2016-08-09_at_1.30.58_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] 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 !5741 -
Rémy Coutable authored
Fix issues with wrong issues/merge request counts when filters are selected Closes #15356 plus counter for issues and MR are now displayed for the these paths `https://gitlab.com/groups/group-name/issues` `https://gitlab.com/groups/group-name/merge_requests` `https://gitlab.com/dashboard/issues` and `https://gitlab.com/dashboard/merge_requests` See merge request !4960
-
Jacob Vosmaer (GitLab) authored
Security and safety improvements for gitlab-workhorse integration Companion to https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/60 - Use a custom content type when sending data to gitlab-workhorse - Verify (using JWT and a shared secret on disk) that internal API requests came from gitlab-workhorse This will allow us to build features in gitlab-workhorse that require more trust, and protect us against programming mistakes in the future. This is designed so that no action is required for installations from source. For omnibus-gitlab we need to add code that manages the shared secret. See merge request !5907 Conflicts: GITLAB_WORKHORSE_VERSION doc/install/installation.md doc/update/8.11-to-8.12.md lib/gitlab/workhorse.rb spec/lib/gitlab/workhorse_spec.rb spec/requests/ci/api/builds_spec.rb spec/requests/git_http_spec.rb
-
Robert Speicher authored
Add more usage data to EE ping This MR loads the EE usage ping asynchronously on the admin application settings page and now includes the counts of the following items: * Comments * Groups * Users * Projects * Issues * Labels * CI builds * Snippets * Milestones * Todos * Pushes * Merge requests * Environments * Triggers * Deploy keys * Pages * Project Services * Issue Boards * CI Runners * Deployments * Geo Nodes * LDAP Groups * LDAP Keys * LDAP Users * LFS objects * Protected branches * Releases * Remote mirrors * Web hooks Closes #997 See merge request !735
-
Rémy Coutable authored
Allow the Rails cookie to be used for API authentication Makes the Rails cookie into a valid authentication token for the Grape API, and uses it instead of token authentication in frontend code that uses the API. Rendering the private token into client-side javascript is a security risk; it may be stolen through XSS or other attacks. In general, re-using API code in the frontend is more desirable than implementing endless actions that return JSON. Closes #18302 See merge request !1995
-
Patricio Cano authored
-
Patricio Cano authored
Limit can be set globally, and overridden per group, and/or project.
-
Rémy Coutable authored
Allow to set request_access_enabled for groups and projects using API Closes #20978 See merge request !6359
-