summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Do not authorize with OAuth for CICD only projectsmc/feature/use-only-pat-cicd-projectsMatija Čupić2019-07-231-2/+6
|
* Merge branch 'georgekoltsov/63955-fix-import-with-source-branch-deleted' ↵Robert Speicher2019-07-151-1/+5
|\ | | | | | | | | | | | | into 'master' Always return MR diff_refs if importing See merge request gitlab-org/gitlab-ce!30630
| * Add commit_id to AttributeCleaner::ALLOWED_REFERENCESgeorgekoltsov/63955-fix-import-with-source-branch-deletedGeorge Koltsov2019-07-151-3/+5
| |
| * Always return MR diff_refs if importingGeorge Koltsov2019-07-111-0/+2
| | | | | | | | | | | | | | This change fixes a bug that prevents projects being imported when there are diff notes present in merge requests. Solves https://gitlab.com/gitlab-org/gitlab-ce/issues/63955
* | Merge branch 'fix-comment-race-condition' into 'master'Mike Greiling2019-07-151-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Fix race condition with polling when saving notes Closes gitlab-ee#12472 See merge request gitlab-org/gitlab-ce!30724
| * | Fix race condition with polling when saving notesfix-comment-race-conditionHeinrich Lee Yu2019-07-151-2/+2
| | | | | | | | | | | | | | | eTagPoll may not be initialized yet when we save a note. Polling is initialized only after discussions are loaded
* | | Ensure all quick help links have the same colorPrashanth Chandra2019-07-152-1/+7
| | |
* | | (CE Port) Set max width for onboarding popoverMartin Wortschack2019-07-151-0/+1
| | |
* | | Display boards filter bar on mobileMartin Hanzel2019-07-153-29/+33
| | |
* | | Move document to new location, split in 3Marcia Ramos2019-07-1511-11/+11
| | | | | | | | | | | | | | | - Move steps to new doc - Move all concepts to different docs
* | | Merge branch 'rs-namespace-feature' into 'master'Sean McGivern2019-07-151-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add Namespace#feature_available no-op Closes #60908 See merge request gitlab-org/gitlab-ce!30641
| * | | Add Namespace#feature_available no-oprs-namespace-featureRobert Speicher2019-07-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | This gets overridden in `EE::Namespace` and allows us to do things like always treat Epics as "disabled" in Core using the same checks we'd use elsewhere.
* | | | Merge branch '64499-add-size-96-to-avatar-sizes-in-avatar-scss' into 'master'Kushal Pandya2019-07-151-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add size 96 to avatar sizes in avatar.scss" Closes #64499 See merge request gitlab-org/gitlab-ce!30671
| * | | | Add size 96 to avatar sizes in avatar.scss64499-add-size-96-to-avatar-sizes-in-avatar-scssAmmar Alakkad2019-07-121-0/+5
| | | | |
* | | | | Add more file extentions to file type icon classPeter Dave Hello2019-07-151-9/+12
| |_|/ / |/| | |
* | | | Fix typo "beetween" in timeout validation messageDaniel Danner2019-07-131-1/+1
| | | |
* | | | Merge branch '11470-snowplow-tracking-for-notes-does-not-work-in-firefox' ↵Clement Ho2019-07-121-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' CE backport of reply button tracker refactor See merge request gitlab-org/gitlab-ce!28298
| * | | | CE backport of reply button tracker refactor11470-snowplow-tracking-for-notes-does-not-work-in-firefoxConstance Okoghenun2019-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | EE MR https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12578
* | | | | Add functions for multiple boards to BoardServiceWinnie Hellmann2019-07-122-0/+50
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit 9dbefac95a8b60b93ba7b05fd7bf69b80b395f54)
* | | | | Merge branch 'button-bug-fixes' into 'master'Annabel Dunstone Gray2019-07-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix Project Badge Buttons See merge request gitlab-org/gitlab-ce!30678
| * | | | | Fix Project ButtonsAndrew Fontaine2019-07-121-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | Correct the border colour of the count badge buttons.
* | | | | z-index fixed for diff file dropdownFaruk Can2019-07-121-1/+1
| | | | |
* | | | | Remove auto ssl feature flagsVladimir Shushlin2019-07-126-36/+23
| | | | | | | | | | | | | | | | | | | | | | | | | * remove feature flag for admin settings * remove feature flag for domain settings
* | | | | Merge branch 'fix-only-https-pages-domains' into 'master'Nick Thomas2019-07-121-2/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix saving domain without certificate for auto_ssl See merge request gitlab-org/gitlab-ce!30673
| * | | | | Fix saving domain without certificate for auto_sslfix-only-https-pages-domainsVladimir Shushlin2019-07-121-2/+8
| | |_|/ / | |/| | |
* | | | | Merge branch '51952-redirect-to-webide-in-fork' into 'master'Sean McGivern2019-07-121-1/+10
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Open WebIDE in fork when user doesn't have access See merge request gitlab-org/gitlab-ce!30642
| * | | | Open WebIDE in fork when user doesn't have access51952-redirect-to-webide-in-forkMarkus Koller2019-07-121-1/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | When opening the IDE on a project where the user doesn't have push access, we create a fork and then redirect back to the IDE. To make sure the user can actually commit, we need to open the IDE in the forked project rather than the upstream project.
* | | | Backports of "Remove feature flag behind MR's multiple assignees"Igor2019-07-121-4/+0
|/ / /
* | | Merge branch 'bvl-rename-routes-after-user-rename' into 'master'Jan Provaznik2019-07-123-16/+4
|\ \ \ | | | | | | | | | | | | | | | | Set the name of a user-namespace to the user name See merge request gitlab-org/gitlab-ce!23272
| * | | Lesser Namespace#name validationsBob Van Landuyt2019-07-092-14/+1
| | | | | | | | | | | | | | | | | | | | Since we use `Namespace#path` to build routes and URLs we can lessen the restrictions on `Namespace#name` so it can accomodate a user's name.
| * | | Set the name of a user-namespace to the user nameBob Van Landuyt2019-07-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of setting the name of the namespace to the user's username, set it to the user's name. This is more consistent with how we name the routes: The route-name of a namespace is the human name of the routable. In the case of a user-namespace, this is the owner's name. When we change a user's name (both on create and update), we now also update the namespace-name to the user's name. This will make sure that if we also correctly update all the nested routes.
* | | | Merge branch 'upgrade-rails-5-2-ce' into 'master'Bob Van Landuyt2019-07-1215-51/+53
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | [CE] Upgrade to Rails 5.2 See merge request gitlab-org/gitlab-ce!30052
| * | | | Upgrade to Rails 5.2upgrade-rails-5-2-ceHeinrich Lee Yu2019-07-1215-51/+53
| | | | | | | | | | | | | | | | | | | | Updates changed method names and fixes spec failures
* | | | | change the use of boardService in favor of boardsStore on footer for the ↵Eduardo Mejía2019-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | board component
* | | | | Prevent errors when CA has no dataBrandon Labuschagne2019-07-121-2/+8
| | | | |
* | | | | Merge branch '11445-fix-promoted-epic-inherited-discussions-ce' into 'master'Jan Provaznik2019-07-121-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Port EE: Fix reply to discussion on promoted epic See merge request gitlab-org/gitlab-ce!30411
| * | | | | Fix reply to discussion on promoted epic11445-fix-promoted-epic-inherited-discussions-ceAlexandru Croitor2019-07-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regenerate discussion_id for notes that are being copied over to the epic when issue is promoted to epic. https://gitlab.com/gitlab-org/gitlab-ee/issues/11445
* | | | | | Merge branch '60798-follow-up-simplify-sort-direction-logic' into 'master'Sean McGivern2019-07-121-49/+34
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Follow up: Simplify sort direction logic" Closes #60798 See merge request gitlab-org/gitlab-ce!30443
| * | | | | Minor review cleanup60798-follow-up-simplify-sort-direction-logicEzekiel Kigbo2019-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Minor refactor specs
| * | | | | Added tests for sort icon currentEzekiel Kigbo2019-07-121-26/+20
| | | | | | | | | | | | | | | | | | | | | | | | Refactor sort direction icon
| * | | | | Added test for admin/projectsEzekiel Kigbo2019-07-121-22/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tests with project_list_filter_bar set to off Added tests for projects_sort_option_titles Refactor project sort options hash
| * | | | | Added tests for current behaviourEzekiel Kigbo2019-07-121-10/+5
| | | | | |
* | | | | | Merge branch '55623-group-cluster-apis' into 'master'Grzegorz Bizon2019-07-126-42/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "API support for group-level clusters" Closes #55623 See merge request gitlab-org/gitlab-ce!30213
| * | | | | | Refactor: model errors for multi cluster validationDylan Griffith2019-07-116-42/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current approach requires catching exceptions to handle these errors and callers are already handling model validations so it seems more appropriate. Also it seemed to convoluted to add this logic directly to the model since the model needs to check too many possible associations to determine whether or not there are more than one cluster since the model doesn't know what it's being created on. Additionally we only wanted to validate during create to avoid the risk of existing models becoming invalid by many different edge cases.
* | | | | | | Merge branch 'issue-63298-asciidoc-sanitization' into 'master'Douwe Maan2019-07-123-29/+64
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent excessive sanitization of AsciiDoc ouptut Closes #63298 See merge request gitlab-org/gitlab-ce!30290
| * | | | | | | Prevent excessive sanitization of AsciiDoc ouptutGuillaume Grossetie2019-07-123-29/+64
| | | | | | | |
* | | | | | | | Merge branch 'graphql-include-authorization-for-mutations' into 'master'Jan Provaznik2019-07-124-5/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include AuthorizeResource module for all mutations See merge request gitlab-org/gitlab-ce!30243
| * | | | | | | | Include AuthorizeResource module for all mutationsgraphql-include-authorization-for-mutationsLuke Duncalfe2019-07-114-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes our authorization calls available to all GraphQL mutations without the additional step of including the module first.
* | | | | | | | | Split and prepend CurrentBoardEntityWinnie Hellmann2019-07-123-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 1e8bdd01bff96122fe80c51fa8f024f18675b58b)
* | | | | | | | | Merge branch 'sh-audit-event-json-log-format-from-and-to' into 'master'James Lopez2019-07-121-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Format `from` and `to` fields in JSON audit log See merge request gitlab-org/gitlab-ce!30333
View Lorry Controller Status