summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch 'rs-groups-index' into 'master' Douwe Maan2016-01-261-0/+23
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the `/groups` route behave as expected The route is supposed to redirect the Groups#index request based on whether or not a user was logged in. If they are, we redirect them to their groups dashboard; if they're not, we redirect them to the public Explore page. But due to overly aggressive `before_action`s that weren't excluding (or including) the `index` action, the request always resulted in a 404, whether a user was logged in or not. Closes #12660 See merge request !2580
| * | | | Make the `/groups` route behave as expectedrs-groups-indexRobert Speicher2016-01-231-0/+23
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The route is supposed to redirect the Groups#index request based on whether or not a user was logged in. If they are, we redirect them to their groups dashboard; if they're not, we redirect them to the public Explore page. But due to overly aggressive `before_action`s that weren't excluding the `index` action, the request always resulted in a 404, whether a user was logged in or not. Closes #12660
* | | | Merge branch 'fix-import-redirect-loop' into 'master' Robert Speicher2016-01-261-0/+109
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Fix import redirect loop Fixes #11864 See merge request !2606
| * | | Fixi import redirect loopDouglas Barbosa Alexandre2016-01-251-0/+109
| | | |
* | | | Merge branch 'instrumentation-signature' into 'master' Douglas Barbosa Alexandre2016-01-261-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct arity for instrumented methods w/o args This should fix the problem of imports not working. See https://gitlab.com/gitlab-org/gitlab-ce/issues/12450#note_3380730 for the details/context of these changes. See merge request !2602
| * | | | Correct arity for instrumented methods w/o argsinstrumentation-signatureYorick Peterse2016-01-251-0/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that an instrumented method that doesn't take arguments reports an arity of 0, instead of -1. If Ruby had a proper method for finding out the required arguments of a method (e.g. Method#required_arguments) this would not have been an issue. Sadly the only two methods we have are Method#parameters and Method#arity, and both are equally painful to use. Fixes gitlab-org/gitlab-ce#12450
* | | | Merge branch 'rs-rails-security' into 'master' Robert Speicher2016-01-251-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rails, rails-html-sanitizer, and nokogiri for security fixes See https://dev.gitlab.org/gitlab/gitlabhq/issues/2643 See merge request !2603
| * | | | Add temporary monkey patch to get specs passing on 4.2.5.1Robert Speicher2016-01-251-0/+6
| |/ / /
* | | | Prioritize previewable over plain README filesprioritize-previewable-over-plain-readmesDouglas Barbosa Alexandre2016-01-251-0/+64
|/ / /
* | | Merge branch 'update-gitlab-git' into 'master' Douwe Maan2016-01-251-0/+20
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | Update gitlab_git & use new method for counting branches Corresponding gitlab_git merge request detailing some of the rationale behind this: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/62 Fixes #12418 See merge request !2535
| * | Use branch_count in Repository#has_visible_content?Yorick Peterse2016-01-211-0/+20
| | | | | | | | | | | | | | | Gitlab::Git::Repository#branch_count is a tad faster than the previous setup. See gitlab-org/gitlab_git!62 for more information.
* | | Whitelist raw "abbr" elements when parsing MarkdownBenedict Etzel2016-01-231-0/+5
| | | | | | | | | | | | Closes #12517
* | | Merge branch 'fix-comment-on-diff-ajax-loading'Dmitriy Zaporozhets2016-01-221-1/+1
|\ \ \
| * | | Fix failing specsfix-comment-on-diff-ajax-loadingRémy Coutable2016-01-211-1/+1
| | | |
* | | | Merge branch 'ci/recursive-artifacts-entries' into 'master' Robert Speicher2016-01-213-11/+29
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Add method to calculate total size of artifacts in subpath See merge request !2500
| * | | Add method that calculates total size for artifacts subfolderci/recursive-artifacts-entriesKamil Trzcinski2016-01-203-11/+29
| | | |
* | | | Merge branch 'ci/cache-key' into 'master' Douwe Maan2016-01-211-4/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added cache:key to .gitlab-ci.yml allowing to fine tune the caching The `cache:key` allows you to define the affinity mask of caching, allowing to have single cache for all jobs, or cache per-job, or per-branch, or any other way you would need: 1. Cache per-build for all branches: ``` cache: key: "$CI_BUILD_NAME" untracked: true ``` 2. Cache per-branch for all jobs: ``` cache: key: "$CI_BUILD_REF" untracked: true ``` /cc @DouweM @grzesiek @axil See merge request !2436
| * | | | Added cache:key to .gitlab-ci.yml allowing to fine tune the cachingci/cache-keyKamil Trzcinski2016-01-201-4/+21
| | |/ / | |/| |
* | | | Merge branch 'fix-github-pull-requests-import' into 'master' Robert Speicher2016-01-201-9/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cross projects detection when importing GitHub pull requests Fixes #12456 See merge request !2523
| * | | | Fix cross projects detection when importing GitHub pull requestsDouglas Barbosa Alexandre2016-01-201-9/+18
| |/ / /
* | | | Merge branch 'master' into issue_3945issue_3945Rubén Dávila2016-01-201-0/+68
|\ \ \ \ | |/ / /
| * | | Merge branch 'feature/check-against-rbl-only' into 'master'Robert Speicher2016-01-201-0/+68
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split from !2455 References #9092 See merge request !2515
| | * | | Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-onlyTomasz Maczukin2016-01-201-0/+68
| | | |/ | | |/|
* | | | Use a MR with commits.Rubén Dávila2016-01-201-1/+1
| | | |
* | | | Merge branch 'master' into issue_3945Douwe Maan2016-01-202-4/+10
|\ \ \ \ | |/ / /
| * | | Merge branch 'sentry-integration' into 'master' Robert Speicher2016-01-201-0/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sentry integration Sentry is an event logging platform primarily focused on capturing and aggregating exceptions. With this MR it will be possible to log and track exceptions from GitLab to Sentry. https://gitlab.com/gitlab-com/operations/issues/39 See merge request !2485
| | * \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jeroen Nijhof2016-01-207-4/+207
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | sentry-integration Conflicts: db/schema.rb
| | * | | Add sentry integrationJeroen Nijhof2016-01-181-0/+2
| | | | |
| * | | | Merge branch 'issue_3749' into 'master' Douwe Maan2016-01-201-4/+8
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Update Issues/MRs updated_at field when notes are generated Closes #3749 and #9130 See merge request !2493
| | * | | Fix broken specs.issue_3749Rubén Dávila2016-01-191-4/+8
| | | | |
* | | | | Update testsDouwe Maan2016-01-203-3/+3
| | | | |
* | | | | Properly handle HTML entities with inline diffsDouwe Maan2016-01-202-5/+5
| | | | |
* | | | | Merge branch 'master' into issue_3945Douwe Maan2016-01-2011-9/+248
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'add_email_headers' into 'master' Robert Speicher2016-01-191-2/+55
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added X-GitLab-... headers to emails from CI and Email On Push services Fixes #2098 This adds the 'X-GitLab-Project', 'X-GitLab-Project-Id' and 'X-GitLab-Project-Path' headers to emails from CI and Email On Push in a way that it is done currently for merge requests and issues emails. Additionally, CI emails will have 'X-GitLab-Build-Status' header with either 'fail' or 'success'. Emails from Email On Push will include 'X-Gitlab-Author' header containing the username of user who did the push. See merge request !2159
| | * | | | Added X-GitLab-... headers to emails from CI and Email On Push servicesAnton Baklanov2016-01-191-2/+55
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #2098
| * | | | | Merge branch 'user-ldap-email' into 'master' Robert Speicher2016-01-191-1/+27
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow LDAP users to change their email if it was not set by the LDAP server Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3054 See merge request !2502
| | * \ \ \ \ Merge branch 'master' into user-ldap-emailDouwe Maan2016-01-191-0/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| | * | | | | Allow LDAP users to change their email if it was not set by the LDAP serverDouwe Maan2016-01-191-1/+27
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'add-public-param-to-project-api' into 'master' Dmitriy Zaporozhets2016-01-191-0/+23
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add public params to GET /projects api. Closes #3788 See merge request !2409
| | * | | | Add specs. Adjust filter.Josh Frye2016-01-191-0/+23
| | |/ / /
| * | | | Fix creator should be added as a master of the project on creationDouglas Barbosa Alexandre2016-01-191-0/+1
| |/ / /
| * | | Merge branch 'fix-consider-re-assign-as-a-mention'Douwe Maan2016-01-191-1/+57
| |\ \ \
| | * | | This will ensure previous assignee gets an email even if his notif level is ↵fix-consider-re-assign-as-a-mentionRémy Coutable2016-01-151-0/+40
| | | | | | | | | | | | | | | | | | | | "on mention"
| | * | | Consider re-assign as a mention from a notification point of viewRémy Coutable2016-01-151-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | This will ensure new assignee gets an email even if his notif level is "on mention".
| * | | | Update build artifacts metadata fixture to 0.0.2Grzegorz Bizon2016-01-181-0/+0
| | |/ / | |/| |
| * | | Ensure Gravatar host looks like an actual hostfix-gravator-default-urlRémy Coutable2016-01-181-0/+44
| | |/ | |/|
| * | Use a more sensible message for the AbuseReport uniqueness validationrs-abuse-report-validationRobert Speicher2016-01-161-1/+1
| | | | | | | | | | | | | | | Previously it was "user has already been taken", when really we were saying the user has already been reported.
| * | Merge branch 'ci/build_dependencies' into 'master' Douwe Maan2016-01-153-4/+40
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let the CI runner know about builds that this build depends on This allows us to implement artifacts passing: runner will download artifacts from all prior builds. It will happen automatically, and always, as long as artifacts are enabled. ## The changes: This MR exposes list of prior builds in CI::API::Builds. **The API response when asking for builds** ```json { "id": 48584, "ref": "0.1.1", "tag": true, "sha": "d63117656af6ff57d99e50cc270f854691f335ad", "status": "success", "name": "pages", "token": "9dd60b4f1a439d1765357446c1084c", "stage": "test", "project_id": 479, "project_name": "test", "commands": "echo commands", "repo_url": "http://gitlab-ci-token:token@gitlab.example/group/test.git", "before_sha": "0000000000000000000000000000000000000000", "allow_git_fetch": false, "options": { "image": "docker:image", "artifacts": { "paths": [ "public" ] }, "cache": { "paths": [ "vendor" ] } }, "timeout": 3600, "variables": [ { "key": "CI_BUILD_TAG", "value": "0.1.1", "public": true } ], "dependencies": { "builds": [ { "id": 48584, "ref": "0.1.1", "tag": true, "sha": "d63117656af6ff57d99e50cc270f854691f335ad", "status": "success", "name": "build", "token": "9dd60b4f1a439d1765357446c1084c", "stage": "build", "project_id": 479, "project_name": "test", "artifacts_file": { "filename": "artifacts.zip", "size": 0 } } ] } } ``` ## How it will work? **Example:** ``` build: type: build script: - echo TEST > test_file artifacts: untracked: true rspec: type: test script: - test-my-project staging: type: deploy script: - scp test_file root@server.com: ``` **The flow:** 1. We run `build`. The `build` creates a file `test_file`. This file gets archived and send us build artifacts. 2. We run `rspec`. The `rspec` downloads build artifacts from `build`. Uses the `test_file`. 3. We run `staging`. The `staging` downloads build artifacts from `build` and `rspec`, but since the `rspec` doesn't have build artifacts we skip that build. Deploys the `test_file`. This partially implements the https://gitlab.com/gitlab-org/gitlab-ce/issues/3423. In the next release we will introduce option to configure what artifacts are received. /cc @grzesiek @DouweM @sytse @rspeicher See merge request !2437
| | * Change dependencies.builds to depends_on_buildsKamil Trzcinski2016-01-151-2/+2
| | |
| | * Let the CI runner know about builds that this build depends onci/build_dependenciesKamil Trzcinski2016-01-143-4/+40
| | | | | | | | | | | | This allows us to implement artifacts passing: runner will download artifacts from all prior builds