summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into feature/sm/3691-expose-per-project-pipeline-idfeature/sm/3691-expose-per-project-pipeline-idShinya Maeda2017-11-061192-14058/+21879
|\
| * Merge branch 'ce-gitlab-git-backport' into 'master'Sean McGivern2017-11-065-55/+14
| |\ | | | | | | | | | | | | CE repository mirroring changes backport See merge request gitlab-org/gitlab-ce!15184
| | * Use Gitlab::Git operations for repository mirroringce-gitlab-git-backportAlejandro Rodríguez2017-11-032-33/+0
| | |
| | * Encapsulate git operations for mirroring in Gitlab::GitAlejandro Rodríguez2017-11-033-18/+9
| | |
| | * Create a Wiki Repository's raw_repository properlyAlejandro Rodríguez2017-11-032-4/+5
| | |
| * | Merge branch '38677-render-new-discussions-on-diff-tab' into 'master'36248-repo-editor-double-border-under-repo-file-buttonsFilipa Lacerda2017-11-062-1/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Added discussion_line_code value to note response and use it to query the right… Closes #38677 See merge request gitlab-org/gitlab-ce!14981
| | * | Use diff_discussion? instead of is_a?(DiffDiscussion)38677-render-new-discussions-on-diff-tabLuke "Jared" Bennett2017-11-021-1/+1
| | | |
| | * | FE review changes - remove internal details assertion and look for closest ↵Luke "Jared" Bennett2017-10-271-1/+1
| | | | | | | | | | | | | | | | form if no discussion_line_code
| | * | Fix karmaLuke "Jared" Bennett2017-10-231-1/+1
| | | |
| | * | Remove trailing commaLuke "Jared" Bennett2017-10-211-1/+1
| | | |
| | * | Improve discussion_line_code set and update notes_controller_specLuke "Jared" Bennett2017-10-211-1/+2
| | | |
| | * | Added discussion_line_code value to note response and use it to query the ↵Luke "Jared" Bennett2017-10-212-2/+4
| | | | | | | | | | | | | | | | right row for the discussion UI
| * | | Remove unique validation from external_url in Environmentfix/sm/37299-environments-validate-uniqueness-on-url-and-can-cause-silent-deployment-failuresShinya Maeda2017-11-061-1/+0
| | | |
| * | | Expose project visibility as CI variableMatija Čupić2017-11-041-1/+2
| | | |
| * | | Merge branch 'sh-headless-chrome-support' into 'master'Stan Hu2017-11-038-22/+25
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace PhantomJS with Headless Chrome for GitLab Integration Tests Closes #30876 See merge request gitlab-org/gitlab-ce!12244
| | * \ \ Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-0355-700/+869
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (33 commits) Ignore SQL CACHE hits in Sherlock Fix SQL timings for the performance bar Find the LFS-objects for a fork within a the fork network Remove bottom-border from last responsive table row Add system hooks user_rename and group_rename Unlink a project from a fork network when it's source was deleted. Make sure the settings page renders when root of a fork is deleted Remove Peek's original keyboard shortcut (numpad 0, keycode 96) Add application setting to Auto DevOps docs Enable MergeableSelector in scss-lint (for !14567) Enable MergeableSelector in scss-lint (for !14055) Enable MergeableSelector in scss-lint (for !14062) Enable MergeableSelector in scss-lint (for !14398) Enable MergeableSelector in scss-lint (for !13480) Enable MergeableSelector in scss-lint (for !13473) Enable MergeableSelector in scss-lint (for !13600) Enable MergeableSelector in scss-lint Resolve ""To do" should be "Todos" on Todos list page" Avoid regenerating the ref path for the environment Remove white space at bottom of issue boards ...
| | * \ \ \ Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-0293-1040/+1187
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (109 commits) Remove Filesystem check metrics that use too much CPU to handle requests Set merge_request_diff_id on MR when creating Add a column linking an MR to its diff Remove useless closeReopenReport specs Clarify external artifacts only working when GitLab pages is enabled Send SIGSTP before SIGTERM to actually give Sidekiq jobs 30s to finish when the memory killer kicks in Remove an exception from the git user default SSH config check Geo route whitelisting is too optimistic Update .nvmrc to current stable (v9.0.0) Update documentation Address Douwe's feedback Refactor responsive table styles to support nested error block Add changelog items Update specs for sudo behavior Move RSS and incoming email tokens from User Settings > Accounts to User Settings > Access Tokens Remove user authentication_token column Migrate user private tokens to personal access tokens Add sudo API scope Consistently use PersonalAccessToken instead of PersonalToken Remove User#private_token ...
| | * | | | | remove PhantomJS specific hacksMike Greiling2017-10-314-15/+0
| | | | | | |
| | * | | | | fix edit token regression within ↵Mike Greiling2017-10-311-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | spec/features/issues/filtered_search/visual_tokens_spec.rb
| | * | | | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-31111-1948/+2242
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (84 commits) Migrate Gitlab::Git::Wiki#page to Gitaly Load participants async Normalize LDAP DN when looking up identity Improve the maintenance policy page add changelog fix spec failure Allow promoting project milestones to group milestones fix specs Be able to bundle gems with newer rubies Upgrade Ruby to 2.3.5 fixed up upload feature after master merge fix missing issue assignees Migrate Gitlab::Git::Wiki#delete_page to Gitaly Enable eslint Make `#hashed_storage?` require feature argument Adds callback function to inital cluster request Fix example typo. Upload files through the multi-file editor get branch name from the DOM Resolve "Convert autosize.js library to be a Yarn managed library" ...
| | * | | | | | add missing parameter to triggerEventsMike Greiling2017-10-311-1/+1
| | | | | | | |
| | * | | | | | fix page render issues on contribution calendar while tests are runMike Greiling2017-10-301-5/+0
| | | | | | | |
| | * | | | | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-2991-460/+1373
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (96 commits) Fetch the merged branches at once Merging EE doc into CE Avoid using Rugged in Gitlab::Git::Wiki#preview_slug Cache commits on the repository model Remove groups_select from global namespace & simplifies the code Change default disabled merge request widget message to "Merge is not allowed yet" Semi-linear history merge is now available in CE. Remove repetitive karma spec Improve spec to check hidden component Rename to shouldShowUsername Add KubernetesService#default_namespace tests Revert "Merge branch '36670-remove-edit-form' into 'master'" Fix bitbucket login Remove duped tests Add path attribute to WikiFile class Make local_branches OPT_OUT Clarify the language around External Group membership with SAML SSO to clarify that this will NOT add users to GitLab Groups. Added ssh fingerprint, gitlab ci and pages information in an instance configuration page Fix the incorrect value being used to set GL_USERNAME on hooks Resolve "Remove overzealous tooltips in projects page tabs" ...
| | * \ \ \ \ \ \ Merge branch ↵Mike Greiling2017-10-238-51/+55
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35955-searchable-settings-puts-expand-collapse-toggle-in-an-invalid-state' into sh-headless-chrome-support * 35955-searchable-settings-puts-expand-collapse-toggle-in-an-invalid-state: Stop sections from expanding when scrolling over the 1px section update settings panels to place "expanded" class on the correct element remove needlessly complicated, duplicate css class for expanded settings panels
| | | * | | | | | | Stop sections from expanding when scrolling over the 1px sectionEric Eastwood2017-10-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.slack.com/archives/C0GQHHPGW/p1508253662000271
| | | * | | | | | | update settings panels to place "expanded" class on the correct elementMike Greiling2017-10-146-24/+24
| | | | | | | | | |
| | | * | | | | | | remove needlessly complicated, duplicate css class for expanded settings panelsMike Greiling2017-10-142-27/+27
| | | | | | | | | |
| | * | | | | | | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-23182-2348/+3438
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (297 commits) Fix deletion of container registry or images returning an error The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This merge requests update the gem to v0.2.0 which contains the fix: Decrease ABC threshold to 54.28 Update VERSION to 10.2.0-pre Update CHANGELOG.md for 10.1.0 Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT` Fix the external URLs generated for online view of HTML artifacts Use title as placeholder instead of issue title for reusability Fix failure in current_settings_spec.rb Clarify the difference between project_update and project_rename URI decode Page-Title header to preserve UTF-8 characters Update Gitaly version to v0.49.0 Decrease Perceived Complexity threshold to 14 Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)" Force non diff resolved discussion to display when collapse toggled Added submodule support in multi-file editor add note about after_script being run separately Check for element before evaluate_script Merge branch 'master-i18n' into 'master' Update Prometheus gem to fix problems with other files overwriting current file ...
| | * | | | | | | | | add InputHelper rspec helper to simulate non-BMP character inputMike Greiling2017-10-172-0/+25
| | | | | | | | | | |
| * | | | | | | | | | Merge branch '39771-fix-clusters-settings-expanded-options' into 'master'Filipa Lacerda2017-11-031-6/+6
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix clusters description text collapsing away on page-load Closes #39771 See merge request gitlab-org/gitlab-ce!15177
| | * | | | | | | | | | Fix clusters description text collapsing away on page-load39771-fix-clusters-settings-expanded-optionsEric Eastwood2017-11-031-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39771 Caused by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13363
| * | | | | | | | | | | Merge branch 'issue_39176' into 'master'Douwe Maan2017-11-031-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render 404 when polling commit notes without having permissions Closes #39176 See merge request gitlab-org/gitlab-ce!15140
| | * | | | | | | | | | Render 404 when polling commit notes without having permissionsissue_39176Felipe Artur2017-11-031-1/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch '39776-remove-responsive-table-bottom-border' into 'master'Annabel Dunstone Gray2017-11-031-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove bottom-border from last responsive table row Closes #39776 See merge request gitlab-org/gitlab-ce!15179
| | * | | | | | | | | | | Remove bottom-border from last responsive table rowEric Eastwood2017-11-031-1/+4
| | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39776
| * | | | | | | | | | | Merge branch 'bvl-unlink-fixes' into 'master'Douwe Maan2017-11-037-18/+41
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes some bugs related to forked projects of which the source was deleted. Closes #39667 See merge request gitlab-org/gitlab-ce!15150
| | * | | | | | | | | | | Find the LFS-objects for a fork within a the fork networkBob Van Landuyt2017-11-031-4/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | Unlink a project from a fork network when it's source was deleted.Bob Van Landuyt2017-11-032-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to close all merge requests coming from the project within the entire fork network.
| | * | | | | | | | | | | Make sure the settings page renders when root of a fork is deletedBob Van Landuyt2017-11-034-9/+23
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'enable-scss-lint-mergeable-selector' into 'master'Annabel Dunstone Gray2017-11-0333-631/+722
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable MergeableSelector in scss-lint See merge request gitlab-org/gitlab-ce!12810
| | * | | | | | | | | | | | Enable MergeableSelector in scss-lint (for !14567)Takuya Noguchi2017-11-031-28/+31
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Enable MergeableSelector in scss-lint (for !14055)Takuya Noguchi2017-11-031-26/+26
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Enable MergeableSelector in scss-lint (for !14062)Takuya Noguchi2017-11-031-8/+2
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Enable MergeableSelector in scss-lint (for !14398)Takuya Noguchi2017-11-031-11/+11
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Enable MergeableSelector in scss-lint (for !13480)Takuya Noguchi2017-11-031-21/+17
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Enable MergeableSelector in scss-lint (for !13473)Takuya Noguchi2017-11-031-7/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Enable MergeableSelector in scss-lint (for !13600)Takuya Noguchi2017-11-031-4/+2
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Enable MergeableSelector in scss-lintTakuya Noguchi2017-11-0332-554/+661
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add system hooks user_rename and group_renameWinnie Hellmann2017-11-033-14/+50
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'sh-fix-environment-slug-generation' into 'master'Grzegorz Bizon2017-11-031-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid regenerating the ref path for the environment Closes #39752 See merge request gitlab-org/gitlab-ce!15167