| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| | |
# Conflicts:
# db/schema.rb
|
| | | |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* master: (181 commits)
Fixed adding to list bug
Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index
Fixed modal lists dropdown not updating when list is deleted
Fixed remove btn error after creating new issue in list
Removed duplicated test
Removed Masonry, instead uses groups of data
Uses mixins for repeated functions
Fixed up specs
Props use objects with required & type values
Removes labels instead of closing issue when clicking remove button
Fixed JS lint errors
Fixed issue card spec
Added webkit CSS properties
Fixed bug with empty state showing after search Fixed users href path being incorrect
Fixed bug where 2 un-selected issues would stay on selected tab
Fixed DB schema Changed how components are added in objects
Added remove button
Add optional id property to the issue schema
Fixed issue link href
Disabled add issues button if no lists exist
...
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Remove Turbolinks
Closes #25624
See merge request !8570
|
| | | | | |
|
| | | | | |
|
| | |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* master: (83 commits)
Fix small typo on new branch button spec
Abillity to promote project labels to group labels
Update and pin the `jwt` gem to ~> 1.5.6
refactor merge request build service
Update index.md
Clarify that Auto Deploy requires a public project.
cop for gem fetched from a git source
Add CHANGELOG entry
Remove new branch button for confidential issues
Remove flash warning from login page
add complete changelog
Add project ID index to `project_authorizations` table to optimize queries
Fix disable storing of sensitive information when importing a new repo
Fix notification when global=disabled, group=watch
Ensure rake is called within the correct bundle context
Fix 8.16.0 release date.
Improve search within group logic
Add changelog item about new attributes in group api
Update group api doc with full_name and full_path attributes
Add tests for nested groups in search service and search helper
...
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* master: (33 commits)
Improved code style on the issue_sidebar_spec.rb
add CHAGELOG.md entry for !8831
remove assets:compile step from relative_url docs
update scripts and docs to reference the newly namespaced rake task
namespace assets rake tasks to gitlab:assets:*
correct gzip files if they exist as well
automatically correct CSS urls on assets:precompile
remove hard-coded assets path for ace editor modules
Fixed cancel button in the services form not redirecting back to the integrations settings view
Fix search bar search param encoding
Fix a transient failure in the `Explore::ProjectsController` spec
Fix filtering with multiple words
Fix project name label's for reference in project settings
Fixed merge request tabs extra margin
Don't call `#uniq` on a relation
Move Gitlab::Shell and Gitlab::ShellAdapter files to lib/
Move ApplicationSetting DEFAULTS to `.defaults` instead
Move a begin/rescue clause to ApplicationSetting.expire
Use badge partial as single source of truth instead of having 2 partials doing the same
Changes after review
...
|
| | | | | | |
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* master: (389 commits)
Document "No gems fetched from git repositories" policy [ci skip]
Typos
Small gramatical tweaks
Typos
Added PHP & NPM doc
Use `:empty_project` where possible in request specs
Add caching of droplab ajax requests
Use `:empty_project` where possible in model specs
Revert 3f17f29a
Remove unused js response from refs controller
Add MR id to changelog entry
fixed small mini pipeline graph line glitch
Prevent form to be submitted twice
Fix Error 500 when repositories contain annotated tags pointing to blobs
Fix /explore sorting (trending)
Simplify wording in "adding an image" docs
Remove "official merge window" from CONTRIBUTING.md [ci skip]
Update repository check documentation
Fixed flexbox and wrap issues
Update two_factor_authentication.md
...
|
| | |\ \ \ \ \ |
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
world test
Add the following line to GDK Procfile to play with it:
webpack: exec support/exec-cd gitlab npm run dev-server
|
| |\ \ \ \ \ \ \ \
| | |_|_|_|_|_|/
| |/| | | | | | |
|
| | | |_|_|_|_|/
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Allow rendering of PlantUML diagrams in Markdown documents using fenced blocks:
```plantuml
Bob -> Sara : Hello
Sara -> Bob : Go away
```
Closes: #4048
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
hexadecimal-looking domain names
|
| |/ / / / / / |
|
| | |_|_|_|/
|/| | | |
| | | | |
| | | | | |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| | |_|_|/
|/| | |
| | | |
| | | | |
environment
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix race conditions for AuthorizedProjectsWorker
Closes #26194 and #26310
See merge request !8701
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
There were two cases that could be problematic:
1. Because sometimes AuthorizedProjectsWorker would be scheduled in a
transaction it was possible for a job to run/complete before a
COMMIT; resulting in it either producing an error, or producing no
new data.
2. When scheduling jobs the code would not wait until completion. This
could lead to a user creating a project and then immediately trying
to push to it. Usually this will work fine, but given enough load it
might take a few seconds before a user has access.
The first one is problematic, the second one is mostly just annoying
(but annoying enough to warrant a solution).
This commit changes two things to deal with this:
1. Sidekiq scheduling now takes places after a COMMIT, this is ensured
by scheduling using Rails' after_commit hook instead of doing so in
an arbitrary method.
2. When scheduling jobs the calling thread now waits for all jobs to
complete.
Solution 2 requires tracking of job completions. Sidekiq provides a way
to find a job by its ID, but this involves scanning over the entire
queue; something that is very in-efficient for large queues. As such a
more efficient solution is necessary. There are two main Gems that can
do this in a more efficient manner:
* sidekiq-status
* sidekiq_status
No, this is not a joke. Both Gems do a similar thing (but slightly
different), and the only difference in their name is a dash vs an
underscore. Both Gems however provide far more than just checking if a
job has been completed, and both have their problems. sidekiq-status
does not appear to be actively maintained, with the last release being
in 2015. It also has some issues during testing as API calls are not
stubbed in any way. sidekiq_status on the other hand does not appear to
be very popular, and introduces a similar amount of code.
Because of this I opted to write a simple home grown solution. After
all, all we need is storing a job ID somewhere so we can efficiently
look it up; we don't need extra web UIs (as provided by sidekiq-status)
or complex APIs to update progress, etc.
This is where Gitlab::SidekiqStatus comes in handy. This namespace
contains some code used for tracking, removing, and looking up job IDs;
all without having to scan over an entire queue. Data is removed
explicitly, but also expires automatically just in case.
Using this API we can now schedule jobs in a fork-join like manner: we
schedule the jobs in Sidekiq, process them in parallel, then wait for
completion. By using Sidekiq we can leverage all the benefits such as
being able to scale across multiple cores and hosts, retrying failed
jobs, etc.
The one downside is that we need to make sure we can deal with
unexpected increases in job processing timings. To deal with this the
class Gitlab::JobWaiter (used for waiting for jobs to complete) will
only wait a number of seconds (30 by default). Once this timeout is
reached it will simply return.
For GitLab.com almost all AuthorizedProjectWorker jobs complete in
seconds, only very rarely do we spike to job timings of around a minute.
These in turn seem to be the result of external factors (e.g. deploys),
in which case a user is most likely not able to use the system anyway.
In short, this new solution should ensure that jobs are processed
properly and that in almost all cases a user has access to their
resources whenever they need to have access.
|
| |/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Upgrade OmniAuth Ruby gem to 1.3.2
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/26813
See merge request !2056
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Upgrade Brakeman to 3.4.1
Closes #26820
See merge request !8629
|
| | | |_|/
| |/| | |
|
| |/ / /
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit e7fdb1aae5a61b30f66ea3489d4e0759ed8ea3a1, reversing
changes made to 78d710388fbabe27481c77cc353610904465c4df.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/26762
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Switch to sassc-rails
Closes #18432
See merge request !8556
|
| | | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Closes #18432
This uses sassc to compile the application's SASS so it compiles faster.
Without attempting to be very scientific here are some numbers I got:
Using sassc-rails:
```
[1] pry(main)> Benchmark.bm { |bm| bm.report { Rails.application.assets["application.css"] } }
user system total real
1.430000 0.380000 1.810000 ( 1.830753)
```
Using sass-rails:
```
[1] pry(main)> Benchmark.bm { |bm| bm.report { Rails.application.assets["application.css"] } }
user system total real
12.320000 0.530000 12.850000 ( 12.909684)
```
The result is faster page loads when changing CSS in development and
faster precompilation.
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Remove rerun since it's not used anymore
Closes #19633
See merge request !8598
|
| | |/ /
| | |
| | |
| | | |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |/ /
| |
| |
| | |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| | |
| |
| |
| | |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This MR enables rendering of PlantUML diagrams in Asciidoc documents. To add a
PlantUML diagram all we need is to include a plantuml block like:
```
[plantuml, id="myDiagram", width="100px", height="100px"]
--
bob -> alice : ping
alice -> bob : pong
--
```
The plantuml block is substituted by an HTML img element with *src* pointing to
an external PlantUML server.
This MR also add a PlantUML integration section to the Administrator -> Settings
page to configure the PlantUML rendering service and to enable/disable it.
Closes: #17603
|
| | |
| |
| |
| |
| |
| | |
Updated Turbolinks to patched version of turbolinks-classic
See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2048
|
| |\ \
| | |
| | |
| | |
| | | |
Update rubocop and rubocop-rspec to fix build errors
See merge request !8466
|
| | |/ |
|
| | | |
|
| |/
|
|
| |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| | |
|
| |
|
|
| |
ChangeLog: https://github.com/octokit/octokit.rb/releases
|
| |\
| |
| |
| |
| |
| |
| | |
Update vmstat to version 2.3.0
Closes #26114
See merge request !8318
|
| | |
| |
| |
| |
| |
| | |
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/26114
vmstat 2.3.0 fixes an issue with reporting the incorrect # of CPUs. This is used in the GitLab Admin Dashboard.
|
| |/ |
|
| |\
| |
| |
| |
| | |
Added support for Authentiq OAuth provider
See merge request !8038
|
| | | |
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Slack slash commands
## What does this MR do?
Implement Slack Slash Commands by utilizing generalized Mattermost presenter to fulfill Slack requirements.
## Why was this MR needed?
We want to expose Slack Slash Commands as a first-class service.
## What are the relevant issue numbers?
Supersedes !8007
Closes #22182
See merge request !8126
|
| | | |
|
| |\ \
| |/ |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Update grape to 0.18.0
## What does this MR do?
Update grape to 0.18.0. Required for the settings API.
## What are the relevant issue numbers?
#22928
See merge request !8057
|
| | | | |
|
