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-12-15BB importer: Fixed bug with putting expired token to a project.clone_urlValery Sizov
2016-12-14Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov
2016-12-14BB importer: fix specsValery Sizov
2016-12-14Merge branch '24803-change-cursor-for-ca-stages' into 'master' Alfredo Sumaran
Cursor now changes to a pointer when mousing over stages on Cycle Analytics page When mousing over the different stage headers on the Cycle Analytics page, the mouse cursor will now change to a pointer, indicating these sections are clickable. Closes #24803 cc: @awhildy See merge request !7921
2016-12-14Merge branch '24927-custom-event-polyfill-test' into 'master' Alfredo Sumaran
Adds tests for Custom Event polyfill ## What does this MR do? Adds tests for CustomEvent polyfill. ## 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 - [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 #24927 See merge request !7996
2016-12-14Merge branch 'dz-remove-namespaces-path-uniq' into 'master' Dmitriy Zaporozhets
Modify namespace name and path validation ## What does this MR do? * Allow same namespace name with different parent_id * Allow same namespace path. Uniq validation should be handled by routes table ## Are there points in the code the reviewer needs to double check? migrations ## Why was this MR needed? So we can use same name in different nesting like: ``` gitlab-ce/foo gitlab-com/foo foo/gitlab-ce ``` ## Screenshots (if relevant) no ## 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 - [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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !8013
2016-12-14Merge branch 'master' into 'dz-remove-namespaces-path-uniq'Dmitriy Zaporozhets
Merge Request - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8013 # Conflicts: # db/schema.rb
2016-12-14Merge branch 'dz-fix-admin-routes' into 'master' Sean McGivern
Add support for nested groups to admin routing See merge request !8008
2016-12-14Merge branch 'mattl-gitshell-fixes' into 'master' Rémy Coutable
Updates the docs to require GitLab Shell 4.0.3 See merge request !8050
2016-12-14BB importer: More advanced error handlingValery Sizov
2016-12-14Merge branch 'build-statuses' into 'master' Rémy Coutable
Detailed build statuses ## What does this MR do? Implements detailed statuses for `Ci::Builds` and `CommitStatus`. It also adds a new icon for manual build. ## Screenshots ![manual_builds_icon](/uploads/22b5c594350856c85398ef705a635f8b/manual_builds_icon.png) ## What are the relevant issue numbers? See #24273, closes #22642 See merge request !7989
2016-12-14Merge branch '25651-fix-master' into 'master' Rémy Coutable
Fix wrong error message expectation in API::Commits spec See commit message or https://gitlab.com/gitlab-org/gitlab-ce/issues/25651#note_19996076 for the explanation. Closes #25651 See merge request !8083
2016-12-14Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov
2016-12-14Improve build status specs contexts descriptionsGrzegorz Bizon
2016-12-14BB importer: Refactoring user importing logic[ci skip]Valery Sizov
2016-12-14Fix BB authentication[ci skip]Valery Sizov
2016-12-14Merge branch 'process-commit-worker-migration-encoding' into 'master' Rémy Coutable
Encode when migrating ProcessCommitWorker jobs ## What does this MR do? This adds encoding logic to the migration for ProcessCommitWorker, ensuring it doesn't throw errors when the input can not be converted to UTF-8 without extra help. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/25489 See merge request !8064
2016-12-14Add some missing tests for detailed status methodsGrzegorz Bizon
2016-12-14Merge branch '25136-last-deployment-link' into 'master' Grzegorz Bizon
Fix broken link for latest deployment ## What does this MR do? Creates a new helper for the latest deployment link. ## Why was this MR needed? A helper that returns a link was being called inside another helper that creates a link, resulting in `builds/<a href="builds/ID>#id</a>` ## What are the relevant issue numbers? Closes #25136 See merge request !7839
2016-12-14Fix wrong error message expectation in API::Commits specRémy Coutable
This was because the MR was a bit behind master and the error message got updated in the meantime by 79aad815. Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-12-14Remove trailing blank line from Allowable moduleGrzegorz Bizon
2016-12-14Merge branch '20052-actions-table-vscroll' into 'master' Annabel Dunstone Gray
Prevent overflow with vertical scroll when we have space to show content ## What does this MR do? Removes vertical and horizontal scroll from builds, environments and pipelines tables by adding a media query since this is only necessary in smaller screens. ## Screenshots (if relevant) ![scroll](/uploads/6b9e3584df6e4ca29553d2ff576b794e/scroll.jpg) ## 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #20052 See merge request !8061
2016-12-14Merge branch 'backport/group-policies' into 'master' Rémy Coutable
Backport hooks on group policies for the EE-specific implementation See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/822#note_19955431 See merge request !8066
2016-12-13BB importer: Adding created_by only when used is not found[ci skip]Valery Sizov
2016-12-13Merge branch 'api-cherry-pick' into 'master' Rémy Coutable
Adds the ability to cherry pick a commit via the API. Right now it only supports to directly cherry pick a commit and not starting a MR from it. Shall we do that also for the API? Closes #25450 See merge request !8047
2016-12-13Merge branch 'jzinn/gitlab-ce-chomp-git-status-message' into 'master' Rémy Coutable
For single line Git commit messages, the close quote should be on the same line as the open quote _Originally opened at !7299 by @jzinn._ - - - ## What does this MR do? Chomps merge commit messages so that there is not a dangling close quote. A better solution would be not to use quotes at all, but to set off the message in a `<div>` with a background color. ## Screenshots (if relevant) ![Screen_Shot_2016-11-04_at_8.06.54_PM](/uploads/6e749c5227d88a9bfea64e70cccaf14a/Screen_Shot_2016-11-04_at_8.06.54_PM.png) See merge request !7975
2016-12-13Merge branch '25482-fix-api-sudo' into 'master' Sean McGivern
API: Memoize the current_user so that the sudo can work properly Closes #25482 See merge request !8017
2016-12-13Merge branch 'move-admin-settings-feature-to-rspec' into 'master' Rémy Coutable
Replace the Spinach specs for admin settings with RSpec feature specs as per #23036 Part of #23036 See merge request !8058
2016-12-13Merge branch 'api-simple-group-project' into 'master' Rémy Coutable
API: Ability to get group's project in simple representation Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25412 See merge request !8060
2016-12-13Move admin settings spinach feature to rspecjurre
2016-12-13BB importer: Fixed after code review[ci skip]Valery Sizov
2016-12-13Encode when migrating ProcessCommitWorker jobsYorick Peterse
If the source encoding is not UTF-8 we need to encode the data as `JSON.dump` may throw an error if the input can not be converted to UTF-8. We only encode when necessary to reduce the overhead. Fixes gitlab-org/gitlab-ce#25489
2016-12-13Prevent overflow with vertical scroll when we have space to show contentFilipa Lacerda
Adds changelog
2016-12-13Make rubocop happyRobert Schilling
2016-12-13API: Ability to cherry-pick a commitRobert Schilling
2016-12-13Merge branch 'dz-create-routes-lower-index' into 'master' Dmitriy Zaporozhets
Add index to routes table on lower path for postgresql Improve performance of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7121 See merge request !8041
2016-12-13Be smarter when finding a sudoed user in API::HelpersRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-12-13Update manual build icon SVGGrzegorz Bizon
2016-12-13Make it possible to mix `Gitlab::Routing` inGrzegorz Bizon
2016-12-13Backport hooks on group policies for the EE-specific implementationDouglas Barbosa Alexandre
2016-12-13Extract abilities checking module from ability modelGrzegorz Bizon
2016-12-13Extend tests for pipeline detailed status helpersGrzegorz Bizon
2016-12-13Add tests for common build detailed status helpersGrzegorz Bizon
2016-12-13Merge branch 'allow-more-filenames' into 'master' Rémy Coutable
Allow all alphanumeric characters in file names ## What does this MR do? Allow more characters in file names such as Chinese symbols. ## Why was this MR needed? It is annoying that some files which can be uploaded using Git CLI cannot be created with the web editor. ## What are the relevant issue numbers? fixes #20190 See merge request !8002
2016-12-13Add missing tests for build `cancelable?` methodGrzegorz Bizon
2016-12-13Merge branch '25518-uniquely-style-labels' into 'master' Fatih Acet
added border-radius and padding to labels ## What does this MR do? It creates a pill like style for labels. ## Are there points in the code the reviewer needs to double check? - ## Why was this MR needed? get a unique label look/style ## Screenshots (if relevant) ![image](/uploads/2cf347984ae4e36cd061c5a761ee99c9/image.png) ![image](/uploads/c23bbeba4b2525b4f36dac5a0fa1037c/image.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 - [ ] 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 #25518 See merge request !8054
2016-12-13Add tests for detailed build statuses factoryGrzegorz Bizon
2016-12-13Merge branch 'dz-nested-group-improvements-2' into 'master' Sean McGivern
Minor improvements to nested groups code See merge request !8011
2016-12-13Make it possible to retry build that was canceledGrzegorz Bizon
2016-12-13Make build retryable only if complete and executedGrzegorz Bizon
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-06 03:42:02 +0300