| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Resolves #14543.
|
| |
|
|
| |
[ci skip]
|
| |
|
|
| |
[ci skip]
|
| |
|
|
| |
Closes #2334
|
| |\
| |
| |
| |
| |
| |
| | |
Fix error when trying to create a wiki page
Closes #15527, #15569, #15623, #15630, #15637, #15653, #15870, #16558, #16875, #16987, #17016, https://github.com/gitlabhq/gitlabhq/issues/10317.
See merge request !3924
|
| | |
| |
| |
| | |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| | |
| |
| |
| |
| |
| | |
Closes #15527.
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This changes 4 things:
1. Project#protected_branches_names has been renamed to
Project#protected_branch_names.
2. Project#open_branches uses a Set for the branch names as checking
values in a Set is faster than checking values in a (large) Array.
3. Some redundant code in Project#open_branches has been removed.
4. Project#protected_branch_names now uses #pluck instead of #map,
removing the need for loading entire DB records into memory.
|
| |/ |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Support supressing text file diffs on the default branch with .gitattributes
This change allows users to suppress diffs for text files by adding an entry to the `.gitattributes` file. To take effect the file present at the HEAD of the default branch.
When rendering a diff, if the file is text according to the charlock holmes gem (via the `text?` method) but the file is not diffable according to the project repository, then a message is displayed stating that the diff was suppressed.
I looked into ways to do this using a `binary` flag as suggested by @stanhu in [this comment](https://gitlab.com/gitlab-org/gitlab-ce/issues/2315#note_4435454), however, there was no good way to seperate what was a real binary file from one that had been marked as not diffable in `.gitattributes`.
Fixes and closes gitlab-org/gitlab-ce#2315.
See merge request !3806
|
| | |
| |
| |
| |
| |
| |
| |
| | |
This is a combination of 3 commits.
- Update the bare repositories info/attributes if the default branch is updated
- Check the diff attributes of a file before showing a diff
- Update CHANGELOG
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Use a better message when milestone is newly created
closes #14982
See merge request !3925
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
make some changes for the checks to determine when the messages should be displayed
add item to changelog and also integration test
make some changes to the test
make some changes
|
| |/
|
|
| |
[ci skip]
|
| |\
| |
| |
| |
| |
| |
| | |
Properly handle bigger files
Closes #3967
See merge request !3718
|
| | | |
|
| |/
|
|
|
|
|
| |
This button depends on Issue#can_be_worked_on? which in turn depends on
Issue#related_branches. By rendering this button asynchronously we can
finally remove all usages of Issue#related_branches and
Issue#referenced_merge_requests from the issues "show" page.
|
| |\
| |
| |
| |
| |
| |
| | |
Add Safari search box bug fix to changelog
See merge request !3951
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Build status `canceled` if any of the jobs canceled
Before this change in case of any of the jobs had been canceled, build status was `failed`.
Closes #14207
See merge request !3778
|
| | |/ |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Use ActionDispatch Remote IP for Akismet checking
Previously all remote IPs appeared at 127.0.0.1, which made Akismet
not very useful. Using the ActionDispatch Remote IP (http://api.rubyonrails.org/classes/ActionDispatch/RemoteIp.html)
should provide more reliable results.
Closes #16629
See merge request !3961
|
| | |/
| |
| |
| |
| |
| |
| |
| | |
Previously all remote IPs appeared at 127.0.0.1, which made Akismet
not very useful. Using the ActionDispatch Remote IP (http://api.rubyonrails.org/classes/ActionDispatch/RemoteIp.html)
should provide more reliable results.
Closes #16629
|
| |/
|
|
|
|
|
|
|
|
| |
These changes were pulled from GitLab EE to support configuring
an alternative API URL than the default https://api.github.com.
In addition, the `verify_ssl` flag allows users to disable SSL cert
checking.
One modification: add a default `args` option if it does not exist
to avoid breaking existing configurations.
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
| |
"CHANGELOG", "NEWS", "HISTORY", and "CHANGES" are recognized as Changelog files.
Also adds relevant tests for each of these names.
Resolves #14864.
|
| |
|
|
|
|
| |
The extra gem isn’t necessary anymore since Rails 4.2 has ActiveJob integration.
Resolves #15575.
|
| |\
| |
| |
| |
| |
| |
| | |
Search ui update
Closes #2537
See merge request !3751
|
| | |
| |
| |
| |
| | |
Changed some variable names
Fixed CHANGELOG entry
|
| | |
| |
| |
| | |
CHANGELOG item
|
| |\ \
| |/
|/|
| |
| |
| |
| | |
Throttle the update of `project.last_activity_at` to 1 minute
This implement [the solution](https://gitlab.com/gitlab-org/gitlab-ce/issues/15094#note_4769387) proposed by @jacobvosmaer.
See merge request !3848
|
| | |
| |
| |
| | |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add new shortcuts
Closes #14904
- On a project: `i` To navigate to New Issue page.
- On a issuable: `l` To open Label dropdown on a issuable.
- Global: Typing `?` multiple times now toggles the modal.
See merge request !3686
|
| | |\ \ |
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
# Conflicts:
# app/views/shared/issuable/_sidebar.html.haml
|
| | |\ \ \ \ |
|
| | | | | | | |
|
| | |_|_|_|/
|/| | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Closes gitlab-org/gitlab-ee#506
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
[ci skip]
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |\ \ \ \ \ |
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Prevent users from deleting Webhooks via API they do not own
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15576
See merge request !1959
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15576
|
| |/ / / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Fixes #15470.
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |\ \ \ \ \ \
| |/ / / / /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Add posibility to define a hidden job without 'script' in .gitlab-ci.yml
References #15451
/cc @ayufan
See merge request !3849
|
| | | | | | | |
|
