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-07-27Allow skipping users in autocompleteSean McGivern
Pass an array of user IDs in the `skip_users` param to have them excluded from the results (unless they are explicitly included through the `current_user` or `author_id` params).
2016-07-27Optimize maximum user access level lookup in loading of notesStan Hu
NotesHelper#note_editable? and ProjectTeam#human_max_access currently take about 16% of the load time of an issue page. This MR preloads the maximum access level of users for all notes in issues and merge requests with several queries instead of one per user and caches the result in RequestStore.
2016-07-25Merge branch 'filter-branch-by-name' into 'master' Douwe Maan
Users can filter branches by name on project branches page This MR aims to solve #18674 by adding the possibility to filter project branches by name ![Screen_Shot_2016-07-07_at_17.21.25](/uploads/b674765d2b1cb8a121c2101715a4568b/Screen_Shot_2016-07-07_at_17.21.25.png) See merge request !5144
2016-07-24Remove magic comments from Ruby files (!5456)winniehell
2016-07-22Merge branch 'master' into filter-branch-by-nametiagonbotelho
2016-07-22fix missing repo_ref parambarthc
2016-07-21Merge branch 'discussion-model' into 'master' Robert Speicher
Add Discussion model to represent MR/diff discussion Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/10325. See merge request !5376
2016-07-21Fix ci icons getting cut offAnnabel Dunstone
2016-07-21Cast duration to integer in `TimeHelper#time_interval_in_words`Rémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-21Add Discussion model to represent MR/diff discussionDouwe Maan
2016-07-20Merge branch 'cs-warn-on-failure' into 'master' Fatih Acet
Warn on failure ## What does this MR do? Adds styling and HTML for a `success_with_warnings` status in the MR widget. Unfinished as it needs some plumbing in the relevant CI controllers and models. ## Are there points in the code the reviewer needs to double check? Not at the moment, though I think I'll probably need help getting this to work in the backend. ## What are the relevant issue numbers? #17669 ## Screenshots (if relevant) ![Screen_Shot_2016-06-29_at_12.02.49_PM](/uploads/af4a915689633fe028f44bb34ae7a5b1/Screen_Shot_2016-06-29_at_12.02.49_PM.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 [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) cc: @ayufan See merge request !5004
2016-07-20Merge branch 'add-link-to-commit-avatar' into 'master' Rémy Coutable
Add link to profile to commit avatar ## What does this MR do? - links to user profiles to the avatars on commits page - tooltips to the avatars on commits page side effect: - links to user profiles to the avatars on pipelines page - tooltips to the avatars on pipelines page - tooltips to the avatars on activity page - mailto links to the avatars on activity page for non-registered users ## Are there points in the code the reviewer needs to double check? Nope. ## Why was this MR needed? There were no links nor Zeldas. ## What are the relevant issue numbers? fixes #19644 See merge request !5163
2016-07-20Merge branch 'issue_8110' into 'master' Rémy Coutable
Allow slack service to send messages on different channels closes #8110 ## Allow slack service to send messages on different channels ![new_slack_service](/uploads/87de0bd6b02a4f7853358676b5e74dff/new_slack_service.png) ## 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 - [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 !5124
2016-07-20Add link to user profile to commit avatar (!5163)winniehell
2016-07-20Refactor service settings viewFelipe Artur
2016-07-20Merge branch 'external-wiki-helper-speedup' into 'master' Yorick Peterse
speed up ExternalWikiService#get_project_wiki_path ## What does this MR do? Speed up ExternalWikiHelper#get_project_wiki_path ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? See issue #19886 ## What are the relevant issue numbers? #19886 ## Screenshots (if relevant) ## 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 [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 !5305
2016-07-20Merge remote-tracking branch 'origin/master' into cs-warn-on-failureKamil Trzcinski
2016-07-20Add project service documentation and update integration documentationFelipe Artur
2016-07-20Allow slack service to send messages on different channelsFelipe Artur
2016-07-19Merge branch '19937-fix-wrong-build-elapsed-time' into 'master' Kamil Trzciński
Fix build duration when build is not finished yet ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? Fixes #19937. ## Does this MR meet the acceptance criteria? - [x] No CHANGELOG since it fixes a regression not yet in a stable release (I think) - Tests - [x] Added for this feature/bug - [ ] 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 !5323
2016-07-19Use switch statements instead of if/else chains.Connor Shea
2016-07-19Starting work on the warn_on_failure feature for the MR build status.Connor Shea
2016-07-19implements the basic filter functionalitytiagonbotelho
2016-07-19Add new icons for every CI statusAnnabel Dunstone
2016-07-19speed up ExternalWikiService#get_project_wiki_pathEugene Howe
* This method previously iterated over all services in a project. Now it will directly query the ExternalWikiService for the project and filter by active state. * The presence of an external wiki is also cached * When an external wiki is added or removed, the cached value is updated
2016-07-19Add new running icon; add a bunch of styles to get svg to match existing fa ↵Annabel Dunstone
icons
2016-07-19Merge branch '19820-safer-diffs' into 'master' Douwe Maan
Collapsed diffs lines/size don't accumulate to overflow diffs. ## What does this MR do? Reduce the number of lines that we highlight on big diffs to try to reduce the degradation introduced by !4990 as you can see on the issue description #19820 . We collapse any files after the diff is over the number of safe files (100), or over the safe lines (500) or over the safe number of bytes (5KB x 100 files). We still need to bump the gitlab_git and point this branch to the new gitlab_git version. ## What are the relevant issue numbers? Closes #19820 Closes #19885 ## 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 !5306
2016-07-18Collapsed diffs lines/size don't accumulate to overflow diffs.Paco Guzman
2016-07-18Fix build duration when build is not finished yetRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-18Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable
This reverts commit 530f5158e297f3cde27f3566cfe13bad74ba3b50. See !4892. Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-16Revert "Merge branch 'gl-dropdown-issuable-form' into 'master'"Douwe Maan
This reverts merge request !4970
2016-07-15Merge branch 'feature.rouge-20' into 'master' Robert Speicher
Upgrade to Rouge 2.0 ## What does this MR do? This MR is a refactor of the HTMLGitlab formatter. The original was copy-pasted from the legacy HTML formatter and adapted to suit our needs. In particular, this MR: * Strips dead code and unused options * Factors out the "wrapping" into the places that care about it - Bonzai and the view helpers * Uses the Rouge 2.0 `token_lines` method to split tokens into lines, removing the custom code we used to do the same * Uses the now-public `span` method instead of re-implementing it ourselves * Removes options to not split into lines - the places where this feature wasn't being used are now using the plain `Formatters::HTML` instead of this class See merge request !4691
2016-07-15Merge branch '17341-firefox-u2f' into 'master' Robert Speicher
Allow U2F devices to be used in Firefox - Adds U2F support for Firefox - Improve U2F feature detection logic - Have authentication flow be closer to the spec (single challenge instead of a challenge for each `signRequest`) - Closes #17341 - Related to #15337 See merge request !5177
2016-07-15Merge branch 'update-permissions-links' into 'master' Achilleas Pipinellis
Update permissons links to new page https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5210 updated the location in the docs, but we link to this page a bunch in the app too. See merge request !5247
2016-07-15use %(...) and %[...] in favor of %<...>http://jneen.net/
2016-07-15Merge branch 'gl-dropdown-issuable-form' into 'master' Jacob Schatz
GL dropdowns in issuable form ## What does this MR do? Changed all the issuable dropdown menus over to user GL dropdowns. This brings the dropdowns to be inline with the issuable filter dropdowns and allows for labels to be created whilst creating/editing an issuable. ## What are the relevant issue numbers? Closes #12574 ## Screenshots (if relevant) See merge request !4970
2016-07-14kill the nowrap optionhttp://jneen.net/
the <pre><code> wrapping is *always* used by the helper, and *never* by anywhere else, so pull the wrapping into the helper
2016-07-14rm dead `highlighter` methodhttp://jneen.net/
2016-07-14Merge branch 'top-links-label' into 'master' Fatih Acet
Aria labels on top header links ## What does this MR do? Added `aria-label` to the links in top header bar for accessibility. ## What are the relevant issue numbers? Closes #12797 See merge request !5205
2016-07-14Merge branch 'issuable-author-tooltip' into 'master' Fatih Acet
Added author username tooltip in issuable header ## What does this MR do? Adds the authors username as a tooltip to the header of issuables ## What are the relevant issue numbers? Closes #13771 ## Screenshots (if relevant) ![Screen_Shot_2016-07-12_at_16.00.34](/uploads/9485150f1c9d4006384f18d08a07430f/Screen_Shot_2016-07-12_at_16.00.34.png) See merge request !5209
2016-07-14Update permissons links to new pageSean McGivern
permissions/permissions just links to user/permissions since https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5210
2016-07-14Load Javascript U2F library selectively.Timothy Andrew
1. Only on supported Chrome versions 2. Mainly, this lets us simplify the javascript-based U2F check to `window.u2f`, where `window.u2f` can either be loaded from the GitLab server (for Chrome) or from the Firefox extension. 3. This is a better way to provide browser detection for U2F.
2016-07-13Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher
This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing changes made to fb229bbf7970ba908962b837b270adf56f14098f.
2016-07-13Fixed RubocopPhil Hughes
2016-07-13Refactor `Gitlab::GitAccess`Timothy Andrew
1. Don't use case statements for dispatch anymore. This leads to a lot of duplication, and makes the logic harder to follow. 2. Remove duplicated logic. - For example, the `can_push_to_branch?` exists, but we also have a different way of checking the same condition within `change_access_check`. - This kind of duplication is removed, and the `can_push_to_branch?` method is used in both places. 3. Move checks returning true/false to `UserAccess`. - All public methods in `GitAccess` now return an instance of `GitAccessStatus`. Previously, some methods would return true/false as well, which was confusing. - It makes sense for these kinds of checks to be at the level of a user, so the `UserAccess` class was repurposed for this. The prior `UserAccess.allowed?` classmethod is converted into an instance method. - All external uses of these checks have been migrated to use the `UserAccess` class 4. Move the "change_access_check" into a separate class. - Create the `GitAccess::ChangeAccessCheck` class to run these checks, which are quite substantial. - `ChangeAccessCheck` returns an instance of `GitAccessStatus` as well. 5. Break out the boolean logic in `ChangeAccessCheck` into `if/else` chains - this seems more readable. 6. I can understand that this might look like overkill for !4892, but I think this is a good opportunity to clean it up. - http://martinfowler.com/bliki/OpportunisticRefactoring.html
2016-07-13Change running status color to blue; update icon to spinnerAnnabel Dunstone
2016-07-12Add new stopwatch and commit icons; rename custom icon helper; fix commit ↵Annabel Dunstone
pipeline layout
2016-07-12Merge branch 'approval-required-todo' into 'master' Robert Speicher
Add approval required todos Ports the 'approval required' todo type from EE - https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/547 See merge request !5217
2016-07-12Add approval required todosSean McGivern
2016-07-12Cache todos pending/done dashboard query countsPaco Guzman