| Age | Commit message (Collapse) | Author |
|---|
|
last_push_event widget considers fork events on the main project
Push events on the fork of the current project are considered to be shown besides the push events on the current project. Before we just consider fork events if exists a fork so we miss current project events if the current user has a fork.
Closes #20254
See merge request !5978
|
|
Does not halt the GitHub import process when an error occurs
## What are the relevant issue numbers?
Fixes #20385
https://gitlab.com/gitlab-org/gitlab-ce/issues/20149
## 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 [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)
See merge request !5763
|
|
Change slash commands docs location
See merge request !5937
|
|
Documentation for Issue Boards
## What does this MR do?
Add documentation for issue boards.
## What are the relevant issue numbers?
- Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/17907
- Backend MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5548
- Frontend MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5554
See merge request !5713
|
|
Split Koding admin/user docs
Backend/Frontend MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5909
See merge request !5938
|
|
Fix location of markdown help
Resolves #21208, and incorrect link to the markdown style guide
See merge request !5945
|
|
Remove tab stop from issuable form added by description templates
See merge request !5929
|
|
Fixed enter key in search input not working
## What does this MR do?
Fixes a bug where the enter key wouldn't search in the top nav search input
Closes #20627
See merge request !5888
|
|
Fix project namespace links
#### What does this MR do?
Fixes pipeline links
#### Why was this MR needed?
Links went to a 404 on fork MR pipelines tab
#### What are the relevant issue numbers?
Closes #21107
See merge request !5912
|
|
Fix incorrect "stopped impersonation" log message
Minor bug: Usernames were swapped in the log message.
Closes #21015
See merge request !5949
|
|
Also check if Akismet is enabled, before showing the `Submit as spam` button.
Fixes #21229
See merge request !5948
|
|
Fix file links on project page Files view
## What does this MR do?
Fix the project show page when the default view is set to Files so that the links work.
## Are there points in the code the reviewer needs to double check?
I can't figure out what caused this to break :confused:
## What are the relevant issue numbers?
Closes https://gitlab.com/gitlab-com/support-forum/issues/959.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) (N/A)
- [x] API support added (N/A)
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [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)
See merge request !5933
|
|
Fix inputs not being found due to incorrect class in wrap element
Fixes failing spec
See merge request !5926
|
|
Fix empty dropdown
Deselecting the current selected option on a dropdown they were removing the input related to them.
This led to a unexpected cases. The forms were submitted without all required inputs and the label was still indicating an option was selected. This MR fixes that.
See merge request !5927
|
|
into 'master'
17465 Fixed dropdown cursor key navigation
## What does this MR do?
This MR fixes the use of cursor/arrow/enter key events with search dropdowns, allowing a user to navigate up and down the list with the arrow keys and then select their item with the enter key.
It also applies some *minor* scroll user experience fixes, such as resetting the selected dropdown item every time it opens/closes (also stops multiple dropdowns conflicting) and forcing the dropdown scroll to scroll right to the top or bottom depending on whether they have selected the first or last item, respectively.
## Are there points in the code the reviewer needs to double check?
I would like someone with GitLab experience to check over whether this would harm any unique implementations of the GitLabDropdown or SearchAutocomplete.
## Why was this MR needed?
The current version has incorrectly behaving search dropdowns in the navbar, they either do not navigate using the keyboard or do not use the enter keystroke to select a highlighted item.
## What are the relevant issue numbers?
Fixes #17465.
Closes #20752.
Closes #21014.
**Contributes** to #20754.
## Screenshots (if relevant)
See merge request !4781
|
|
Fix assorted rspec failures due to stale, cached user permissions
RequestStore is disabled in tests, but the Ability class was caching user permissions based on the user and project ID of previous test runs. Revise code to use RequestStore only if it is active.
See merge request !5919
|
|
Fix Error 500 resulting when loading network graph
`discussion_id` may not be present when the SELECT call for notes does not include this attribute. Don't attempt to set the discussion ID unless the model contains the attribute:
```ruby
irb(main):019:0> notes[0]
Note Load (10.3ms) SELECT notes.commit_id, count(notes.id) as note_count FROM "notes" WHERE "notes"."project_id" = $1 AND (noteable_type = 'Commit') GROUP BY notes.commit_id [["project_id", 13083]]
ActiveModel::MissingAttributeError: missing attribute: discussion_id
```
Closes #21119, #21128
See merge request !5922
|
|
Backport changes from gitlab-org/gitlab-ee!581
See merge request !5884
|
|
Disable “issue by email” feature until it uses a different token
Separate token being worked on in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5914, but too late for 8.11.
See merge request !5915
|
|
Todos sorting dropdown
Implements #18135
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [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)
See merge request !5691
|
|
Call `set_discussion_id` again in DiffNote `before_validation` because the order is important
See merge request !5913
|
|
Refactor description templates documentation
## What are the relevant issue numbers?
Refactors docs introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4981
See merge request !5839
|
|
Koding Integration
## What does this MR do?
Will provide Koding integration with GitLab services. Forked from !4914.
## Are there points in the code the reviewer needs to double check?
I've introduced new layouts which might not be necessary, first time contributor.
## Why was this MR needed?
We're planning to ship Koding with GitLab.
## What are the relevant issue numbers?
#12759 #14698
## Screenshots (if relevant)
### Screencasts
http://recordit.co/BDMbhwgxPD
http://recordit.co/By0qiz1ClC
### Enable Koding in Application Settings
### Koding Dashboard
### Set up Koding Stack
1 - 
2 - 
### Run on Koding on Project Page
### Run in IDE on Merge Requests
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [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)
See merge request !5909
|
|
Ace ventura
## What does this MR do?
Makes Ace only load when it's actually necessary. The only two places it seems to be used is for Snippets and the File (Blob) Editor.
Before minification or compression, this takes the application.js down from 2.2MB to 1.6MB, and also removes two inline scripts :D
Compressed/Minified: master: 317KB/1.1MB, ace-ventura: 220KB/771KB
## Are there points in the code the reviewer needs to double check?
That this doesn't just completely break anything.
## Why was this MR needed?
Ace is a big library, this allows us to only load it when necessary.
## What are the relevant issue numbers?
#14372
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] All builds are passing
- [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)
See merge request !4914
|
|
Added tooltip to label value in collapsed sidebar
## What does this MR do?
Adds a list of the issuables labels to a tooltip in the collapsed
sidebar. Limited to 5 otherwise the list could get crazy long.
Closes #19398
See merge request !5232
|
|
Implement pipeline hooks, extracted from !5525
Closes #20115
See merge request !5620
|
|
Wrap single lines of code; horizontally scroll multi-line code blocks
## What does this MR do?
Original problem: code blocks were wrapping in issue body
* Multi-line code blocks (```) should scroll horizontally
* Single lines of code (`) should wrap
## Why was this MR needed?
Inconsistent scrolling vs wrapping behavior
## What are the relevant issue numbers?
Closes #19619
## Screenshots (if relevant)
See merge request !5675
|
|
Show wall-clock time when showing pipeline
Show wall-clock time when showing pipeline instead of cumulative builds time.
Closes #17007
See merge request !5734
|
|
Pipelines ui updates
* Fixes hover color width on build list
* Fixes alignment of status icon on commits page
* Add play icon SVG
Small UI bugs with recent MRs
See merge request !5856
|
|
Fix layout of edit tags page
#### What does this MR do?
Fixes layout of edit tags page
#### Why was this MR needed?
Layout was broken
#### Screenshots (if relevant)
Before:
After:
See merge request !5874
|
|
Add space under MR title
## What does this MR do?
Adds space underneath MR title because right now it's impossible to tell where the title ends and the first header of the MR body begins.
Before:
After:
Note: We need to change our template to have the md headers `####` instead of `##`. Once that's been done it will look like this:
See merge request !5875
|
|
Expiration date on memberships
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17495
See merge request !5876
|
|
Make all future skipped builds as processable when retrying a build
## What does this MR do?
Makes a builds that are marked as skipped when a pipeline is processed to be reprocessed by changing their's state to created.
## Why was this MR needed?
Currently retry is broken. When you retry a build of pipeline it will succeed and be marked as succeeded, when the next stages should be triggered.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21066
See merge request !5879
|
|
Add boards controller to issue nav item
#### What does this MR do?
Adds active state to top level nav
Before:
After:
See merge request !5883
|
|
Issue boards tooltip hide
- Hides & disables tooltips when dragging issues or lists
- Fixes bug where cursor wouldn't change when dragging.
See merge request !5889
|
|
Fixed keyboard shortcuts not working on issue boards
## What does this MR do?
Fixes keyboard shortcuts not working on issue boards page.
## What are the relevant issue numbers?
Closes #21071
See merge request !5890
|
|
Fix notification_service argument error of declined invitation emails
## What does this MR do?
Remove unused arguments that raised the argument error after a refactor, more details in the commit message.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## What are the relevant issue numbers?
Closes #21039
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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
- [x] All builds are passing
- [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)
See merge request !5893
|
|
'21010-emailsonpushworker-incorrectly-claims-deleted-a-commit-after-a-push' into 'master'
Resolve "EmailsOnPushWorker incorrectly claims deleted a commit after a push"
## What does this MR do?
Fix the comparison order in the emails on push worker, so regular pushes don't show a message about force pushing.
## Are there points in the code the reviewer needs to double check?
Don't think so, it was just a typo: `after_sha` should map to the `source_branch` argument, because it's the head of the comparison.
## Why was this MR needed?
To fix a regression!
## What are the relevant issue numbers?
Closes #21010.
## Does this MR meet the acceptance criteria?
- [x] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~
- [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [x] ~~API support added~~
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [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)
See merge request !5894
|
|
Improvements to issue boards on mobile
- Removes the drag handles
- Adds a delay before dragging can start otherwise you can't scroll the page
See merge request !5897
|
|
Added text color to issues labels in issue board lists
## What does this MR do?
Adds the text color for labels in the response. The frontend was
already setup to handle this, just needed the data from the backend.
See merge request !5898
|
|
Fix line commenting for the initial commit
## What does this MR do?
Support line positions on the initial commit, where we can't compare because there's no parent commit.
## Are there points in the code the reviewer needs to double check?
I chose to use the blank SHA to represent the initial commit, but it could as easily be the same SHA. I just thought this was clearer.
## Why was this MR needed?
People couldn't add line comments to the initial commit!
## What are the relevant issue numbers?
Closes #20895.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added (N/A, regression)
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) (N/A)
- [x] API support added (N/A)
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [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)
See merge request !5900
|
|
Increased vertical alignment of labels for issues in lists
## What does this MR do?
Increases the vertical alignment between labels on issues in issue boards lists.
## Screenshots (if relevant)
See merge request !5902
|
|
Fix bug where notes weren’t shown in discussion when the code had changed after creation
See merge request !5908
|
|
Load issue templates from repository
part of #18656
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [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)
See merge request !4981
|
|
Diff line comments resolve
## What does this MR do?
Diff line comments can be resolved.
Part of #10325
To do:
- [x] Backend (@DouweM)
- [x] Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13319326. Will be made easier by https://gitlab.com/gitlab-org/gitlab-ce/issues/17237#note_13370331
- [x] System note when all discussions are resolved
- [x] Notification when all discussions are resolved
- [x] Write unit tests
- [x] Look at resolve time https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13912743 - Fixed by 4a13aa9
- [x] Frontend (@iamphill)
- [x] Fix bugs
- [x] Write more feature tests
- [x] Frontend (@connorshea)
- [x] Address frontend feedback
- [x] Feature specs for Jump feature
- [x] Documentation
- [x] Add Vue.js in a standard way
See merge request !5022
|
|
Support slash commands in issues / MR description & comments
See merge request !5021
|
|
'3225-ace-editor-causing-404-errors-every-time-you-try-to-edit-a-file-in-the-webui' into 'master'
Fix Ace syntax highlighting with compiled assets
## What does this MR do?
Update ACE to 4.1.0 to allow modes (syntax highlighting files for particular languages) to be lazily loaded.
## Are there points in the code the reviewer needs to double check?
Don't think so.
## Why was this MR needed?
Syntax highlighting in the file editor only worked in development and test modes, not in production!
## What are the relevant issue numbers?
Closes #3225.
## Screenshots (if relevant)
First, the test setup - add these lines to `development.rb`:
```ruby
config.assets.debug = false
config.assets.compile = false
config.assets.digest = true
```
Then, before starting the server, run `bundle exec rake assets:clobber assets:precompile`.
Before:
There is an error in the console because `/assets/ace/mode-ruby.js` was not found (it's only available when assets are compiled on demand).
After:
This loads `/assets/ace/mode-ruby-3915f95a6cc47306b1305e4dcb7aca25b2ef9c49b18ec6011707135b6575d8f3.js`, which works because the precompile step included it and told ACE where to find it.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 [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)
See merge request !5501
|
|
2FA checks for Git over HTTP
## What does this MR do?
This MR allows the use of `PersonalAccessTokens` to access Git over HTTP and makes that the only allowed method if the user has 2FA enabled. If a user with 2FA enabled tries to access Git over HTTP using his username and password the request will be denied and the user will be presented with the following message:
```
remote: HTTP Basic: Access denied
remote: You have 2FA enabled, please use a personal access token for Git over HTTP.
remote: You can generate one at http://localhost:3000/profile/personal_access_tokens
fatal: Authentication failed for 'http://localhost:3000/documentcloud/underscore.git/'
```
## What are the relevant issue numbers?
Fixes #13568
See merge request !5764
|
|
into 'master'
Handle legacy sort order values
Convert the legacy sort order values id_asc / id_desc into the ones we use now, created_at / created_desc, to stop the dropdown being blank.
Closes #21028.
See merge request !5880
|
|
Allow naming (and deleting) U2F devices.
## What does this MR do?
- Allow giving each U2F device a name (at the time of registration).
- Allow deleting individual U2F devices.
- Display a list of registered U2F devices.
## What are the relevant issue numbers?
- Closes #17334
- Closes #17335
See merge request !5833
|
