| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
# Conflicts:
# app/models/issue.rb
# app/views/projects/_home_panel.html.haml
# app/views/shared/projects/_project.html.haml
# db/schema.rb
# spec/models/project_spec.rb
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | | |
Backport premailer and diff changes from EE
Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
See merge request !3318
|
| | | |
| | |
| | |
| | |
| | | |
# Conflicts:
# Gemfile.lock
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Discussed in #14233.
See [their releases](https://github.com/bbatsov/rubocop/releases) for
more info.
Changes:
- Enable DisplayCopNames for lint output.
- Default behavior for `Alias` changed, set to enforce `prefer_alias_method`.
- Enabling Rails cops changed to new syntax.
- Remove StyleGuides and move Descriptions to comments.
- Add missing cops.
- Add TODOs for cops that should be enabled in the future.
- Set TargetRubyVersion to 2.1.
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| |
| |
| | |
This builds on the changes introduced in
https://gitlab.com/gitlab-org/gitlab_git/merge_requests/72 and results
in merge requests with large diffs (e.g. due to them containing minified
CSS) loading much faster.
|
| | | |
|
| | | |
|
| |\ \
| |/ |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
CSS style guide
Working towards what was discussed in #13552, this adds the [SCSS Linter gem](https://github.com/brigade/scss-lint) for style guide conformity in CI.
TODO:
- [x] Agree on and write SCSS Style Guide Documentation.
- [x] Document the `scss-lint` config file.
- [x] Figure out how best to run this in CI, right now it's taking longer than I would think it should.
- [x] Use CSSComb for auto-correction (Maybe just include a CSSComb config file and have developers run the node package manually if they're interested in using it?).
My logic for not using CSSComb in the first place is that, AFAIK, we don't currently require Node/NPM, even in the dev environment. Maybe I'm wrong about that? `scss-lint` is a Ruby implementation of a similar concept, but it doesn't include autocorrect.
Is there a way we can run get GitLab CI to run `scss-lint` without having to put together the full GitLab application? Seeing as it's just static analysis, it seems like a waste of time/resources.
/cc @jschatz1 @rspeicher
See merge request !3069
|
| | | |
| | |
| | |
| | |
| | |
| | | |
documentation for SCSS Style Guide.
See !3069 for more information.
|
| | | |
| | |
| | |
| | |
| | | |
This reverts commit 01160fc06182de89c400af174861f6545ad6ceb8, reversing
changes made to 4bff9daf8b6d85e9c78565e21cfaa3f6d36f0282.
|
| | | | |
|
| | |/ |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Upgrade `omniauth-saml` to 1.5.0 and document it's new capabilities.
With this MR I'm upgrading `omniauth-saml` to 1.5.0 to include new and improved functionality. See https://github.com/omniauth/omniauth-saml/blob/master/CHANGELOG.md for more details.
This MR includes new documentation, so @axil can you also take a look?
/cc @DouweM
See merge request !3170
|
| | |/
|/| |
|
| | |\
|/ /
| |
| |
| |
| |
| |
| | |
Updated gitlab_git to 9.0.1
This includes gitlab-org/gitlab_git!69 and will hopefully solve
gitlab-org/gitlab-ce#13808.
See merge request !3123
|
| | |
| |
| |
| |
| | |
This includes gitlab-org/gitlab_git!69 and will hopefully solve
gitlab-org/gitlab-ce#13808.
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Bump poltergeist to `~> 1.9.0`
See merge request !3116
|
| | |/ |
|
| | | |
|
| |/ |
|
| |\
| |
| |
| |
| |
| |
| | |
Upgrade carrierwave to 0.10.0.
Closes #2805
See merge request !3084
|
| | | |
|
| | | |
|
| | | |
|
| |/ |
|
| |
|
|
| |
Closes #6069
|
| |
|
|
|
| |
See https://groups.google.com/forum/#!msg/rubyonrails-security/ddY6HgqB2z4/we0RasMZIAAJ
and https://groups.google.com/forum/#!msg/rubyonrails-security/ly-IH-fxr_Q/WLoOhcMZIAAJ
|
| |
|
|
|
|
| |
In an effort to get the JS file size down, i've removed NGProgress and replaced with TurboLinks own loading indicator
Ref #13820
|
| |\ |
|
| | | |
|
| |\ \
| |/ |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Revert "Remove newrelic gem. Closes #12860"
This reverts commit 531767175f0a364a332c74bf27c5f202732ce519.
Conflicts:
Gemfile.lock
See merge request !2943
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit 531767175f0a364a332c74bf27c5f202732ce519.
Conflicts:
Gemfile.lock
|
| |\ \ \
| |/ / |
|
| | |/ |
|
| | | |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Update Gemojione for new hotness :sparkles:
Before | After
------ | -----
 | 
See merge request !2800
|
| | | | |
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Bump unicorn to `~> 4.9.0`
Closes #2820
See merge request !2843
|
| | | | | |
|
| | |/ /
| | |
| | |
| | |
| | |
| | | |
Sometimes the output of Allocations.to_hash may contain garbage. See
https://gitlab.com/gitlab-org/allocations/commit/15d3a39f51392013dcf5f88dd21fab31201350ce
for more information.
|
| |\ \ \
| |/ /
| | |
| | |
| | | |
Conflicts:
app/models/user.rb
|
| | |/ |
|
| | |
| |
| |
| | |
Closes #13218
|
| |/ |
|
| |\
| |
| |
| |
| |
| |
| |
| | |
Dedicated method for counting commits between refs
Corresponding gitlab_git merge request: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/66
Issue that lead to these changes: https://gitlab.com/gitlab-org/gitlab-ce/issues/12619
See merge request !2707
|
| | |
| |
| |
| |
| |
| |
| | |
gitlab_git 8.1 adds the ability to count the amount of commits between
two references without having to allocate anything but regular
Rugged::Commit objects. This in turn speeds up the process of counting
the number of commits a branch is ahead/behind by about 3.5x.
|
| |\ \
| |/
|/|
| |
| |
| |
| | |
Remove newrelic gem. Closes #12860
See merge request !2682
|
