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-10-11Replace issues and merge requests trigram indexes with constrained indexes ↵constrained-indexesAlejandro Rodríguez
for `deleted_at`
2016-10-11Merge branch 'simplify-compare-page-text' into 'master' Fatih Acet
Changed 'Compare branches, tags or commit ranges' to 'Compare Git revisions' ## What does this MR do? I remember we had a quick discussion about what to call the expected input of the compare page. Today whilst doing !6766 I found these are called [git revisions](https://git-scm.com/docs/gitrevisions). ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-10-10_at_14.44.13](/uploads/694200b8f56967d8e7caa965bbf7c123/Screen_Shot_2016-10-10_at_14.44.13.png) Dunno where that gradient came :laughing: Screenshot issue not code. ## 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 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? See merge request !6774
2016-10-11Merge branch '20356-network-commit-hash-input-placeholder-corrections' into ↵Fatih Acet
'master' Changed network input placeholder to 'Git revision' ## What does this MR do? Changes the commit SHA-1 input placeholder on the network page to `Git revision`. ([as defined here](https://git-scm.com/docs/gitrevisions)) ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Placeholder was too complex ## Screenshots (if relevant) ![Screen_Shot_2016-10-10_at_15.06.23](/uploads/e31586b0f7a973b04e55e73223a2a95c/Screen_Shot_2016-10-10_at_15.06.23.png) ## 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 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 #20356 See merge request !6766
2016-10-11Merge branch 'fix-options-caret-mobile-viewport' into 'master' Fatih Acet
Fix inconsistent options dropdown caret on mobile viewports ## What does this MR do? Change the options dropdown caret from left aligned to right aligned (only visible on mobile viewports) ## Are there points in the code the reviewer needs to double check? Check if there are any other dropdowns that have left aligned carets ## Why was this MR needed? Resolve UI inconsistency as some dropdown carets were already right aligned ## Screenshots (if relevant) Before: ![Simulator_Screen_Shot_Sep_15__2016__11.54.55_AM](/uploads/767d9344db4973af5a5368d5149144cc/Simulator_Screen_Shot_Sep_15__2016__11.54.55_AM.png) After: ![Simulator_Screen_Shot_Sep_15__2016__11.54.09_AM](/uploads/882614cb9c5f85bf44e118cd7c74fcef/Simulator_Screen_Shot_Sep_15__2016__11.54.09_AM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [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 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? Closes #22086 See merge request !6372
2016-10-11Merge branch 'mr-file-path-copy-btn' into 'master' Fatih Acet
Added copy file path button to diffs ## What does this MR do? Adds a copy file path button in the header of diff files. ## Screenshots (if relevant) ![Screen_Shot_2016-10-10_at_09.59.48](/uploads/1aedd5033bb3c1893023bb8c8d99a708/Screen_Shot_2016-10-10_at_09.59.48.png) ## What are the relevant issue numbers? Closes #23108 See merge request !6769
2016-10-10Merge branch 'remove-redundant-mixins' into 'master' Annabel Dunstone Gray
Remove redundant mixins ## What does this MR do? Removes the following redundant mixins ``` @mixin box-shadow($shadow) { box-shadow: $shadow; } @mixin border-radius($radius) { border-radius: $radius; } ``` ## Are there points in the code the reviewer needs to double check? Just need to make sure the refactor didn't break anything. Last time I did something like this, we faced an edge case where values `.5` would pass correctly in mixins but not when passed directly to the property. ## Why was this MR needed? * Reduces redundant code which leads to happier developers :smile: ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [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 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? Closes #22012 See merge request !6287
2016-10-10Merge branch 'doc/link-coverage-badge-to-coverage-report' into 'master' Achilleas Pipinellis
Add link to test coverage report to README ## What does this MR do? Since we have GitLab Pages with test coverage report, it makes sense to link coverage badge there, instead of linking to commits page. See merge request !6772
2016-10-10Merge branch 'fix-misnamed-constant' into 'master' Robert Speicher
Rename HTMLEntityFilter to HtmlEntityFilter to fix autoloading See merge request !6776
2016-10-10Merge branch 'use-let-in-tests' into 'master' Stan Hu
Use user from let instead recreate in before ## What does this MR do? It`s minor fix in tests. We can use factory from let instead recreate user before each test. ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? ## Screenshots (if relevant) No ## 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 - [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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !6762
2016-10-10Merge branch 'jmcgeheeiv/gitlab-ce-patch-1' into 'master' Achilleas Pipinellis
Improve backup doc readability From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3761 See merge request !6781
2016-10-10Add registry to skipped data in backup raketask docsAchilleas Pipinellis
[ci skip]
2016-10-10Merge branch 'explain-0600' into 'master' Robert Speicher
Explain the extra chmod There is confusion about what passing `0600` to File.open does. ``` $ touch /tmp/foobar $ ls -l /tmp/foobar -rw-r--r-- 1 jacobvosmaer wheel 0 Sep 26 14:20 /tmp/foobar $ ruby -e 'File.open("/tmp/foobar", "w", 0600)' $ ls -l /tmp/foobar -rw-r--r-- 1 jacobvosmaer wheel 0 Sep 26 14:20 /tmp/foobar $ $ $ rm /tmp/foobar $ ruby -e 'File.open("/tmp/foobar", "w", 0600)' $ ls -l /tmp/foobar -rw------- 1 jacobvosmaer wheel 0 Sep 26 14:21 /tmp/foobar ``` See merge request !6523
2016-10-10Merge branch 'jerdog/gitlab-ce-update-start-using-git-documentation' into ↵Achilleas Pipinellis
'master' Changes to make Git basics more intuitive From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6420 See merge request !6777
2016-10-10Updating changes based on feedback from @connorsheaJerdog
2016-10-10Changes to make Git basics more intuitiveJerdog
- updated verbiage where appropriate - changed "git config" commands to include quotes for variables to be more in line with standard practive and to avoid issues with spaces - updated CHANGELOG as part of commit
2016-10-10Merge branch 'tnir/gitlab-ce-23068-cleanup-ci-application-controller'Rémy Coutable
Remove Ci::ApplicationController. See gitlab-org/gitlab-ce!6757.
2016-10-10Remove Ci::ApplicationControllerTakuya Noguchi
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-10HTMLEntityFilter -> HtmlEntityFilterNick Thomas
2016-10-10Merge branch 'gtrafimenkov/gitlab-ce-clarify-runners-delete-token' into ↵Achilleas Pipinellis
'master' Clarify which token should be used to delete a Runner See merge request !6775
2016-10-10Clarify which token should be used to delete a runnerGennady Trafimenkov
2016-10-10Changed 'Compare branches, tags or commit ranges' to 'Compare Git revisions'Luke Bennett
2016-10-10Changed placeholder to 'Commit hash'Luke Bennett
Changed 'Commit hash' to 'Git revision'
2016-10-10Merge branch 'fix/async-pipeline-processing-stale-data' into 'master' Kamil Trzciński
Fix ci pipeline processing with async jobs ## What does this MR do? This MR fixes CI pipeline processing with asynchronous jobs called from `around_transition` provided by state machine. For details see https://github.com/pluginaweek/state_machine/issues/191 and commit f68acba. ## Why was this MR needed? Recently merged https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6650 introduced problem with asynchronous job being deployed when `around_transition` still held transaction, which caused race condition that prevented pipeline status to change in a proper way. ## What are the relevant issue numbers? Closes #23111 See merge request !6736
2016-10-10Merge branch 'namespace-validation-fixes' into 'master' Sean McGivern
Correct namespace validation to forbid bad names #21077 ## What does this MR do? Updates master namespace regex to forbid any namespace ending in `.git` or `.atom` and corrects and adds relevant tests ## Are there points in the code the reviewer needs to double check? I think it's all good. I could use help with the creation of tests for usernames with trailing `.atom` or `.git` as the testing framework is a bit over my head. ## Why was this MR needed? A group that ends in `.atom` will cause the relevent dashboard to crash if the user (ANY user, not just the creator) has visibility of the group until it is deleted through the admin panel (it cannot be renamed, the edit page will crash. It may be fixable through the API, that wasn't checked.) This allows a malicious user with group creation privileges to bulk add users to a group, rename the group to a bad name, and crash the groups dashboard for all members of the group. The same applies if the group is internal or public and users navigate to the explore tab of the groups dashboard. The same applies to usernames ending in `.atom`. In many places of the code, it implies that `.git` in not allowed at the end of namespaces, but many allowed it anyway. This MR forbids it everywhere to prevent potential issues (like the one with `.atom` going forward). ## What are the relevant issue numbers? Group path validation incomplete, crashes groups dashboard #21077 ## 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 - [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 !5994
2016-10-10Add link to test coverage report to READMEGrzegorz Bizon
2016-10-10Merge branch 'fix-typo_doc-api-labels.md' into 'master' Achilleas Pipinellis
Fix a typo in doc/api/labels.md See merge request !6760
2016-10-10Merge branch '23123-build-sidebar-selected-build' into 'master' Rémy Coutable
Fix wrong icon in CI build detail sidebar: right-arrow => arrow-right ## What does this MR do? It fixes a wrong icon name in the build detail page's sidebar: `right-arrow` should be `arrow-right`! ## Are there points in the code the reviewer needs to double check? No. Closes #23123 See merge request !6768
2016-10-10Merge branch 'bpj-mr-loop' into 'master' Jacob Schatz
Prevent running GfmAutocomplete setup for each diff note ## What does this MR do? Debounces GfmAutoComplete.setup. ## Why was this MR needed? See https://gitlab.com/gitlab-org/gitlab-ce/issues/22704 Major lag on MR screens with many diff notes. ## 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 - 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 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? https://gitlab.com/gitlab-org/gitlab-ce/issues/22704 See merge request !6569
2016-10-10Merge branch 'adam-commit-search-case-insensitive' into 'master' Sean McGivern
Make searching for commits case insensitive. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] 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 #21800 See merge request !6715
2016-10-10Merge branch 'shell-update' into 'master' Douwe Maan
Update Gitlab Shell to fix errors moving projects between storages ## What does this MR do? Update Gitlab Shell to fix errors moving projects between storages ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? We are unable to move projects using `ionice` because of an error in the current version of gitlab-shell. This brings the changes of https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/96 and https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/97 ## 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 - [ ] 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? Related to https://gitlab.com/gitlab-com/infrastructure/issues/513 See merge request !6751
2016-10-10Merge branch 'tests-use-tmpfs' into 'master' Yorick Peterse
Try tmpfs for repository storage, etc See merge request !6730
2016-10-10Merge branch '22373-reduce-queries-in-api-helpers-find_project' into 'master' Yorick Peterse
Improve project policy specs See merge request !6442
2016-10-10Merge branch 'gjlaubenstein/gitlab-ce-21712-change-issue-show-html-title'Robert Speicher
reword title for issues_controller#show and issues_controller#edit Closes #21712 See merge request !6503
2016-10-10Added copy file path button to diffsPhil Hughes
Closes #23108
2016-10-10Fix wrong icon in CI build detail sidebar: right-arrow => arrow-rightRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-10Merge branch ↵Rémy Coutable
'brennanroberts/gitlab-ce-22872-prevent-default-search-autocomplete' Prevent conflict b/w search field and its dropdown What does this MR do? Stops the global search form's default "action" from fighting with dropdown items when using the keyboard to navigate the dropdown. `e.preventDefault()` is now called on the enter key when a dropdown item is already selected. Closes #22872 See merge request !6643
2016-10-10Prevent conflict b/w search field and its dropdownBrennan Roberts
Stop the global search form's default "action" from fighting with dropdown items when using the keyboard to navigate the dropdown. `e.preventDefault()` is now called on the enter key when a dropdown item is already selected. Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-10Make searching for commits case insensitive.Adam Niedzielski
Fixes #21800.
2016-10-09Use user from let instead recreate in beforeSemyon Pupkov
2016-10-09reword html titles for merge requests and issuesGreg Laubenstein
2016-10-09Fix a typo in doc/api/labels.mdLemures Lemniscati
2016-10-08Check for transition loopback in commit statusGrzegorz Bizon
2016-10-08Add temporary fix for race condition in MWBSGrzegorz Bizon
2016-10-08Improve transitions and run hooks after transactionGrzegorz Bizon
2016-10-08Improve spec for merge when build succeeds featureGrzegorz Bizon
2016-10-08Fix inconsistent options dropdown caret on mobile viewportsClement Ho
2016-10-08Remove redundant mixinsClement Ho
2016-10-08Merge branch 'sh-add-user-constraints' into 'master' Stan Hu
Fix missing constraints causing route failures when usernames with periods are used Closes #23131 See merge request !6758
2016-10-08Fix missing constraints causing route failures when usernames with periods ↵Stan Hu
are used Closes #23131
2016-10-08Merge branch 'sh-fix-for-ruby-2.1.0-spec' into 'master' Stan Hu
Use Hash rocket syntax to maintain Ruby 2.1 compatibility in spec Builds in Ruby 2.1 specs were failing in master: https://gitlab.com/gitlab-org/gitlab-ce/builds/4883142 See merge request !6756