GitLab FOSS merge requestshttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests2016-04-05T08:59:36Zhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/87Fix broadcast text2016-04-05T08:59:36ZDrew BlessingFix broadcast text### What does this MR do?
Fix weird text instructions on the broadcast message page.
### Why was this MR needed?
The existing text was extremely confusing. It read: `Hex values as 3 double digit numbers, starting with a # sign.` He...### What does this MR do?
Fix weird text instructions on the broadcast message page.
### Why was this MR needed?
The existing text was extremely confusing. It read: `Hex values as 3 double digit numbers, starting with a # sign.` Hex colors are not always "digits" and saying "3 double digit numbers" is extremely confusing. Just change this to say `6 character hex values starting with a # sign.`https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/89Merge Request and Issue Form Fields2020-03-16T23:29:29ZDrew BlessingMerge Request and Issue Form FieldsI'm going a bit out on a limb on this one. This relates to commit eb4320cb07db2b704d6e976fe9e2ac7d959b6c25. It's something I feel would be useful but I'm open to discussion.
### What does this MR do?
This makes it so the assignee and...I'm going a bit out on a limb on this one. This relates to commit eb4320cb07db2b704d6e976fe9e2ac7d959b6c25. It's something I feel would be useful but I'm open to discussion.
### What does this MR do?
This makes it so the assignee and milestone fields (and labels in the case of issues) are only visible to a user that can modify issues or merge requests. (Which means a developer, master and owner can see the fields in an issue and a master and owner can see the fields in a merge request).
### Why was this MR needed?
In the commit mentioned above the fields were completely removed from merge requests but left fully intact for issues. This merge request solves 2 issues I see:
1. Users that normally don't have abilities to modify issues or merge requests could potentially add an assignee or labels without knowledge of what is helpful. This leads to incorrectly assigned items or weird labels that make no sense.
1. Allow privileged users to complete all steps in one form. As of 6.8 a master or developer has to first create a merge request and then assign a person or add a milestone. This causes an extra step over previous versions of GitLab. It has definitely been a noticeable change in our team workflow.
I don't know the original motivation for removing the fields from merge requests but I have a feeling it could be the first issue mentioned above. If so, I think this is a great solution that meets all needs. I look forward to feedback.
https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/91Issue accessibility improvement2020-03-16T23:30:50Zusername-removed-6325graffatcolmingov@gmail.comIssue accessibility improvementWorking from [this interactive assessment tool](http://wave.webaim.org/report#/https%3A%2F%2Fgitlab.com%2Fgitlove%2Fgitlove%2Fissues%2F5) this is the beginning of making each individual's page more accessible.Working from [this interactive assessment tool](http://wave.webaim.org/report#/https%3A%2F%2Fgitlab.com%2Fgitlove%2Fgitlove%2Fissues%2F5) this is the beginning of making each individual's page more accessible.https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/95add support for Active Directory sAMAccountName as username and login2016-11-07T19:29:46Zusername-removed-27992add support for Active Directory sAMAccountName as username and loginI had problems with authenticating to Active Directory LDAP with following settings, as described here
http://blog.dimaj.net/content/updated-howto-enable-ldap-filters-gitlab
```ruby
## LDAP settings
ldap:
enabled: true
...I had problems with authenticating to Active Directory LDAP with following settings, as described here
http://blog.dimaj.net/content/updated-howto-enable-ldap-filters-gitlab
```ruby
## LDAP settings
ldap:
enabled: true
host: '192.168.x.xx'
port: 389
uid: 'sAMAccountName'
method: 'plain'
bind_dn: 'CN=Automatic,CN=Users,DC=mycompany,DC=de'
password: 'pa$$word'
allow_username_or_email_login: true
base: 'CN=Users,DC=iteratec,DC=de'
user_filter: '(&(sAMAccountName=%{username})(memberOf=CN=Developers,CN=Users,DC=mycompany,DC=de))'
```
I found following problems:
There are two ways the current mechanism authenticates to LDAP. Both construct the LDAP filter from the user_filter. The one in oauth/user.rb works fine, cause username can be resolved to the member of this user instance executing the filter.construct(). In the second one in adapter.rb this won't work, an exception is thrown but not caught and you see "Access denied for your LDAP account."
The former does successfully create a User on first login in application_controller.rb :authenticate_user! filter , the latter fails in :ldap_security_check filter so the just created user cannot log in.
Another problem as, I think, is in user.rb where the user name is set to a part before the email's @. Which means the filter will replace something that is generated in gitlab. In our case we do not have a field in Active Directory that would match this. So I introduced sAMAccountName as the value for username if it is present, which would leave the current OpenLDAP algorithm as is. As I do not have an OpenLDAP instance to test against, please verify before merging.
In general I tried to be as least invasive as possible, but this was my first ruby hack, so please review if possible.
Thanks
Robhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/98Active directory support2014-05-12T14:41:02Zusername-removed-27992Active directory supportapplied comments of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/95
applied comments of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/95
https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/99Add custom issue regex parameter2020-03-16T23:33:17Zusername-removed-30805Add custom issue regex parameterhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/100Active directory support2016-04-05T08:59:37Zusername-removed-27992Active directory supportapplied review comments from !94, !95 and !98, hope this is itapplied review comments from !94, !95 and !98, hope this is ithttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/102Don’t send the merge notification email to the merger2014-07-03T15:24:10Zusername-removed-18967Don’t send the merge notification email to the mergerCurrently, when a MR is merged, the merger receives an email notification for the merge.
GitLab shouldn't send emails to notify users of their own actions. This commit ensures that, like for any other action, the merger of an MR doesn...Currently, when a MR is merged, the merger receives an email notification for the merge.
GitLab shouldn't send emails to notify users of their own actions. This commit ensures that, like for any other action, the merger of an MR doesn't receive the merge email.https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/106Add Composer Project Service2016-04-05T08:59:37Zusername-removed-33480Add Composer Project ServiceThis commit adds the per-project option to expose a project as a composer package. It generates and maintains a packages.json file (conforming to https://getcomposer.org/doc/05-repositories.md) in the public/ folder, allowing the GitLab...This commit adds the per-project option to expose a project as a composer package. It generates and maintains a packages.json file (conforming to https://getcomposer.org/doc/05-repositories.md) in the public/ folder, allowing the GitLab install to be used as a Composer repository.
```
Note: There is a known issue integrating with the GitLab-Omnibus, namely that the public folder is owned by 'root' and GitLab is run as 'git'.
I'm still working on a suitable workaround and am open to input on solutions.
```
Please see feature thread http://feedback.gitlab.com/forums/176466-general/suggestions/5953067-provide-composer-package-repository-support
When a project that has activated the composer service receives a push, the public /packages.json file will be refreshed to include version definitions for every branch and tag in the project's repository.
Sample Output
```
{
"packages": {
"deja/example": {
"5.26.7": {
"name": "deja/example",
"type": "sample",
"time": "2014-05-27 20-28-05",
"version": "5.26.7",
"version_normalized": "5.26.7.0",
"source": {
"url": "git@git.example.com:deja/example.git",
"type": "git",
"reference": "2e9418c5136b24049533152779b4012a1becad5f"
}
},
"dev-master": {
"name": "deja/example",
"type": "sample",
"require": {
"deja/some-library": "*"
},
"time": "2014-10-29 14-55-33",
"version": "dev-master",
"version_normalized": "9999999-dev",
"source": {
"url": "git@git.example.com:deja/example.git",
"type": "git",
"reference": "c35f345773ea342201dd0a760b46f15bf49ba096"
}
}
},
"deja/some-library": {
"dev-master": {
"name": "deja/some-library",
"type": "library",
"time": "2014-10-29 14-50-12",
"version": "dev-master",
"version_normalized": "9999999-dev",
"source": {
"url": "git@git.example.com:deja/some-library.git",
"type": "git",
"reference": "21bd2acb4a26882c88227d3bc2cbdfbab858d767"
}
}
}
}
}
```https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/113API: List issues for a particular milestone2016-09-21T19:36:08Zusername-removed-35480API: List issues for a particular milestoneThis MR adds a new API method for retrieving the issues associated with a particular milestone. The resource is described at ":id/milestones/:milestone_id/issues", returning a simple array of issues.
This feature was motivated by an ...This MR adds a new API method for retrieving the issues associated with a particular milestone. The resource is described at ":id/milestones/:milestone_id/issues", returning a simple array of issues.
This feature was motivated by an in-house project for reporting--for large projects, retrieving and filtering the entire issue list by milestone was becoming too slow, particularly when pagination required multiple requests. While this resource also uses pagination, it allows the consumer to limit reporting to the particular milestone they are interested in.https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/114Enable STARTTLS on Gitlab::LDAP::Adapter2016-11-07T19:29:49Zusername-removed-35497Enable STARTTLS on Gitlab::LDAP::AdapterNet::LDAP (=0.3.1) supports encryption method 'STARTTLS', but Gitlab::LDAP::Adapter doesn't use it. This causes "Access denied for your LDAP account." on LDAP Signin when LDAP server requires STARTTLS.
This MR fixes Gitlab::LDAP::Adap...Net::LDAP (=0.3.1) supports encryption method 'STARTTLS', but Gitlab::LDAP::Adapter doesn't use it. This causes "Access denied for your LDAP account." on LDAP Signin when LDAP server requires STARTTLS.
This MR fixes Gitlab::LDAP::Adapter can handle both 'ssl' and 'tls' on ldap=>method in gitlab.yml.
For reference, see my slapd.log. before: https://gitlab.com/snippets/1273, after: https://gitlab.com/snippets/1274https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/118Orange color theme2020-03-16T23:33:57Zusername-removed-31425Orange color themeAdded an orange color themeAdded an orange color themehttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/119Add 'Select Font Size' feature2016-04-05T08:59:39Zusername-removed-35517abi@hafs.inAdd 'Select Font Size' featureThe font size in gitlab webpage is too small.
So we add a feature to profile-design setting to select font size.The font size in gitlab webpage is too small.
So we add a feature to profile-design setting to select font size.https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/121Add support for injecting webhook data into the URL2014-06-09T09:57:56Zusername-removed-36224Add support for injecting webhook data into the URLAllow to use the Ruby String format syntax in web hooks URL to inject the top level values of the JSON payload into the URL.
This is a first (very simple) step into being able to inject the POSTed data directly into the URL.
Exampl...Allow to use the Ruby String format syntax in web hooks URL to inject the top level values of the JSON payload into the URL.
This is a first (very simple) step into being able to inject the POSTed data directly into the URL.
Example of push web hook: `http://ci.example.com/build?commit=%{after}`https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/123IPv6 Support for nginx 2017-08-16T13:16:21Zusername-removed-33239IPv6 Support for nginx since nginx is build with "--with-ipv6"(https://gitlab.com/gitlab-org/omnibus-gitlab/commit/d1d99b9c921b67ef0c915c7ce29440665d95aa65) we should use it :) since nginx is build with "--with-ipv6"(https://gitlab.com/gitlab-org/omnibus-gitlab/commit/d1d99b9c921b67ef0c915c7ce29440665d95aa65) we should use it :) https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/124Adding RTL support2020-03-16T23:23:53Zusername-removed-30364Adding RTL supportI have added the direction attribute to all relevant fields in the views of GitLab in order to render RTL texts (like Arabic) correctly.
There is also a small modification in .gitignore file to add ```.AppleDouble``` which is used by ...I have added the direction attribute to all relevant fields in the views of GitLab in order to render RTL texts (like Arabic) correctly.
There is also a small modification in .gitignore file to add ```.AppleDouble``` which is used by Apple Computer to store Mac OS "dual-forked" files on the Unix filesystem.https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/126Try to use username given by omniauth provider2016-11-09T14:22:46Zusername-removed-36741Try to use username given by omniauth providerWhat does this MR do?
Tries to use the username given by an oauth provider
Are there points in the code the reviewer needs to double check?
Perhaps use another condition than empty.
Why was this MR needed?
If an oauth prov...What does this MR do?
Tries to use the username given by an oauth provider
Are there points in the code the reviewer needs to double check?
Perhaps use another condition than empty.
Why was this MR needed?
If an oauth provider is used as external provider it always takes the part before the @ as username regardless if an username is given by the provider or not. Most people are expecting that the username given by the provider is used.
See #326https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/130Fix for issue #347 [Regression in 6.9.2] When editing a Merge Request, branch...2016-11-07T19:29:50Zusername-removed-38731Fix for issue #347 [Regression in 6.9.2] When editing a Merge Request, branches can now be changed againHi GitLabs team,
This is a quick-fix proposal for issue #347.
It copies relevant parts of _new_compare.html.haml into _form.html.haml
I'm not a Ruby expert at all, so the enclosed quick-fix could probably be made better and more...Hi GitLabs team,
This is a quick-fix proposal for issue #347.
It copies relevant parts of _new_compare.html.haml into _form.html.haml
I'm not a Ruby expert at all, so the enclosed quick-fix could probably be made better and more DRY by probably adding a view that is common to _form.html.haml and _new_compare.html.haml, and including it from there.
But this looks to work fine on our gitlab instance.https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/135Improve sidebar styling and behavior for screens smaller than 385px wide2016-11-09T14:22:51Zusername-removed-39458Improve sidebar styling and behavior for screens smaller than 385px wide1. Improves sidebar style and behavior for all touchscreens and screens less than 385 pixels wide
2. Please note the use of media queries; used for upgrading style for desktop/larger screens
3. Why was this MR needed? On sufficiently s...1. Improves sidebar style and behavior for all touchscreens and screens less than 385 pixels wide
2. Please note the use of media queries; used for upgrading style for desktop/larger screens
3. Why was this MR needed? On sufficiently small devices(such as all iPhones), there's no way to hide the sidebar
https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/136Master2016-11-09T14:22:51Zusername-removed-29060MasterTesting MR.Testing MR.