summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update CHANGELOGKatarzyna Kobierska2016-09-301-1/+1
|
* Refactor fields in viewKatarzyna Kobierska2016-09-302-4/+4
|
* Expose jobs to viewKatarzyna Kobierska2016-09-306-33/+28
|
* Build attributes with slice methodKatarzyna Kobierska2016-09-302-15/+7
|
* Build attributes with hash, fix gitlab yaml processor testsKatarzyna Kobierska2016-09-302-11/+34
|
* Workaround for Build attributesKatarzyna Kobierska2016-09-301-0/+2
|
* Add CHANGELOGKatarzyna Kobierska2016-09-301-0/+4
|
* Improve tests grammarKatarzyna Kobierska2016-09-301-3/+5
|
* Add test for linter values visibilityKatarzyna Kobierska2016-09-302-1/+34
|
* Add missing values to linterKatarzyna Kobierska2016-09-302-1/+6
|
* Merge branch '22768-revert-to-touch-file-system' into 'master' Valery Sizov2016-09-302-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert to use Mounter method to check existence ## What does this MR do? Revert a change on gitlab-ce that we never get into gitlab-ee due to spec failures and a lack of a proper solution. So we want to keep both repos in the same codebase about this. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## 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 #22768 See merge request !6590
| * Revert to use Mounter method to check existence22768-revert-to-touch-file-systemPaco Guzman2016-09-302-1/+2
| | | | | | | | | | | | | | See: https://gitlab.com/gitlab-org/gitlab-ce/commit/6280fd3777920670ee42111fddf29576cbf85988#note_14766241 We wanted to avoid accesses to the file system, because it seems reasonable that if the mounter column has some content it’s because there are an associate file. This is an speed boost when you access to a bunch of build instances to show their information. The problem is that solution doesn’t work if you uses that method to detect the thing and you’re changing the uploaded file on instances that had that column empty. Until you don’t persist the instance the database column will be empty so we can have false negatives
* | Merge branch '22452-milestone-title-unnecessary-escaping-fix' into 'master' Rémy Coutable2016-09-304-3/+16
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR fixes a bug that unnecessary escapes reserved HTML characters for Milestone's title. See #22452. ## Are there points in the code the reviewer needs to double check? - Unescaping of sanitized milestone title before it is being stored in the database. See `Milestone#title` and a private method called `Milestone#sanitize_title` - Sufficient tests were added (Model and API tests were modified/added). ## Why was this MR needed? To allow reserved HTML characters in a milestone's title, such as "PHP migration 5.6 -> 7.0". The text appears in 'milestones' and in a dropdown during issue creation, issue list, and in another dropdown for issue filter. Closes #22452 See merge request !6533
| * | Removing duplicate entries for !6533.Makoto Scott-Hinkle2016-09-301-1/+0
| | |
| * | Merge remote-tracking branch ↵Makoto Scott-Hinkle2016-09-291-0/+1
| |\ \ | | | | | | | | | | | | 'origin/22452-milestone-title-unnecessary-escaping-fix' into 22452-milestone-title-unnecessary-escaping-fix
| | * \ Merge branch 'master' into 22452-milestone-title-unnecessary-escaping-fixMakoto Scott-Hinkle2016-09-2758-239/+696
| | |\ \
| | * | | Allowing ">" to be used for Milestone models's title and storing the value ↵Makoto Scott-Hinkle2016-09-264-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in db as unescaped. Updating test value for milestone title Adding API test for title with reserved HTML characters. Updating changelog Adding the MR number for fixing bug #22452. removing duplicate line Updating MR number.
| * | | | Allowing ">" to be used for Milestone models's title and storing the value ↵Makoto Scott-Hinkle2016-09-294-3/+16
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in db as unescaped. Updating test value for milestone title Adding API test for title with reserved HTML characters. Updating changelog Adding the MR number for fixing bug #22452. removing duplicate line Updating MR number.
* | | | Merge branch 'mr_api_todo_close' into 'master' Rémy Coutable2016-09-305-8/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes todos for a merge request when the MR is accepted via the API by the MR assignee. ## Are there points in the code the reviewer needs to double check? Please review refresh service test changes to see if they are correct - I think in those cases, the todos should actually be cleared instead of left pending. ## Why was this MR needed? To make the API behavior consistent with the UI behavior (accepting your own MRs closes the todo item and prevents them from piling up). Closes #22477 See merge request !6486
| * | | | Close todos when accepting a MR via the API.Tony Gambone2016-09-295-8/+32
| | | | |
* | | | | Merge branch 'rc-new-access-requests-finder' into 'master' Douwe Maan2016-09-307-6/+122
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New `AccessRequestsFinder` Part of #21979. ## Does this MR meet the acceptance criteria? - [x] API support added - Tests - [x] Added for this feature/bug - [x] 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) - [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 !6268
| * | | | Use Ability.allowed? instead of current_user.can? in AccessRequestsFinderrc-new-access-requests-finderRémy Coutable2016-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Improve the logic in AccessRequestsFinder#execute & #execute!Rémy Coutable2016-09-281-11/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | New AccessRequestsFinderRémy Coutable2016-09-287-6/+124
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'lfs-token-race-condition-fix' into 'master' Patricio Cano2016-09-291-7/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix race condition on LFS Token ## What does this MR do? Fixes a race condition that can be triggered if the token expires right after we retrieve it, but before we can set the new expiry time. https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6551#note_16190569 Thanks for catching this so quickly @jacobvosmaer-gitlab cc @DouweM See merge request !6592
| * | | | | Fix race condition that can be triggered if the token expires right after we ↵lfs-token-race-condition-fixPatricio Cano2016-09-291-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | retrieve it, but before we can set the new expiry time.
* | | | | | Update CHANGELOG with 8.12.2 and 8.12.3 changes.Ruben Davila2016-09-291-4/+10
| | | | | |
* | | | | | Merge branch '22632-fix-project-explore-dropdown-alignment' into 'master' Annabel Dunstone Gray2016-09-291-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right-align dropdown menus to prevent horizontal page overflow Added `dropdown-menu-align-right` class to a few dropdown menus in the Projects -> Explore -> All page to prevent overflow. Closes #22632 See merge request !6600
| * | | | | right-align dropdown menus to prevent horizontal page overflowMike Greiling2016-09-291-2/+2
|/ / / / /
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRémy Coutable2016-09-291-2/+13
|\ \ \ \ \
| * \ \ \ \ Merge branch '22450-restrict-origin' into 'master' Douwe Maan2016-09-271-2/+13
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set a restrictive CORS policy for the API Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22450 See merge request !1998
| | * | | | | Set a restrictive CORS policy on the API for credentialed requestsNick Thomas2016-09-261-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cross-origin requests can still be made, as long as the client doesn't use the Rails session cookie to do so. Existing clients should not be setting 'withCredentials: true', so this should be fine.
| | * | | | | Move Rack::Attack and Rack::Cors middlewares to be before Warden::ManagerNick Thomas2016-09-261-2/+2
| |/ / / / /
* | | | | | Add CHANGELOG entries for 8.11.8, 8.10.11, and 8.9.11Rémy Coutable2016-09-291-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'fix/rugged-repo-error' into 'master' Rémy Coutable2016-09-298-4/+62
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken repo errors in the UI This should prevent repo errors (or 404s) in the UI, together with https://gitlab.com/gitlab-org/gitlab_git/merge_requests/124 The `exists?` cache is now expired if the repo gets broken. Related MR: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/124 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20501 See merge request !6491
| * | | | | fix broken repo 500 errors in UI and added relevant specsJames Lopez2016-09-298-4/+62
| | | | | |
* | | | | | Merge branch 'axil/gitlab-ce-typos_runners_pages' into 'master' Achilleas Pipinellis2016-09-298-40/+44
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix grammar and typos in Runners pages _Originally opened at !1791 by @axil._ - - - ## 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) See merge request !6547
| * | | | | Fix grammar and typos in Runners pagesaxil/gitlab-ce-typos_runners_pagesAchilleas Pipinellis2016-09-288-40/+44
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch '22544-long-commit-message' into 'master' Fatih Acet2016-09-292-1/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes long commit messages overflow viewport in file tree ## What does this MR do? Fixes long commit messages breaking the table. It adds back a max-width in `pixels` instead of `%`. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? To fix the overflow of the commit message ## Screenshots (if relevant) ![max_width](/uploads/73af2ffbab29bf6e9bbd9287e9e142a0/max_width.png) ## 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 - [ ] 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? Fixes #22544 See merge request !6573
| * | | | | | Fixes long commit messages overflow viewport in file treeFilipa Lacerda2016-09-292-1/+7
|/ / / / / /
* | | | | | Merge branch 'fix-double-changelog-header-for-8-13' into 'master' Robert Speicher2016-09-291-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix double CHANGELOG header for 8.13 [ci skip] See merge request !6593
| * | | | | | Update CHANGELOGfix-double-changelog-header-for-8-13Luke "Jared" Bennett2016-09-291-2/+1
|/ / / / / /
* | | | | | Merge branch 'issue_22382' into 'master' Rémy Coutable2016-09-295-9/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose project share expiration_date field on API closes #22382 See merge request !6484
| * | | | | | Expose project share expiration_date field on APIissue_22382Felipe Artur2016-09-285-9/+16
| | | | | | |
* | | | | | | Merge branch 'fix-html5-color-inputs' into 'master' Annabel Dunstone Gray2016-09-293-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove instances of HTML5 input type="color" due to inconsistent browser support ## What does this MR do? `<input type="color" />` renders differently across browsers. Reverting to `type="text"` where necessary. ## Screenshots (if relevant) Safari (top) vs Chrome (bottom) ![Screen_Shot_2016-09-28_at_11.53.02_AM](/uploads/f967ed988320cbd2e4357cdfcfe7a813/Screen_Shot_2016-09-28_at_11.53.02_AM.png) See merge request !6576
| * | | | | | | remove instances of <input type="color" /> due to inconsistent browser supportMike Greiling2016-09-293-4/+4
| | | | | | | |
* | | | | | | | Merge branch 'cs-upgrade-devise' into 'master' Robert Speicher2016-09-2913-15/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Devise from 4.1.1 to 4.2.0. This fixes an issue with Rails 5 and brings us up-to-date with the latest Devise release. It also deprecates `Devise::TestHelpers` in favor of `Devise::Test::ControllerHelpers`. Changelog: https://github.com/plataformatec/devise/blob/v4.2.0/CHANGELOG.md#420---2016-07-01 Working toward #14286, as always. See merge request !6461
| * | | | | | | | Fix test failure by accessing Content-Type header directly.cs-upgrade-deviseConnor Shea2016-09-271-1/+1
| | | | | | | | |
| * | | | | | | | Upgrade Devise from 4.1.1 to 4.2.0.Connor Shea2016-09-2712-14/+14
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue with Rails 5 and brings us up-to-date with the latest Devise release. This also replaces the deprecated Devise::TestHelpers with Devise::Test::ControllerHelpers. Changelog: https://github.com/plataformatec/devise/blob/v4.2.0/CHANGELOG.md#420---2016-07-01
* | | | | | | | Merge branch '22364-rails-cache-connection-pool-sidekiq-servers' into 'master' Rémy Coutable2016-09-292-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a ConnectionPool for Rails.cache on Sidekiq servers ## What does this MR do? On Sidekiq server we'll use a connection pool to connect to the redis store used for Rails cache. But now we're sure we're not modifying the configuration used on the lazy create Redis connection inside the connection pools. I've create a PR on [redis-activesupport](https://github.com/pacoguzman/redis-activesupport) too. @jacobvosmaer-gitlab make this easier updating the Gitlab::Redis class !6472 Closes #22364 See merge request !6468