summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Fix memory and performance issues in Karma test suiteMike Greiling2018-05-011-11/+1
|
* Merge branch 'dm-commit-trailer-without-gravatar' into 'master'Robert Speicher2018-05-014-151/+169
|\ | | | | | | | | | | | | Fix commit trailer rendering when Gravatar is disabled Closes #45633 See merge request gitlab-org/gitlab-ce!18586
| * Fix commit trailer rendering when Gravatar is disabledDouwe Maan2018-04-254-151/+169
| |
* | Merge branch 'osw-use-cached-highlighted-content-for-discussions' into 'master'Douwe Maan2018-05-011-5/+28
|\ \ | | | | | | | | | | | | | | | | | | Use persisted diff data instead fetching Git on discussions Closes #44052 See merge request gitlab-org/gitlab-ce!18657
| * | Use persisted diff data instead fetching Git on discussionsOswaldo Ferreira2018-04-301-5/+28
| | | | | | | | | | | | Today, when fetching diffs of a note, we always go to Gitaly in order to diff between commits and return the diff of each discussion note. With this change we avoid doing that for notes on the "current version" of the MR.
* | | Merge branch 'helm-add-alpine-mirrors' into 'master'Kamil Trzciński2018-05-014-72/+51
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add alpine mirrors while operating on k8s cluster Closes gitlab-ee#4922 See merge request gitlab-org/gitlab-ce!18651
| * | | Add alpine mirrors while operating on k8s clusterAlessio Caiazza2018-04-304-72/+51
| | | |
* | | | Merge request and commit discussions APIJan Provaznik2018-05-015-7/+198
| | | |
* | | | Merge branch 'jej/exclude-group-saml-buttons' into 'master'Douwe Maan2018-05-011-0/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | [CE] Exclude LDAP from OmniauthCallbackController base methods See merge request gitlab-org/gitlab-ce!18619
| * | | | Exclude LDAP from OmniauthCallbackController base methodsJames Edwards-Jones2018-04-301-0/+24
| | | | |
* | | | | show only groups an admin is a member of in dashboards/gropsRoger Rüttimann2018-05-012-31/+75
| | | | |
* | | | | Fix spec/features/projects/issues/user_toggles_subscription_spec.rbblackst0ne2018-05-011-4/+4
| | | | |
* | | | | Merge branch '10-7-security_issue_42029' into 'security-10-7'Phil Hughes2018-04-302-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Sanitize user name to avoid XSS attacks See merge request gitlab/gitlabhq!2373
* | | | | Merge branch 'security-45689-fix-archive-cache-bug' into 'security-10-7'Douwe Maan2018-04-302-55/+100
| | | | | | | | | | | | | | | | | | | | | | | | | Serve archive requests with the correct file in all cases (10.7) See merge request gitlab/gitlabhq!2376
* | | | | Merge branch 'bvl-fix-openid-redirect' into 'master'Douwe Maan2018-04-301-0/+9
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Skip `authenticate_user!` for Doorkeeper controllers Closes #44639 See merge request gitlab-org/gitlab-ce!18599
| * | | | Define custom base controller for DoorkeeperBob Van Landuyt2018-04-301-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we only need the `can?` view helpers there, it's better to include those in a separate controller. If we inherit from `ApplicationController` we also need to deal with authentication, that needs to be done in some, but not all doorkeeper controllers.
* | | | | Merge branch '45481-sane-pages-artifacts' into 'master'Kamil Trzciński2018-04-301-42/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't automatically remove artifacts for pages jobs after pages:deploy has run Closes #45481 See merge request gitlab-org/gitlab-ce!18628
| * | | | | Don't automatically remove artifacts for pages jobs after pages:deploy has runNick Thomas2018-04-271-42/+9
| | | | | |
* | | | | | Merge branch 'fix-namespaceless-project-destroy-worker-specs' into 'master'Douwe Maan2018-04-301-9/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes namespaceless project destroy worker spec not depend on a specific migration version See merge request gitlab-org/gitlab-ce!18650
| * | | | | | Makes namespaceless project destroy worker spec not depend on a specific ↵Tiago Botelho2018-04-301-9/+6
| | |/ / / / | |/| | | | | | | | | | | | | | | | migration version
* | | | | | Merge branch 'add-jwt-strategy-to-gitlab-suite' into 'master'Douwe Maan2018-04-301-0/+87
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite See merge request gitlab-org/gitlab-ce!18580
| * | | | | Adds spec for omni_auth jwt strategyTiago Botelho2018-04-261-0/+87
| | | | | |
* | | | | | Merge branch '45572-members-invitations-scheduled-before-commit' into 'master'Douwe Maan2018-04-307-144/+131
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Members invitations scheduled before commit" Closes #45572 See merge request gitlab-org/gitlab-ce!18538
| * | | | | | Ensure member notifications are sent after the member actual creation/update ↵Rémy Coutable2018-04-267-144/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the DB Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'move-notification-service-calls-to-sidekiq' into 'master'Douwe Maan2018-04-303-5/+85
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move NotificationService calls to Sidekiq Closes #43106 See merge request gitlab-org/gitlab-ce!18535
| * | | | | | Move NotificationService calls to SidekiqSean McGivern2018-04-253-5/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NotificationService has to do quite a lot of work to calculate the recipients for an email. Where possible, we should try to avoid doing this in an HTTP request, because the mail are sent by Sidekiq anyway, so there's no need to schedule those emails immediately. This commit creates a generic Sidekiq worker that uses Global ID to serialise and deserialise its arguments, then forwards them to the NotificationService. The NotificationService gains an `#async` method, so you can replace: notification_service.new_issue(issue, current_user) With: notification_service.async.new_issue(issue, current_user) And have everything else work as normal, except that calculating the recipients will be done by Sidekiq, which will then schedule further Sidekiq jobs to send each email.
* | | | | | | Merge branch 'jramsay-44880-filter-pipelines-by-sha' into 'master'Kamil Trzciński2018-04-291-0/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sha filter to list pipelines Closes #44880 See merge request gitlab-org/gitlab-ce!18125
| * | | | | | | Add sha filter to list pipelinesJames Ramsay2018-04-271-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To find the pipeline for a specific sha requires scanning the list of all pipelines for a ref that contains the sha. This makes it hard to find the pipeline id needed to access a trace for a specific job run in the pipeline using the API.
* | | | | | | | Remove IDE image upload specPhil Hughes2018-04-271-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/45045
* | | | | | | | Merge branch 'jivl-revert-system-notes-can-be-confusing' into 'master'Nick Thomas2018-04-271-7/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove comma from the time system notes See merge request gitlab-org/gitlab-ce!18593
| * | | | | | | | Remove comma from the time system notesJose2018-04-251-7/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'zj-repository-exist-mandatory' into 'master'Nick Thomas2018-04-271-13/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repository#exists? can only be queried with Gitaly Closes gitaly#314 See merge request gitlab-org/gitlab-ce!18567
| * | | | | | | | | Repository#exists? can only be queried with GitalyZeger-Jan van de Weg2018-04-251-13/+3
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Has been in opt out for 5 months, and within GitLab been in production for longer than that. No code needs to be migrated as this is implemented in GoLang over at Gitaly. Closes https://gitlab.com/gitlab-org/gitaly/issues/314
* | | | | | | | | Add gitlab-pages admin ping rake taskJacob Vosmaer (GitLab)2018-04-271-0/+172
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Clear refresh interval when MRWidgetFailedToMerge component is destroyedWinnie Hellmann2018-04-261-12/+34
| |_|/ / / / / |/| | | | | |
* | | | | | | Reset milestone filter when clicking "Any Milestone" in dashboardWinnie Hellmann2018-04-261-13/+36
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceNick Thomas2018-04-2682-388/+670
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'ide-temp-file-folder-fixes' into 'master'Filipa Lacerda2018-04-264-18/+90
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bugs with IDE new directory Closes #44838 See merge request gitlab-org/gitlab-ce!18274
| | * \ \ \ \ \ Merge branch 'master' into ide-temp-file-folder-fixesPhil Hughes2018-04-25212-628/+2028
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | * | | | | | Merge branch 'master' into ide-temp-file-folder-fixesPhil Hughes2018-04-2326-112/+441
| | |\ \ \ \ \ \
| | * | | | | | | added line height to label in modalPhil Hughes2018-04-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed spec because of object key change
| | * | | | | | | fixed failing commit actions specPhil Hughes2018-04-191-1/+0
| | | | | | | | |
| | * | | | | | | Merge branch 'master' into ide-temp-file-folder-fixesPhil Hughes2018-04-1943-316/+1289
| | |\ \ \ \ \ \ \
| | * | | | | | | | added spec to new file dropdownPhil Hughes2018-04-191-6/+16
| | | | | | | | | |
| | * | | | | | | | fixed modal_specPhil Hughes2018-04-181-11/+3
| | | | | | | | | |
| | * | | | | | | | Fixed bugs with IDE new directoryPhil Hughes2018-04-182-3/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #44838
| * | | | | | | | | Merge branch 'performance/gb/improve-pipeline-creation-service' into 'master'Kamil Trzciński2018-04-261-7/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve pipeline creation service performance Closes #37987 See merge request gitlab-org/gitlab-ce!18582
| | * | | | | | | | Do not save associated records for pipeline builds twiceGrzegorz Bizon2018-04-251-7/+2
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'zj-storage-path-deprecation' into 'master'Douwe Maan2018-04-2523-110/+115
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Legacy disk path refactor Closes gitaly#1111 See merge request gitlab-org/gitlab-ce!18364
| | * | | | | | | Gitlab::Shell works on shard name, not pathZeger-Jan van de Weg2018-04-2523-110/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Direct disk access is done through Gitaly now, so the legacy path was deprecated. This path was used in Gitlab::Shell however. This required the refactoring in this commit. Added is the removal of direct path access on the project model, as that lookup wasn't needed anymore is most cases. Closes https://gitlab.com/gitlab-org/gitaly/issues/1111