summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Refactor settings API documentation [ci skip]doc_refactor_settings_apiAchilleas Pipinellis2016-01-181-44/+54
|
* Merge branch 'margin-update' into 'master' Jacob Schatz2016-01-181-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | update old ![Screenshot_2016-01-14_22.46.52](/uploads/d165897a6118c4b276e6b53982077cb5/Screenshot_2016-01-14_22.46.52.png) new ![Screenshot_2016-01-14_22.46.21](/uploads/6b34cd8b1a2799506676103fcbc80450/Screenshot_2016-01-14_22.46.21.png) See merge request !2441
| * updatemargin-updateAndriy Dyadyura2016-01-141-1/+1
| |
| * updateAndriy Dyadyura2016-01-141-2/+2
| |
* | Merge branch 'hook_url_limit' into 'master' Dmitriy Zaporozhets2016-01-186-17/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Raise hook url limit 1. Up varchar url limit to 2000 chars instead 255 2. Maybe migration? 3. 255 characters - it is not enough 4. nil 5. nil See merge request !1940
| * | Raise hook url limitKirilll Zaycev2016-01-156-17/+22
| |/
* | Merge branch 'diff-white-line-fix' into 'master' Jacob Schatz2016-01-181-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Removes white line when hiding diff comments in MR Fixes #6071 See merge request !2407
| * | Removes white line when hiding diff comments in MRPhil Hughes2016-01-131-0/+1
| | | | | | | | | | | | Fixes #6071
* | | Merge branch 'comment-text-remains-in-text-box-after-submitting-it' into ↵Dmitriy Zaporozhets2016-01-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fixes issue where firefox does not delete message after comment submit Issue was **not** in the way comment was being submitted. `app/assets/javascripts/awards_handler.coffee` was throwing an error. This error was preventing any js from running after it. Fixes #1473 See merge request !2452
| * | | Fixes issue where firefox does not delete message after comment submitcomment-text-remains-in-text-box-after-submitting-itJacob Schatz2016-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue was **not** in the way comment was being submitted. `app/assets/javascripts/awards_handler.coffee` was throwing an error. This error was preventing any js from running after it. Fixes #1473
* | | | Merge branch 'rs-abuse-report-validation' into 'master' Dmitriy Zaporozhets2016-01-182-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a more sensible message for the AbuseReport uniqueness validation Previously it was "user has already been taken", when really we were saying the user has already been reported. See merge request !2461
| * | | | Use a more sensible message for the AbuseReport uniqueness validationrs-abuse-report-validationRobert Speicher2016-01-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Previously it was "user has already been taken", when really we were saying the user has already been reported.
* | | | | Merge branch 'issue-page-keeps-jumping-up' into 'master' Dmitriy Zaporozhets2016-01-173-1/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue page keeps jumping up This happens when the discussion side is smaller than the sidebar and the sidebar will need to scroll. When this happens I calculate the height of the two and see if the discussion panel is smaller and make them the same height and add a class `no-affix` which makes the sidebar relative positioning so it won't stick to the top. See merge request !2417
| * | | | | fixes scrollbar jump by making discussion the same size as the sidebar when ↵issue-page-keeps-jumping-upJacob Schatz2016-01-134-12/+40
| | | | | | | | | | | | | | | | | | | | | | | | sidebar is bigger, and not allowing affix to do fixed position on the sidebar
| * | | | | initial fixJacob Schatz2016-01-133-5/+12
| | | | | |
* | | | | | Autosize the textarea in showEditFormRobert Speicher2016-01-161-0/+1
| |/ / / / |/| | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'abuse-autofill-message' into 'master' Robert Speicher2016-01-164-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Autofill abuse message text with user url. Closes #2838 See merge request !2396
| * | | | | sanitize user supplied input.Josh Frye2016-01-162-25/+2
| | | | | |
| * | | | | Autofill abuse message text with user url. Closes #2838Josh Frye2016-01-164-1/+26
|/ / / / /
* | | | | Merge branch 'github_importer' into 'master' Achilleas Pipinellis2016-01-161-11/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the version each feature was introduced in GitHub importer See merge request !2457
| * | | | | Importing GitHub cross-repository PRs is not supported atmAchilleas Pipinellis2016-01-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Add the version each feature was introduced and remove notegithub_importerAchilleas Pipinellis2016-01-151-11/+8
| | | | | |
* | | | | | Merge branch 'saml-ts' into 'master' Achilleas Pipinellis2016-01-151-2/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added advanced SAML troubleshooting /cc @dblessing @balameb See merge request !2456
| * | | | | | Added advanced SAML troubleshootingsaml-tsPatricio Cano2016-01-151-2/+14
| |/ / / / /
* | | | | | Merge branch 'rs-silence-statemachine-in-cron' into 'master' Robert Speicher2016-01-151-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent StateMachine warnings from outputting during a cron task [ci skip] Closes #5931 See merge request !2458
| * | | | | Prevent StateMachine warnings from outputting during a cron taskRobert Speicher2016-01-151-0/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Closes #5931
* | | | | Merge branch 'fix-autocomplete-new-issues' into 'master' Robert Speicher2016-01-153-2/+3
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix autocomplete for new issues/MRs/snippets Fixes gitlab-org/gitlab-ce#8067 See merge request !2446
| * | | | Fix autocomplete for new issues/MRs/snippetsfix-autocomplete-new-issuesYorick Peterse2016-01-153-2/+3
| | | | |
* | | | | Merge branch 'fix-alignment-issue' into 'master' Jacob Schatz2016-01-1510-23/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment issues after a fix on titles weight Fixes #8102. Fixes #3956. This fixes an alignment regression introduced by !2422. Sorry about that! :/ ## Commit title alignment fixed ![Screen_Shot_2016-01-14_at_16.10.01](/uploads/8fdc08dca379bc551f5872de910c7149/Screen_Shot_2016-01-14_at_16.10.01.png) **The fact that the first row has a smaller height than the other rows was not introduced by !2422 (I've checked by reverting 818607f0 on `master`).** ## Tags name in list ![Screen_Shot_2016-01-14_at_16.10.09](/uploads/fba3978037677bb8855f374b5f38dde0/Screen_Shot_2016-01-14_at_16.10.09.png) See merge request !2431
| * | | | | Replace strong by span for .item-title elementsfix-alignment-issueRémy Coutable2016-01-155-6/+6
| | | | | |
| * | | | | Remove unnecessary classRémy Coutable2016-01-151-4/+0
| | | | | |
| * | | | | Streamline item titles to use a single class, and add back strong tagsRémy Coutable2016-01-159-20/+12
| | | | | |
| * | | | | Fix alignment issues after a fix on titles weightRémy Coutable2016-01-144-7/+6
| | | | | |
* | | | | | Merge branch 'ci/build_dependencies' into 'master' Douwe Maan2016-01-159-19/+121
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-153-25/+21
| | | | | | |
| * | | | | | Let the CI runner know about builds that this build depends onci/build_dependenciesKamil Trzcinski2016-01-149-19/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to implement artifacts passing: runner will download artifacts from all prior builds
* | | | | | | Merge branch 'feature/allow-artifacts-for-reporters' into 'master' Douwe Maan2016-01-1513-30/+88
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow access to artifacts for users with reporter role This is originally introduced by @ajohnsn in this merge request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2259 I've added and refactored specs, original commit by @ajohnsn has been cherry picked here. See merge request !2448
| * | | | | | | Add Changelog entry for new permissions for build artifactsGrzegorz Bizon2016-01-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Add feature tests for permissions for build artifacts read abilityfeature/allow-artifacts-for-reportersGrzegorz Bizon2016-01-157-12/+57
| | | | | | | |
| * | | | | | | Fix nonexistent method in artifacts controllerGrzegorz Bizon2016-01-151-1/+1
| | | | | | | |
| * | | | | | | Expand builds namespace for feature tests in spinachGrzegorz Bizon2016-01-154-15/+27
| | | | | | | |
| * | | | | | | Give reporters the ability to download artifacts.Andrew Johnson2016-01-153-4/+4
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Also fix a few places where page_404 should be render_404.
* | | | | | | Merge branch 'no-mail-during-dev-bootstrap' into 'master' Jacob Vosmaer2016-01-151-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't send (fake) email during dev bootstrap This allows you to do: rake dev:setup BOOTSTRAP=1 and prevent dozens of letter_opener email popups in your browser. In the latest GDK we automatically set BOOTSTRAP=1 during `make`. [ci skip] See merge request !2447
| * | | | | | | Don't send (fake) email during dev bootstrapno-mail-during-dev-bootstrapJacob Vosmaer2016-01-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows you to do: rake dev:setup BOOTSTRAP=1 and prevent dozens of letter_opener emai popups in your browser.
* | | | | | | | Merge branch 'simplify-procfile' into 'master' Jacob Vosmaer2016-01-153-6/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify Procfile These changes are meant to make development easier. [ci skip] See merge request !2429
| * | | | | | | | Direct sidekiq boot output to log filesimplify-procfileJacob Vosmaer2016-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This behavior got lost in the previous commit.
| * | | | | | | | Remove duplication in ProcfileJacob Vosmaer2016-01-141-2/+2
| | | | | | | | |
| * | | | | | | | Improve bin/ launchersJacob Vosmaer2016-01-142-3/+15
| |/ / / / / / /
* | | | | | | | Merge branch 'fixKerberosSignUp' into 'master' Drew Blessing2016-01-152-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix signup using kerberos kerberos only provides a username and an email, but no name. Therefore a signup fails because the name is empty. Best guess for the name is probably the username, therefore use it as name. I also created an issue for this: #5945 See merge request !2336
| * | | | | | | | Fix signup for some OAuth providersSteffen Köhler2016-01-152-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some OAuth providers (kerberos for example) only provide a username and an email, but no name. Therefore a signup fails because the name is empty. Best guess for the name is probably the username, therefore use it as name.