| Age | Commit message (Collapse) | Author |
|---|
|
Fix project settings field
fixes #21821
See merge request !6185
|
|
Commit originally written by @smcgivern
|
|
|
|
|
|
MR !4579)
|
|
|
|
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
|
|
|
|
source project
|
|
wall-clock-time-for-showing-pipeline
* upstream/master: (50 commits)
Increased vertical alignment of labels for issues in lists
Changed file name Updated spec HAML
Changed tests to use JS tests
Addressed feedback
Made logic simpler by moving away from underscorejs
Added tooltip to label value in collapsed sidebar
Add play icon SVG
Have hover color of builds span full width
Fix alignment of icon on commits page
Change sleep to wait_for_ajax
Added tests
Destroy branch delete tooltip when row is removed
Move and improvement comment in pipeline fixtures
Fix notification_service argument error of declined invitation emails
Update contribution acceptance criteria with tests requirements
Fixed keyboard shortcuts not working on issue boards
Hides tooltip when dragging Fixes issue with cursor not changing when dragging
Hides tooltips when dragging issues
Add a spec testing a second side effect of `Repository#merge`.
drop execute bit
...
|
|
Updated spec HAML
|
|
|
|
wall-clock-time-for-showing-pipeline
* upstream/master: (554 commits)
Fix expansion of discussions in diff
Improve performance of MR show page
Fix jumping between discussions on changes tab
Update doorkeeper to 4.2.0
Fix MR note discussion ID
Handle legacy sort order values
Refactor `find_for_git_client` and its related methods.
Remove right margin on Jump button icon
Fix bug causing “Jump to discussion” button not to show
Small refactor and syntax fixes.
Removed unnecessary service for user retrieval and improved API error message.
Added documentation and CHANGELOG item
Added checks for 2FA to the API `/sessions` endpoint and the Resource Owner Password Credentials flow.
Fix behavior around commands with optional arguments
Fix behavior of label_ids and add/remove_label_ids
Remove unneeded aliases
Do not expose projects on deployments
Incorporate feedback
Docs for API endpoints
Expose project for environments
...
|
|
Update Hamlit to 2.6.1
Fixes gitlab-org/gitlab-ce#21025 and gitlab-org/gitlab-ce#21017
See merge request !5873
|
|
Truncated long user lists in award emoji tooltips
## What does this MR do?
Truncates award emoji tooltips so that they only show 10 users maximum.
Further users are indicated by appending "and X more."
## Are there points in the code the reviewer needs to double check?
Is 10 too little, should it be raised?
My test cases rely on join() to build the expected output.
This feels a little iffy is it alright?
## Why was this MR needed?
Some issues have a large number of thumbs causing tooltips to be very large.
## What are the relevant issue numbers?
closes #18334, closes #19542
## Screenshots (if relevant)
##### Before
##### After
Truncation point modified for purposes of screenshot
## 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
- [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 !4780
|
|
Fixes gitlab-org/gitlab-ce#21025 and gitlab-org/gitlab-ce#21017
|
|
|
|
|
|
* Code in ruby now uses Array#to_sentence to construct award tooltips
* Coffeescript uses a combination of regexes for the same result
|
|
* If the current user is not in the list output will have 1-9 users
* If the current user is in the list output will be "me, " + 0-9 users
|
|
* Only the first 10 names are displayed
* Further users are indicated by "and X more."
* String "and X more" is appended to the array THEN join is called
* An oxford comma seperates the last name from "and X more"
* In coffeescript "me" is now always prepended
* Tests included
|
|
wall-clock-time-for-showing-pipeline
* upstream/master: (99 commits)
Update CHANGELOG for 8.10.6, 8.9.7, and 8.8.8
Updated Akismet documentation
Add hover state to todos (!5361)
Load issues and merge requests templates from repository
Backport EE assertions in protected branch related specs.
Revert "Merge branch '19957-write-tests-for-adding-comments-for-different-line-types-in-diff' into 'master'"
Fix a missed `before_action` for `AutocompleteController`.
Backport `AutocompleteController#load_project` from EE!581.
Fix API::BranchesSpec.
Fix failing tests relating to backporting ee!581.
Revert unrelevant changes
Fix the protected branches factory.
Improve EE compatibility with protected branch access levels.
Move the "update" portion of the protected branch view into a partial.
Don't select an access level if already selected.
Backport changes from gitlab-org/gitlab-ee!581 to CE.
Further refactor and syntax fixes.
Upgrade httpclient gem from 2.7.0.1 to 2.8.2.
Make rubocop happy
Make rubocop happy
...
|
|
|
|
wall-clock-time-for-showing-pipeline
* pipeline-hooks-without-slack: (156 commits)
Fix test failures
Make pipeline to be in created state for hooks tests
Make `execute_methods` public
Added specs for started_at and finished_at
Use explicit events to transition between states
Fix tests. We cannot reload unless it's already saved:
Have trait all_events_enabled so that's easier to reuse, feedback:
Simplify the name for data builder, feedback:
Prefer extend self over module_function, feedback:
Make it more grammatically correct, feedback:
if -> when; when -> `when`; %w() -> %w[]; and fix some typos:
Prefer described_class, feedback:
Make the comment more clear, feedback:
Update CHANGELOG
render only commit title
Fix test failures, that did occur because of missing previously used `reload_status!` call
Use state machine for pipeline event processing
Upgrade Rails to 4.2.7.1 for security fixes.
Update gitlab-shell to v3.3.3
Verify the pipeline status after executing events on builds
...
|
|
# Conflicts:
# app/models/ci/pipeline.rb
# app/models/commit_status.rb
# app/services/ci/create_pipeline_service.rb
# spec/models/ci/pipeline_spec.rb
|
|
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13810778
|
|
|
|
* upstream/master: (233 commits)
Fix awardable button mutuality loading spinners
Update CHANGELOG for 8.10.5
Clean up project destruction
Small refactor of doc/development/README.md
Avoid commit lookup on diff_helper
Removed extra newline from redis_spec.rb
Used cached value of project count to reduce DB load
Remove duplicate link_to statements
Mention add_column_with_default in downtime guide
Add missing space to generic badge template
Rename `run` task helper method to prevent conflict with StateMachine
Add a method in Project to return a cached value of total count of projects
spellcheck
Add svg guidelines to ui guide
Add Changelog entry for Grape upgrade [ci skip]
Fix Grape tests.
Retain old behavior
Update Grape from 0.13.0 to 0.15.0.
adds second batch of tests changed to active tense
fixes part1 of files to start using active tense
...
|
|
|
|
|
|
|
|
Update timeago to shorter representation
## What does this MR do?
Shortens representation of `Finished at` block in pipelines & builds
## What are the relevant issue numbers?
Closes #19752
Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/18920
## Screenshots (if relevant)
See merge request !5225
|
|
I can't reproduce this failure locally.
Here's the failure:
https://gitlab.com/gitlab-org/gitlab-ce/builds/2864250
|
|
|
|
|
|
So we have raw_diffs too
|
|
Now we link to the standard `IssuesController#new` action, and let it
redirect if we're using an external tracker.
|
|
Prior, in order to display the correct link to "Issues" in the project
navigation, we were performing a check against the project to see if it
used an external issue tracker, and if so, we used that URL. This was
inefficient.
Now, we simply _always_ link to `namespace_project_issues_path`, and
then in the controller we redirect to the external tracker if it's
present.
This also removes the need for the url_for_issue helper. Bonus! :tada:
|
|
On a merge request with over 1000 changed files, there were redundant
calls to blob_text_viewable?, which incurred about 7% of the time.
Improves #14775
|
|
NotesHelper#note_editable? and ProjectTeam#human_max_access currently
take about 16% of the load time of an issue page. This MR preloads
the maximum access level of users for all notes in issues and merge
requests with several queries instead of one per user and caches
the result in RequestStore.
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Fix build duration when build is not finished yet
## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## What are the relevant issue numbers?
Fixes #19937.
## Does this MR meet the acceptance criteria?
- [x] No CHANGELOG since it fixes a regression not yet in a stable release (I think)
- 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 !5323
|
|
|
|
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
|
|
|
