Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-09-20Fix "Unsubscribe" link in notification emails that is triggered by anti-virusMaximiliano Perez Coto
* Created a force=true param that will continue with the previous behaviour of the unsubscribe method * Created a filter for not-logged users so they see a unsubsribe confirmation page * Added the List-Unsubscribe header on emails so the email client can display it on top
2016-09-20Merge branch 'rs-trailing-spaces-in-regex-messages' into 'master' Rémy Coutable
Remove trailing spaces from messages in Gitlab::Regex See merge request !6426
2016-09-20Merge branch 'sh-fix-last-activity-at-specs' into 'master' Rémy Coutable
Fix broken spec due to last_activity_at updates being throttled In https://gitlab.com/gitlab-org/gitlab-ce/builds/4218398, the build failed because the last_activity_at column was only being updated once per hour. We can fix this spec by stubbing out the throttling and adjusting the spec to test the right event timestamp. See merge request !6424
2016-09-20Merge branch 'fix-download-artifacts-button-link' into 'master' Douwe Maan
Fix download artifacts button link ## What does this MR do? Fix download artifacts button link. ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug ## What are the relevant issue numbers? Closes #22294 See merge request !6407
2016-09-20Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin
fix-download-artifacts-button-link * upstream/master: (80 commits) Contributing via GH no longer encouraged. Update README.md to really fix icon Update README.md to fix icon Allow to set request_access_enabled for groups and projects using API Restrict last_activity_at updates to one per hour Solve code review comments Properly support Gitlab::Auth::Result Revert all changes introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043 Move Gitlab::Auth.Result to separate file Added CHANGELOG Fix spec failures Support pushing via SSH Fix specs failures Don't leak build tokens in build logs Fix permissions for creating container images Fix old CHANGELOG entries Add linting for duplicate CHANGELOG versions (!6039) Ensure validation messages are shown within the milestone form Fix validation regexs (+1 squashed commit) Squashed commits: [f9a9315] Use : to test invalid environment name Fix scope of the CI config key nodes in jobs entry ...
2016-09-20Fix broken spec due to last_activity_at updates being throttledStan Hu
In https://gitlab.com/gitlab-org/gitlab-ce/builds/4218398, the build failed because the last_activity_at column was only being updated once per hour. We can fix this spec by stubbing out the throttling and adjusting the spec to test the right event timestamp.
2016-09-20Merge branch 'workhorse-0.8.2' into 'master' Douwe Maan
Use gitlab-workhorse 0.8.2 Fixes rejected API git archive extensions; improves Sentry errors. https://gitlab.com/gitlab-org/gitlab-workhorse/blob/master/CHANGELOG See merge request !6388
2016-09-20Merge branch 'ldap_user_attr_method' into 'master' Douwe Maan
Move LDAP user attributes to a method ## What does this MR do? This is a change that supports an EE fix. This small change needs to be made in CE to prevent future merge conflicts. See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/736 for the EE changes. See merge request !6377
2016-09-20Merge branch 'strip-key-comments-for-gitlab-shell' into 'master' Robert Speicher
Strip comments before sending keys to gitlab-shell ## Why was this MR needed? https://gitlab.com/gitlab-org/gitlab-ce/issues/22167 encoding issues in comment text. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/22167 See merge request !6381
2016-09-20Merge branch '22065-group-members-api-returning-null-user-details' into ↵Robert Speicher
'master' Ensure invitees are not returned in Members API ## What are the relevant issue numbers? Closes #22065 See merge request !6370
2016-09-20Remove trailing spaces from messages in Gitlab::RegexRobert Speicher
2016-09-20Merge branch 'lint-for-changelog' into 'master' Robert Speicher
Add linting for duplicate CHANGELOG entries ## What does this MR do? Extend `scripts/lint-doc.sh` so that it checks that there are no duplicate versions in CHANGELOG. See merge request !6039
2016-09-20Merge branch 'diff-table-width-fix' into 'master' Jacob Schatz
Fixed large comments messing with diff table widths ## What does this MR do? Fixes the width of the diff table so that the content inside it can't increase or decrease the width of the table cells. ## Screenshots (if relevant) ![Screen_Shot_2016-09-12_at_14.44.44](/uploads/2ca483399d867153e6ae608360ffea5f/Screen_Shot_2016-09-12_at_14.44.44.png) ## What are the relevant issue numbers? Closes #20694 See merge request !6309
2016-09-20Merge branch 'fix-build-trace-anchors' into 'master' Jacob Schatz
Improve build trace scroll controls ## What does this MR do? The trace step buttons now correctly scroll to the top or bottom of the build trace, rather than jumping inconsistently and never full reaching the top due to the fixed position of the header/navigation area. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Build trace UX ## Screenshots (if relevant) ![2016-09-09_20.04.32](/uploads/efee5145fb505f8c9ae2a4cf24d842d3/2016-09-09_20.04.32.gif) ## Does this MR meet the acceptance criteria? - [ ] [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 - [ ] 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 you do - 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? Contributes to #21832. See merge request !6288
2016-09-20Merge branch '21961-issues-filtering-issue-with-labels-that-contain-spaces' ↵Jacob Schatz
into 'master' Fixes labels multi-encode and selecting labels with single quotes ## What does this MR do? Replaced single quotes with escaped single quotes when setting item `.is-active` and when removing its field. Adds a test to test selecting 2 different labels _(one with a single quote)_ with a full page load inbetween, it checks the labels are selected as well as shown as `.is-active` in the list. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? The javascript handles the url encoding when it is sent to the server so we shouldn't let the javascript begin processing an already encoded string but we needed to stop single quotes from breaking a jquery selector. ## Screenshots (if relevant) https://youtu.be/-H0_L2hV9tM ## Does this MR meet the acceptance criteria? - [ ] [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 - [ ] 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 you do - 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 #21961 Closes #21880 Closes #21248 Closes #20759 Closes #21935 See merge request !6313
2016-09-19Merge branch 'master' into ↵Luke "Jared" Bennett
'21961-issues-filtering-issue-with-labels-that-contain-spaces' # Conflicts: # app/assets/javascripts/gl_dropdown.js
2016-09-19Merge branch 'issue_20978' into 'master' Rémy Coutable
Allow to set request_access_enabled for groups and projects using API Closes #20978 See merge request !6359
2016-09-19Contributing via GH no longer encouraged.Sid Sijbrandij
2016-09-19Update README.md to really fix iconSid Sijbrandij
2016-09-19Update README.md to fix iconSid Sijbrandij
2016-09-19Merge branch 'sh-prevent-duplicate-protected-branches-on-push' into 'master' Rémy Coutable
Only create a protected branch upon a push to a new branch if a rule for that branch doesn't exist A customer ran into an issue where a Sidekiq task retried over and over, leading to duplicate master branches in their protected branch list. Closes #22177 See merge request !6399
2016-09-19Merge branch 'throttle-last-activity-at' into 'master' Rémy Coutable
Restrict last_activity_at updates to one per hour This MR reduces the number of updates to `projects.last_activity_at` to once per hour. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22213 See merge request !6391
2016-09-19Merge branch 'cs-add-cii-badge' into 'master' Rémy Coutable
Add Core Infrastructure Initiative badge to README Our Core Infrastructure Initiative Badge page: https://bestpractices.coreinfrastructure.org/projects/42 CII is a program by the Linux Foundation to track compliance with best practices in various large open source projects, we currently have a 100% passing rate for the badge. We didn't list this before, even though we probably should. I asked Sid and he said there was no reason not to add it, so here we go :) See merge request !6077
2016-09-19Allow to set request_access_enabled for groups and projects using APIFelipe Artur
2016-09-19Restrict last_activity_at updates to one per hourYorick Peterse
The lock in turn is only obtained when actually needed, reducing some load on Redis. Fixes gitlab-org/gitlab-ce#22213
2016-09-19Merge branch 'per-build-token-without-lfs' into 'master' Rémy Coutable
Make CI to use the permission of the user who is trigger the build This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5735, but with removed all LFS code that is added by: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043. This also incorporates most of LFS code added in !6043 to simplify further merge. See merge request !6409
2016-09-19Merge branch 'fix/import-export-db-errors' into 'master' Rémy Coutable
Fix import/export database errors Fixes protected branches errors when importing a project including them Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21295 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21799 See merge request !6099
2016-09-19Solve code review commentsKamil Trzcinski
2016-09-19Properly support Gitlab::Auth::ResultKamil Trzcinski
2016-09-19Revert all changes introduced by ↵Kamil Trzcinski
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043
2016-09-19Move Gitlab::Auth.Result to separate fileKamil Trzcinski
2016-09-19Added CHANGELOGKamil Trzcinski
2016-09-19Merge branch 'master' into per-build-tokenKamil Trzcinski
2016-09-19Fix spec failuresKamil Trzcinski
2016-09-19Merge branch 'review-apps' into 'master' Rémy Coutable
Add support for dynamic environments Implements proposal described in https://gitlab.com/gitlab-org/gitlab-ce/issues/21971. Specifically: - it adds a `.gitlab-ci.yml` configuration, - it allows environment name to have slashes, - it allows environment names to use CI predefined variables, - it allows to specify URL from `.gitlab-ci.yml`, - it allows the URL to use CI predefined variables, - it introduces `environment_type` to allow to easily group environments in the future See merge request !6323
2016-09-19Support pushing via SSHKamil Trzcinski
2016-09-19Fix specs failuresKamil Trzcinski
2016-09-19Don't leak build tokens in build logsKamil Trzcinski
2016-09-19Fix permissions for creating container imagesKamil Trzcinski
2016-09-19Merge branch '22033-milestone-validation-returns-422' into 'master' Rémy Coutable
Ensure validation messages are shown within the milestone form Fixes a bug where upon entering data to create an invalid milestone via the Web UI or the API would raise an exception rather than render the validation messages We'd rather render the validation messages to inform the user than raise an exception and result in a 422 error being displayed Closes #22033 See merge request !6345
2016-09-19Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin
fix-download-artifacts-button-link * upstream/master: Reset pushes_since_gc counter before specs run to ensure starting point is 0 Add missing spec for ProtectedBranches::CreateService Refactor boards_spec.rb to avoid code duplication Render invalid template for merge requests without source project and open
2016-09-19Merge branch 'sh-reset-pushes-since-gc-before' into 'master' Yorick Peterse
Reset pushes_since_gc counter before specs run to ensure starting point is 0 See merge request !6406
2016-09-19Merge branch '22248-fix-namespace-undefined-method' into 'master' Rémy Coutable
Render invalid template for open merge requests without source project If source project was removed and merge request for some reason wasn't closed is rendered `invalid` template. Fix !6177 Fix #22248 See merge request !6383
2016-09-19Merge branch 'sh-add-spec-create-service-protected-branch' into 'master' Rémy Coutable
Add missing spec for ProtectedBranches::CreateService While working on !6399, I noticed there was no spec for this class so I added one. See merge request !6405
2016-09-19Fix old CHANGELOG entrieswinniehell
2016-09-19Add linting for duplicate CHANGELOG versions (!6039)winniehell
2016-09-19Ensure validation messages are shown within the milestone formMark Fletcher
* Remove call to Milestone#save! instead just Milestone#save * Add safety specs to stop a regression Fixes #22033
2016-09-19Merge branch 'fix-board-spec-failures' into 'master' Rémy Coutable
Refactor boards_spec.rb to avoid code duplication Originally created to address #21197, but !6224 solved the intermittent spec failures. See merge request !6197
2016-09-19Fix validation regexs (+1 squashed commit)Kamil Trzcinski
Squashed commits: [f9a9315] Use : to test invalid environment name
2016-09-19Fix scope of the CI config key nodes in jobs entryGrzegorz Bizon
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-18 06:13:09 +0300