| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
| |
[ci skip]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Make deleting with optimistic locking respect NULL
Make deleting with optimistic locking respect NULL
For now deleting with optimistic locking is broken when
lock_version is still NULL, because Rails would try to
delete with `lock_version = 0` while in the database
the column is still `NULL`.
The monkey patches would force Rails just pass whatever
in the column, and stop Rails from casting `NULL` into `0`
when the value is read from database.
Closes #24766
See merge request !7867
|
|
|
|
|
|
|
|
|
|
| |
Gracefully recover from Redis connection failures in Sidekiq initializer
Precompiling assets and other Rake tasks would fail if Redis were not available in certain cases.
* Closes gitlab-org/gitlab-ce#25143
* Closes gitlab-org/omnibus-gitlab#1743
See merge request !7835
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
'24836-tyeerror-e-is-null-when-clicking-plan-tab-in-cycle-analytics' into 'master'
Pick valid event objects for the events list
## What does this MR do?
Fixes JS error when loading events with possible `null` objects
## What are the relevant issue numbers?
Closes #24836
See merge request !7689
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixed resolved discussion timeago not rendering
## What does this MR do?
Initialises the timeago element when a discussion is updated or resolved.
## Screenshots (if relevant)
![Screen_Shot_2016-11-22_at_11.49.22](/uploads/02900cc4de019ac33cd4d59d586629aa/Screen_Shot_2016-11-22_at_11.49.22.png)
## What are the relevant issue numbers?
Closes #24787
See merge request !7656
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
'master'
resolves updated and resolved status is not showing
## What does this MR do?
This MR fixes #24780
## Are there points in the code the reviewer needs to double check?
NR
## Why was this MR needed?
This MRs removes some important information as par suggested design in #19797. it restores that information
## Screenshots (if relevant)
**Before:**
![before](/uploads/a93091e783de3e550a07ddbc1fa8085a/before.png)
**After:**
![after](/uploads/ceb7f64a6f20155abcf6ea49d4b8059e/after.png)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #24780
See merge request !7655
|
|
|
|
|
|
|
| |
Evalute time_ago method instead of printing it
![Screen_Shot_2016-11-21_at_21.00.34](/uploads/295ffa522865fe1865b0c0b552a49ebf/Screen_Shot_2016-11-21_at_21.00.34.png)
See merge request !7634
|
|
|
|
|
| |
Fix a broken link and avoid potential creation of future broken links on the help page.
See merge request !7582
|
|
|
|
|
|
|
|
| |
Remove caching of events data
This MR removes the caching of events data as this was deemed unnecessary while increasing load on the database. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6578#note_18864037 and 5371da341e9d7768ebab8e159b3e2cc8fad1d827 for more information.
See merge request !6578
|
|
|
|
|
|
|
|
|
|
| |
Revert bump in rufus-scheduler
Somehow `bundle install` with an update to Sidekiq-cron in !7815 caused rufus-scheduler to be bumped, when it doesn't appear absolutely
necessary.
Closes #25160
See merge request !7844
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
'master'
Fixes access to the wiki code with git when repository feature disabled
## What does this MR do?
Allow access to the wiki repository with git when the repository feature is disabled.
## Why was this MR needed?
Without this fix, if you create a wiki only project you are not allowed to download the wiki code from this project.
## Does this MR meet the acceptance criteria?
- [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [ ] ~~API support added~~
- Tests
- [X] Added for this feature/bug
- [ ] All builds are passing
- [X] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Fixes #24931
See merge request !7832
|
|
|
|
|
|
|
| |
Fix a transient spec failure
Closes #24772
See merge request !7825
|
|
|
|
|
|
|
|
|
| |
Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1
The "Enqueue Now" button would not work in the admin panel due to changes in the Web extension interface: https://github.com/ondrejbartas/sidekiq-cron/commit/88ada926132d4658e3fd370c9f44899b6c88ccaf
Closes #24376
See merge request !7815
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix pipelines info being hidden in merge request widget
## What does this MR do?
Reintroduces CSS classes that are necessary for `MergeRequestWidget` to show correct divs.
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- ~~[ ] API support added~~
- Tests
- ~~[ ] Added for this feature/bug~~
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #25055
See merge request !7808
|
|
|
|
|
|
|
|
|
| |
Update GitLab Workhorse to v1.0.1
v1.0.0 was wrongly tagged, causing compiled gitlab-workhorse binaries to misreport their version number.
Closes https://gitlab.com/gitlab-org/gitlab-workhorse/issues/77
See merge request !7759
|
|
|
|
|
|
|
|
|
| |
Clean up JiraService
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24967
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24777
See merge request !7756
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
fix for builds with no start date throwing an error in cycle analytics events
Instead of the error, we should inform that there is no start date
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24925
See merge request !7738
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixed issue boards issue sorting when dragging issue into list
## What does this MR do?
Currently it just appends the new issue to the end of list & then sorts by priority which can cause some strange effects. For example if you drag the issue to the top of the list & then vue re-renders, the issue actually goes to the bottom.
This changes that by adding the issue at the specific index.
## Screenshots (if relevant)
![boards-sorting](/uploads/9aa4a0cb5e0be79e7d24ab2b6abb0bbb/boards-sorting.gif)
See merge request !7734
|
|
|
|
|
|
|
|
| |
Refresh project authorizations using a Redis lease
This MR changes `User#refresh_authorized_projects` so it uses a Redis lease instead of relying on serializable transactions. See the commit message(s) for more details.
See merge request !7733
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
new system note design for commit discussion
## What does this MR do?
This MR implement new system notes design for discussion on a commit.
## Are there points in the code the reviewer needs to double check?
NR
## Why was this MR needed?
It improves UX and coherent style in UI
## Screenshots (if relevant)
**before**
![commit-discussion-before](/uploads/b68ab7cce583a18ac066691448f955e7/commit-discussion-before.png)
**After**
![commit-discussion-after](/uploads/e9c0cb48c29fdd9b6de6f23a3c588d03/commit-discussion-after.png)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #24894
See merge request !7721
|
|
|
|
|
| |
Fix: Timeout creating and viewing merge request for binary file
See merge request !7713
|
|
|
|
|
|
|
|
|
|
| |
'24860-actionview-template-error-undefined-method-size-for-nil-nilclass' into 'master'
Prevent error when submitting a merge request and pipeline is not defined
Closes #24860
See merge request !7707
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixed commit time not rendering after initial page load
## What does this MR do?
Inits the timeago for commits when infinite scrolling which fixes the issue of the timeago not rendering correctly when scrolling down.
## What are the relevant issue numbers?
Closes #24862
See merge request !7704
|
|
|
|
|
|
|
|
|
|
| |
'24813-project-members-with-developer-access-can-no-longer-create-tags' into 'master'
Create tag after running pre-hooks and pass updated SHA to post-hooks
Closes #24813
See merge request !7700
|
|
|
|
|
| |
Rephrase some system notes to be compatible with new system note style
See merge request !7692
|
| |
|
|
|
| |
[ci skip]
|
|
|
|
|
| |
Update grape-entity to 0.6.0
See merge request !7491
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix missing access checks on issue lookup using IssuableFinder
Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867
:warning: - Potentially untested
:bomb: - No test coverage
:traffic_light: - Test coverage of some sort exists (a test failed when error raised)
:vertical_traffic_light: - Test coverage of return value (a test failed when nil used)
:white_check_mark: - Permissions check tested
- [x] :white_check_mark: app/controllers/projects/branches_controller.rb:39
- `before_action :authorize_push_code!` helpes limit/prevent exploitation. Always checks for reporter access so fine with
confidential issues, issues only visible to team, etc.
- [x] :traffic_light: app/models/cycle_analytics/summary.rb:9 [`.count`]
- [x] :white_check_mark: app/controllers/projects/todos_controller.rb:19
- [x] Potential double render in app/controllers/projects/todos_controller.rb
- https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#cedccb227af9bfdf88802767cb58d43c2b977439_24_24
See merge request !2030
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Replace issue access checks with use of IssuableFinder
Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867
## Which fixes are in this MR?
:warning: - Potentially untested
:bomb: - No test coverage
:traffic_light: - Test coverage of some sort exists (a test failed when error raised)
:vertical_traffic_light: - Test coverage of return value (a test failed when nil used)
:white_check_mark: - Permissions check tested
### Issue lookup with access check
Using `visible_to_user` likely makes these security issues too. See [Code smells](#code-smells).
- [x] :vertical_traffic_light: app/finders/notes_finder.rb:15 [`visible_to_user`]
- [x] :traffic_light: app/views/layouts/nav/_project.html.haml:73 [`visible_to_user`] [`.count`]
- [x] :white_check_mark: app/services/merge_requests/build_service.rb:84 [`issue.try(:confidential?)`]
- [x] :white_check_mark: lib/api/issues.rb:112 [`visible_to_user`]
- CHANGELOG: Prevented API returning issues set to 'Only team members' to everyone
- [x] :white_check_mark: lib/api/helpers.rb:126 [`can?(current_user, :read_issue, issue)`] Maybe here too?
- [x] :white_check_mark: lib/gitlab/search_results.rb:53 [`visible_to_user`]
### Previous discussions
- [ ] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#b2ff264eddf9819d7693c14ae213d941494fe2b3_128_126
- [ ] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#7b6375270d22f880bdcb085e47b519b426a5c6c7_87_87
See merge request !2031
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix information disclosure in `Projects::BlobController#update`
It was possible to discover private project names by modifying `from_merge_request`parameter in `Projects::BlobController#update`. This fixes that.
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
https://gitlab.com/gitlab-org/gitlab-ce/issues/22869
See merge request !2023
|
|
|
|
|
|
|
|
| |
Fix label creation non members
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23416
See merge request !2006
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix deselecting calendar days on contribution graph
## What does this MR do?
Fix deselecting calendar days on contribution graph
## Are there points in the code the reviewer needs to double check?
Shouldn't be
## Why was this MR needed?
In `master`, you can currently deselect a calendar day after selecting but you cannot reselect that day.
## Screenshots (if relevant)
Before:
![2016-10-25_10.42.20](/uploads/7d442c09cd15082cf69f673a544b56f9/2016-10-25_10.42.20.gif)
After:
![2016-10-25_10.40.35](/uploads/6123365f0ec63ee84658ee6057e7715c/2016-10-25_10.40.35.gif)
## 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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)
## What are the relevant issue numbers?
Closes #22381
See merge request !6453
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Unify all MR widget text colors and background colors
* Removes darker background color for `skipped` status
* Makes all MR widget text gray
Before:
![Screen_Shot_2016-11-18_at_7.52.16_AM](/uploads/4ee715aec9c453c5cfe1f259049adbde/Screen_Shot_2016-11-18_at_7.52.16_AM.png)
After:
![Screen_Shot_2016-11-18_at_7.52.05_AM](/uploads/ea14d713a4e7d837bac4576815451dce/Screen_Shot_2016-11-18_at_7.52.05_AM.png)
Closes #24639
See merge request !7571
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
'24266-afraid-to-press-the-orange-button-on-merge-request-screen' into 'master'
If Build running change accept merge request when build succeeds button from orange to blue
## What does this MR do?
If Build running change accept merge request when build succeeds button from orange to blue
## Are there points in the code the reviewer needs to double check?
I didn't really check, but to my knowledge these changes should fix it. Would love to know how to set up working pipelines in my local build.
## Why was this MR needed?
orange was to big a warning color for this button
## Screenshots (if relevant)
![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c9100be272c5567ee4dfa281cffaeb7a/_24266_merge-request-01.png)
![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/bb84ea5b519fc67babf8383f3b396fb7/_24266_merge-request-02.png)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #24266
See merge request !7577
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
move timeago.js to vendor directory
## What does this MR do?
moves timeago.js into `/vendor/assets/javascripts` for consistency with other external javascript libraries.
## Are there points in the code the reviewer needs to double check?
make sure timeago still works as it should...? I don't see how this could have broken anything.
## Why was this MR needed?
consistency with our guidelines
## Does this MR meet the acceptance criteria?
- Tests
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
See discussion in [!6274](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6274#note_18625583)
See merge request !7590
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
'24161-non-intuitive-buttons-for-import-sources-in-administrator-settings-enable-disable' into 'master'
Import sources buttons to checkboxes
## What does this MR do?
Swaps the `/application_settings` `Import Sources` buttons to checkboxes.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
![2016-11-19_14.42.39](/uploads/5bf53ecb54765bd80ab275714208ee9a/2016-11-19_14.42.39.gif)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #24161
See merge request !7598
|
|
|
|
|
|
|
| |
External jobs do not have show page nor traces
Fixes #24677
See merge request !7617
|
|
|
|
|
| |
Issue creation now accepts trailing whitespace
See merge request !7633
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Resolve "Labeling system notes downcase labels"
## What does this MR do?
This MR fixes issues of label gets lowercase in system note as describe in #24737
## Are there points in the code the reviewer needs to double check?
NR
## Why was this MR needed?
This MR fixes the regression of becoming labels and its description and title lowercase in system note
## Screenshots (if relevant)
**Before:**
![before](/uploads/ac99fd5d1219ee3b4b7c699319267087/before.png)
**After:**
![after](/uploads/d1b6413c857d18f122252f421ac498b0/after.png)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #24737
Closes #24751
See merge request !7636
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix NPM install warnings due to incompatible dependency version
## What does this MR do?
Rolls back `eslint-plugin-import` to semver `^1.16.0` for compatibility with `eslint-config-airbnb`.
## Are there points in the code the reviewer needs to double check?
Shouldn't be.
## Why was this MR needed?
A warning message was being generated every time we run `npm install`, and there are possibly other side effects due to module incompatibility.
## Does this MR meet the acceptance criteria?
- [x] All builds are passing
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
## What are the relevant issue numbers?
Closes #24754
See merge request !7641
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Clean up globals exemptions within .eslintrc
## What does this MR do?
Removes unnecessarily-exempted globals from `.eslintrc` where possible.
## Are there points in the code the reviewer needs to double check?
`npm run eslint` should return 0 errors.
## Why was this MR needed?
see Issue #24756
## Does this MR meet the acceptance criteria?
- Tests
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #24756
See merge request !7642
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Last minute CI Style tweaks for 8.14
## What does this MR do?
- Skipped builds now have use a lighter gray.
- Converted all status icons to be managed by scss colors only
- Consolidated all status icon styles into icons.scss
- Deleted any classes or styles within the svg's
- Gave status badges a hover style, but only if clickable
- Fixed alignment issue mini-pipeline graph
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
As per the discussion in the slack chat https://gitlab.slack.com/archives/ci/p1479743986004879
## Screenshots (if relevant)
- skipped builds:
![image](/uploads/f59c615045472b9b13940463a64c8038/image.png)
![image](/uploads/26503d1da9c93b3c22c5c0c1369feceb/image.png)
- hover style status badges:
![2016-11-22_00.21.27](/uploads/36afa7aa64d60e1755bf39d97f90c59f/2016-11-22_00.21.27.gif)![2016-11-22_00.58.38](/uploads/1d95fa5db124412d3f83b3e79b9b71ec/2016-11-22_00.58.38.gif)
- mini pipeline graph:
before:
![image](/uploads/38e5e57ada3907b17c6e24e1446b4514/image.png)
after:
![image](/uploads/de4476693a1397eebfc680661159daf7/image.png)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
See merge request !7643
|
|
|
|
|
|
|
|
|
| |
Fix IID filter for merge requests and milestones
I updated the example in the docs and added a test. The milestones API was also broken for the same reason.
Related to !7358 and !7373
See merge request !7648
|
|
|
|
|
|
|
| |
Fix Sidekiq stats in admin area
Closes #23825, #24675
See merge request !7654
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix exceptions when loading build trace
## What does this MR do?
This MR fixes exceptions when loading build trace.
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [x] Tests added for this feature/bug
## What are the relevant issue numbers?
Closes #24638
See merge request !7658
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
fixed bug to do with calculating durations
Fixes a couple of small bugs while calculating durations in cycle analytics - probably due to some bad refactoring
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24796
See merge request !7663
|
|
|
|
|
|
|
|
|
|
| |
'24804-wrong-render-index-should-be-render-show-in-projects-pipelinessettingscontroller-update' into 'master'
Resolve "Wrong `render 'index'`, should be `render 'show'` in `Projects::PipelinesSettingsController#update`"
Closes #24804
See merge request !7665
|