summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Refactor the DeleteUserWorkerNick Thomas2017-06-052-4/+2
|
* Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master'Phil Hughes2017-06-055-4/+101
|\ | | | | | | | | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master. See merge request !11478
| * Merge remote-tracking branch 'origin/master' into ↵Luke "Jared" Bennett2017-06-02145-643/+4080
| |\ | | | | | | | | | fix-realtime-edited-text-for-issues-9-3
| * | Removed unneeded newline in issuables_helper_spec and removed unneeded ↵Luke "Jared" Bennett2017-06-021-1/+0
| | | | | | | | | | | | updated_at_by variable in issuable_app_data
| * | Fixed issuables_helper_spec and added a test for issuable_app_dataLuke "Jared" Bennett2017-05-311-0/+26
| | |
| * | Remove EditableHelper and move method to IssuablesHelperLuke "Jared" Bennett2017-05-312-21/+18
| | |
| * | Correct editable_helper spec and format issuable_app_data updated_at to iso8061Luke "Jared" Bennett2017-05-311-2/+2
| | |
| * | Review changes, improve editable helper spec and add hasUpdated computer to ↵Luke "Jared" Bennett2017-05-311-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue_show app Fix builds by only merge when updated_at_by is presnse Fix issue_show app.vue hasUpdated reference to state Fix missing bracket
| * | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.Luke "Jared" Bennett2017-05-315-4/+105
| | |
* | | Merge branch '31061-26135-ci-project-slug-enviroment-variables' into 'master'Kamil Trzciński2017-06-051-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add slugified project path to CI environment variables Closes #31061 See merge request !11838
| * | | Add slugify project path to CI enviroment variablesvanadium232017-06-031-0/+1
| | | |
* | | | Merge branch 'zj-job-view-goes-real-time' into 'master'Kamil Trzciński2017-06-059-61/+272
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial implementation for real time job view Closes #31397 See merge request !11651
| * | | | Fix test failuresKamil Trzcinski2017-06-033-5/+5
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeKamil Trzcinski2017-06-0284-529/+2435
| |\ \ \ \ | | |/ / /
| * | | | Add user to BuildDetailsEntityZ.J. van de Weg2017-06-023-4/+7
| | | | | | | | | | | | | | | | | | | | Also add minor changed needed to pass review
| * | | | Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeZ.J. van de Weg2017-06-0119-15/+310
| |\ \ \ \
| * | | | | Rename build to jobZ.J. van de Weg2017-06-011-2/+2
| | | | | |
| * | | | | Incorporate reviewZ.J. van de Weg2017-05-315-8/+39
| | | | | |
| * | | | | Create PipelineDetailsEntityZ.J. van de Weg2017-05-314-67/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we have a PipelineEntity which is a bit smaller, mostly in bytes needing to send to the frontend. PipelineDetailsEntity is the default for the PipelineSerializer, limiting the changes needed. This commit also incorporates the review.
| * | | | | Initial implementation for real time job viewZ.J. van de Weg2017-05-314-11/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the needed keys and paths to a new entity, BuildDetailsEntity. Not renaming BuildEntity to BuildBasicEntity on explicit request. Most code now has test coverage, but not all. This will be added on later commits on this branch. Resolves gitlab-org/gitlab-ce#31397
* | | | | | Merge branch '30469-convdev-index' into 'master'Sean McGivern2017-06-055-14/+214
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConvDev Index Closes #30469 See merge request !11377
| * | | | | | Add Conversational Development Index page to admin panelTaurie Davis, Simon Knox and Adam Niedzielski2017-06-015-14/+214
| | | | | | |
* | | | | | | Improve user experience around slash commands in instant commentsKushal Pandya2017-06-052-37/+127
| | | | | | |
* | | | | | | Merge branch '25680-CI_ENVIRONMENT_URL' into 'master'Kamil Trzciński2017-06-055-165/+238
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `$CI_ENVIRONMENT_URL` as a job variable Closes #25680 See merge request !11695
| * | | | | | | Only deploy if environment exists; Update tests accordingly25680-CI_ENVIRONMENT_URLLin Jen-Shin2017-06-032-108/+85
| | | | | | | |
| * | | | | | | Make sure that environment was created before deployingLin Jen-Shin2017-06-021-0/+2
| | | | | | | |
| * | | | | | | CreatePipelineBuildsService would have created envLin Jen-Shin2017-06-021-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So we don't have to do it in CreateDeploymentService Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11695#note_31322649
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URLLin Jen-Shin2017-06-0220-115/+699
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (39 commits) Resolve "Improve Container Registry description" Add username parameter to gravatar URL Fix replying to a commit discussion displayed in the context of an MR Add fog-aliyun as backup storage provider Add missing specs Make sure protected can't be null; Test protected! Update session cookie key name to be unique to instance in development Just mention which GitLab version is required Fix data inconsistency issue for old artifacts by moving them to a currently used path Fix N+1 queries for non-members in comment threads Fix rubocop in spec/helpers/diff_helper_spec.rb Merge two items into one in the doc Only remove FK if it exists Maintain notes avatar at smaller breakpoint Fix pipeline schedule value name in documentation Add test for Project#protected_for? Update diff discussion position per discussion instead of per note Display Shared Runner status in Admin Dashboard Make sure we're loading the fresh variables Now secret_variables_for would return the variables ...
| * | | | | | | | Fix other use of CreateDeploymentService and makeLin Jen-Shin2017-06-022-7/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it a bit more robust against missing options, which we did guard on for some cases.
| * | | | | | | | Fix a typo: not -> noLin Jen-Shin2017-06-011-1/+1
| | | | | | | | |
| * | | | | | | | Merge all environment url methods, introduce ensure_persisted_environmentLin Jen-Shin2017-06-011-25/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make sure that we're accessing the same instance, so ending up with `env.external` = `env.external_url` shall be fine.
| * | | | | | | | split tests for expanded_environment_urlLin Jen-Shin2017-06-011-4/+25
| | | | | | | | |
| * | | | | | | | Simplify CreateDeploymentService so that it usesLin Jen-Shin2017-06-011-52/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods directly from job, avoid duplicating the works.
| * | | | | | | | Introduce ci_environment_url which would fallbackLin Jen-Shin2017-06-011-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the external_url from persisted environment, and make the other utility methods private as we don't really need to use them outside of the job.
| * | | | | | | | Just use the url from options, not saving it as a columnLin Jen-Shin2017-06-014-15/+3
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URLLin Jen-Shin2017-06-01161-924/+3525
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (251 commits) Don't match email addresses or foo@bar as user references Revert "Update GITLAB_SHELL_VERSION" Update GITLAB_SHELL_VERSION Add feature toggles through Flipper Change no_limits to limits Move includes call to scope Add GitLab Resources to University Add Documentation for GIT_CHECKOUT variable Remove entry variable Do not try to preload Commits when using Note.includes(:noteable) Ui improvements for count badges and permission badges Rename the other jobs Update jobs_spec for changes from builds_spec Introduce source to pipeline entity Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions ...
| * \ \ \ \ \ \ \ \ Merge branch 'master' into '25680-CI_ENVIRONMENT_URL'Lin Jen-Shin (godfat)2017-05-2691-732/+2499
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | | | | Pass external_url from environment if job doesn't have oneLin Jen-Shin2017-05-251-10/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update the document and add a changelog entry
| * | | | | | | | | | Add another test to make sure url would be passedLin Jen-Shin2017-05-251-0/+2
| | | | | | | | | | |
| * | | | | | | | | | Add tests for CI_ENVIRONMENT_URLLin Jen-Shin2017-05-251-6/+53
| | | | | | | | | | |
| * | | | | | | | | | Fix tests for adding environment_urlLin Jen-Shin2017-05-253-1/+11
| | | | | | | | | | |
* | | | | | | | | | | Fix LFS timeouts when trying to save large filessh-fix-lfs-from-moving-across-filesystemsStan Hu2017-06-041-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following was happening: 1. Workhorse stores an LFS file in /var/opt/gitlab/gitlab-rails/shared/lfs-objects 2. CarrierWave then renames the file to a temporary directory (e.g. /opt/gitlab/embedded/service/gitlab-rails/tmp) 3. CarrierWave then renames the file to its final location (e.g. /var/opt/gitlab/gitlab-rails/shared/lfs-objects) When the LFS upload path was on a different filesystem than the Rails installation, step 2 could take a longer than 10 seconds, at which point Workhorse would time out with "badgateway: failed after 10s: context canceled". This change makes the work path in the same root as the LFS storage path, preventing moves across filesystems. Closes #33218
* | | | | | | | | | | Merge branch '32118-new-environment-btn-copy' into 'master'Annabel Dunstone Gray2017-06-032-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32118 Make New environment empty state btn lowercase Closes #32118 See merge request !11350
| * | | | | | | | | | | 32118 Make New environment empty state btn lowercase32118-new-environment-btn-copytauriedavis2017-06-022-2/+4
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'projects-api-import-status' into 'master'Douwe Maan2017-06-021-0/+20
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose import_status in Projects API Closes #19646 See merge request !11851
| * | | | | | | | | | | Expose import_status in Projects APIRobin Bobbitt2017-06-021-0/+20
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'mabes/gitlab-ce-bypass-auto-login' into 'master'Douwe Maan2017-06-024-2/+37
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow manual bypass of auto_sign_in_with_provider Closes #3786 See merge request !11884
| * | | | | | | | | | | | Allow manual bypass of auto_sign_in_with_providermabes/gitlab-ce-bypass-auto-loginMaxime Besson2017-06-024-2/+37
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit lets a user bypass the automatic signin on the login form, in order to login with a technical (admin, etc) account Closes #3786 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | Merge branch '28694-hard-delete-user-from-api' into 'master'Douwe Maan2017-06-021-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to be hard-deleted from the API See merge request !11853
| * | | | | | | | | | | | Allow users to be hard-deleted from the APINick Thomas2017-06-021-0/+20
| | | | | | | | | | | | |
View Lorry Controller Status