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-11-28Clean up visibility levelcleanup-visibility-levelAchilleas Pipinellis
- Remove duplicate visibility entry when creating a new project - Sentence case 'Visibility level' - Open docs for visibility level in a new tab
2016-11-28Merge branch 'dynamic-build-fixture' into 'master' Alfredo Sumaran
Create dynamic fixture for build_spec ## What does this MR do? Replace `spec/javascripts/fixtures/build.html.haml` by a dynamically created fixture (using `rake teaspoon:fixtures`). ## Why was this MR needed? The existing fixture was not representing the real page. ## What are the relevant issue numbers? #24614 would have been avoided following !6059 See merge request !7589
2016-11-28Merge branch ↵Sean McGivern
'24813-project-members-with-developer-access-can-no-longer-create-tags' into 'master' Create tag after running pre-hooks and pass updated SHA to post-hooks Closes #24813 See merge request !7700
2016-11-28Pass tag SHA to post-receive hook when tag is created via UIAdam Niedzielski
We only know the tag SHA after we create the tag. This means that we pass a different value to the hooks that happen before creating the tag, and a different value to the hooks that happen after creating the tag. This is not an ideal situation, but it is a trade-off we decided to make. For discussion of the alternatives please refer to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7700#note_18982873 "pre-receive" and "update" hooks always get the SHA of the commit that the tag points to. "post-receive" gets the tag SHA if it is an annotated tag or the commit SHA if it is an lightweight tag. Currently we always create annotated tags if UI is used.
2016-11-28Merge branch ↵Sean McGivern
'24860-actionview-template-error-undefined-method-size-for-nil-nilclass' into 'master' Prevent error when submitting a merge request and pipeline is not defined Closes #24860 See merge request !7707
2016-11-28Revert "Pass correct tag target to post-receive hook when creating tag via UI"Adam Niedzielski
This reverts commit ae51774bc45d2e15ccc61b01a30d1b588f179f85.
2016-11-28Merge branch 'issuable_filters_present-refactor' into 'master' Robert Speicher
Refactor issuable_filters_present to reduce duplications See https://gitlab.com/gitlab-org/gitlab-ce/issues/23546 See merge request !7776
2016-11-28Merge branch 'rs-phantomjs-disable-images' into 'master' Rémy Coutable
Pass `--load-images=no` to PhantomJS via Capybara/Poltergeist We were unintentionally hitting `gravatar.com` whenever a test that used Poltergeist was run. This was certainly wasting their resources and slowing down our tests even further, for no reason. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/24899 See merge request !7781
2016-11-28Prevent error when submitting a merge request and pipeline is not definedAdam Niedzielski
2016-11-28Merge branch 'rs-project-security-spec-speed' into 'master' Rémy Coutable
Speed up Project security access specs Prior, every single test was creating four `ProjectMember` objects, each of which created one `User` record, even though each test only used _one_ of those Users, if any. Now each test only creates the single user record it needs, if it needs one. This shaves minutes off of each spec file changed here. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/24899 See merge request !7779
2016-11-28Refactor issuable_filters_present to reduce duplicationsSemyon Pupkov
https://gitlab.com/gitlab-org/gitlab-ce/issues/23546
2016-11-28Speed up Project security access specsRobert Speicher
Prior, every single test was creating four `ProjectMember` objects, each of which created one `User` record, even though each test only used _one_ of those Users, if any. Now each test only creates the single user record it needs, if it needs one. This shaves minutes off of each spec file changed here.
2016-11-28Merge branch 'fix-dead-help-link' into 'master' Rémy Coutable
Fix a broken link and avoid potential creation of future broken links on the help page. See merge request !7582
2016-11-28Pass `--load-images=no` to PhantomJS via Capybara/PoltergeistRobert Speicher
We were unintentionally hitting `gravatar.com` whenever a test that used Poltergeist was run. This was certainly wasting their resources and slowing down our tests even further, for no reason.
2016-11-28Merge branch 'remove-relative-call-from-finder' into 'master' Rémy Coutable
Remove unnecessary require_relative calls from finder Rails add all from app to autoload. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7601 See merge request !7768
2016-11-28Merge branch '22253-move-lfshelper-methods-somewhere-else-than-app-helpers' ↵Robert Speicher
into 'master' This moves methods from `LfsHelper` to a new `LfsRequest` concern and introduces a new `WorkhorseRequest` concern. Closes #22253 See merge request !7623
2016-11-28Merge branch 'backport/groups-helper-refactor' into 'master' Douwe Maan
Backport groups_helper refactor from gitlab-org/gitlab-ee!904 This is a simple backport from a change in `groups_helper.rb` introduced by gitlab-org/gitlab-ee!904, requested here: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/904#note_18894726 See merge request !7767
2016-11-28Merge branch 'refresh-authorizations-with-lease' into 'master' Douwe Maan
Refresh project authorizations using a Redis lease This MR changes `User#refresh_authorized_projects` so it uses a Redis lease instead of relying on serializable transactions. See the commit message(s) for more details. See merge request !7733
2016-11-28Merge branch 'events-cache-invalidation' into 'master' Douwe Maan
Remove caching of events data This MR removes the caching of events data as this was deemed unnecessary while increasing load on the database. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6578#note_18864037 and 5371da341e9d7768ebab8e159b3e2cc8fad1d827 for more information. See merge request !6578
2016-11-28Merge branch 'ux-guide-anchor-hover' into 'master' Achilleas Pipinellis
UX Guide: Anchor hover guidance include color change Update guidance on anchor hover treatment in UX Guide See merge request !7639
2016-11-27[ci skip] UX Guide: Anchor hover guidance include color changeawhildy
Primary and secondary links should be dark blue on hover Update anchor image to dark blue for secondary Clean up markdown Fix anchorlinks image
2016-11-26Remove unnecessary require_relative calls from finderSemyon Pupkov
2016-11-26Merge branch 'ux-guide-dropdown-max-height' into 'master' Achilleas Pipinellis
UX Guide: add guidance for max height for dropdowns Added guidance to the Components page of the UX Guide, documenting the recommend max height for a dropdown. See merge request !7766
2016-11-26Backporting little groups_helper refactor from gitlab-org/gitlab-ee!904Gabriel Mazetto
2016-11-26[ci skip] UX Guide: add guidance for max height for dropdownsawhildy
Fix spelling
2016-11-26Merge branch 'workhorse-v1.0.1' into 'master' Rémy Coutable
Update GitLab Workhorse to v1.0.1 v1.0.0 was wrongly tagged, causing compiled gitlab-workhorse binaries to misreport their version number. Closes https://gitlab.com/gitlab-org/gitlab-workhorse/issues/77 See merge request !7759
2016-11-25Merge branch '24903-allow-groups-with-special-characters' into 'master' Alfredo Sumaran
Allow dots in group names to pass validation for Create Group and Edit Group forms ## What does this MR do? Allows dots within group names to pass form validation when creating or editing a group. ## Are there points in the code the reviewer needs to double check? Nope, pretty straight forward. ## Why was this MR needed? Although group names with dots are allowed, our frontend validation mistakenly invalidates them ## Screenshots (if relevant) #### Before: ![Screen_Shot_2016-11-23_at_4.55.03_PM](/uploads/006ee5f694de1c98e0df0b0ccd3807ee/Screen_Shot_2016-11-23_at_4.55.03_PM.png) #### After: ![Screen_Shot_2016-11-23_at_4.52.42_PM](/uploads/693f112fb309005b0df714b32c99f25e/Screen_Shot_2016-11-23_at_4.52.42_PM.png) ![Screen_Shot_2016-11-23_at_4.51.53_PM](/uploads/7bdb5fca92995d18a7f38d9150eb260c/Screen_Shot_2016-11-23_at_4.51.53_PM.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 - [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? Related to: #24622 Closes #24903 See merge request !7723
2016-11-25Check that both '/help' and '/help/' URLs have the same behaviourDavid Wagner
The links in the help page may be modified. This new test checks that URLs in this page are absolute and do not depend on the presence of a trailing slash in the URL. Signed-off-by: David Wagner <david@marvid.fr>
2016-11-25Merge branch 'zj-expose-coverage-pipelines' into 'master' Rémy Coutable
Expose coverage on GET pipelines/:id Closes gitlab-org/gitlab-ce#24801 See merge request !7670
2016-11-25Add docs for pipeline coverageZ.J. van de Weg
[ci skip]
2016-11-25use standard gitlab namespace regex for group name validationMike Greiling
2016-11-25Update GitLab Workhorse to v1.0.1Nick Thomas
v1.0.0 was mistakenly tagged with a lightweight, rather than annotated, tag, which caused compiled versions of workhorse to wrongly report their version.
2016-11-25Merge branch 'timeout-merge-request-for-binary-file' into 'master' Yorick Peterse
Fix: Timeout creating and viewing merge request for binary file See merge request !7713
2016-11-25Merge branch 'issue-24534' into 'master' Rémy Coutable
Remove unnecessary sentences for return codes in the API documentation Closes #24534 See merge request !7511
2016-11-25Expose coverage on GET pipelines/:idZ.J. van de Weg
The coverage wasn't exposed yet, now it is but only for detailed requests to save queries on the database.
2016-11-25Fix: Timeout creating and viewing merge request for binary fileValery Sizov
2016-11-25Merge branch 'zj-slash-commands-improvements' into 'master' Kamil Trzciński
Slash commands improvements See merge request !7638
2016-11-25Removed data-user-is view codeYorick Peterse
With events no longer being cached this is no longer needed.
2016-11-25Refresh project authorizations using a Redis leaseYorick Peterse
When I proposed using serializable transactions I was hoping we would be able to refresh data of individual users concurrently. Unfortunately upon closer inspection it was revealed this was not the case. This could result in a lot of queries failing due to serialization errors, overloading the database in the process (given enough workers trying to update the target table). To work around this we're now using a Redis lease that is cancelled upon completion. This ensures we can update the data of different users concurrently without overloading the database. The code will try to obtain the lease until it succeeds, waiting at least 1 second between retries. This is necessary as we may otherwise end up _not_ updating the data which is not an option.
2016-11-25Merge branch '22373-reduce-queries-in-api-helpers-find_project' into 'master' Yorick Peterse
Resolve "Reduce queries in API::Helpers#find_project" See merge request !7714
2016-11-25Accept a valid ref for issue showZ.J. van de Weg
For example, now we support `/gitlab issue show #1`. Where the # used to trip the regex.
2016-11-25Prefer arrow functions in build_spec.js.es6winniehell
2016-11-25Strip <link> tags from fixtures to ignore CSSwinniehell
2016-11-25Explicitly name namespace and projects for frontend fixtureswinniehell
2016-11-25Use Rails test host name for frontend fixtureswinniehell
2016-11-25Remove unnecessary IIFE from build_specwinniehell
2016-11-25Adjust build_spec to match fixturewinniehell
2016-11-25Create dynamic fixture for build_spec (!7589)winniehell
2016-11-25Merge branch 'fix-cancelling-pipelines' into 'master' Kamil Trzciński
Improve how we could cancel pipelines: Improve how we could cancel pipelines: * Introduce `HasStatus.cancelable` which we might be able to cancel * Cancel and check upon `cancelable` * Also cancel on `CommitStatus` rather than just `Ci::Build` Fixes #23635 Fixes #17845 See merge request !7508
2016-11-25Merge branch 'autocomplete-space-prefix' into 'master' Fatih Acet
Allow GFM autocomplete to be trigger without the preceding space ## What does this MR do? Gives the ability to GFM autocomplete to be trigger even if there is no preceding space. I've taken the regex from the at.js plugin & tweaked it to allow the leading character to be a special character. ## What are the relevant issue numbers? Closes #19975 ## Screenshots (if relevant) ![Screen_Shot_2016-07-21_at_14.41.34](/uploads/19684ba286baeedb754e7457945480a8/Screen_Shot_2016-07-21_at_14.41.34.png)![Screen_Shot_2016-07-21_at_14.41.40](/uploads/a77349bce599ae93b4bcddd355087f5c/Screen_Shot_2016-07-21_at_14.41.40.png)![Screen_Shot_2016-07-21_at_14.41.46](/uploads/c35df17b678b24b73c94b181f0784188/Screen_Shot_2016-07-21_at_14.41.46.png) See merge request !5395