Commit Graph
22856 Commits
Author SHA1 Message Date
Achilleas Pipinellis 60752b6ec8 Refactor README API documentation [ci skip] 2016-01-18 10:10:33 +01:00
Jacob Schatz 835f1961e6 Merge branch 'margin-update' into 'master'
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
2016-01-18 00:52:42 +00:00
Dmitriy Zaporozhets 513b45686e Merge branch 'hook_url_limit' into 'master'
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
2016-01-18 00:36:31 +00:00
Jacob Schatz 80be924546 Merge branch 'diff-white-line-fix' into 'master'
Removes white line when hiding diff comments in MR

Fixes #6071 

See merge request !2407
2016-01-18 00:34:17 +00:00
Dmitriy Zaporozhets 5433637d30 Merge branch 'comment-text-remains-in-text-box-after-submitting-it' into '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
2016-01-18 00:19:34 +00:00
Dmitriy Zaporozhets 26d28ea0b4 Merge branch 'rs-abuse-report-validation' into 'master'
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
2016-01-18 00:17:27 +00:00
Dmitriy Zaporozhets a6e073fa9b Merge branch 'issue-page-keeps-jumping-up' into 'master'
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
2016-01-17 17:01:35 +00:00
Robert Speicher 6754caed3c Autosize the textarea in showEditForm
[ci skip]
2016-01-16 22:17:57 -05:00
Robert Speicher d633755350 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.
2016-01-16 16:50:43 -05:00
Robert Speicher b6e1df7ad4 Merge branch 'abuse-autofill-message' into 'master'
Autofill abuse message text with user url. Closes #2838

See merge request !2396
2016-01-16 17:05:11 +00:00
Josh Frye 2d3655cd14 sanitize user supplied input. 2016-01-16 10:49:51 -05:00
Josh Frye c70ed7f2cd Autofill abuse message text with user url. Closes #2838 2016-01-16 10:47:12 -05:00
Achilleas Pipinellis 5cd2f77769 Merge branch 'github_importer' into 'master'
Add the version each feature was introduced in GitHub importer



See merge request !2457
2016-01-16 09:58:04 +00:00
Achilleas Pipinellis ed969aabdd Importing GitHub cross-repository PRs is not supported atm
[ci skip]
2016-01-16 10:55:44 +01:00
Achilleas Pipinellis 50984c13a2 Merge branch 'saml-ts' into 'master'
Added advanced SAML troubleshooting

/cc @dblessing @balameb

See merge request !2456
2016-01-15 23:54:02 +00:00
Robert Speicher 714ae482c1 Merge branch 'rs-silence-statemachine-in-cron' into 'master'
Prevent StateMachine warnings from outputting during a cron task

[ci skip]

Closes #5931

See merge request !2458
2016-01-15 22:49:16 +00:00
Robert Speicher e8785ded1e Prevent StateMachine warnings from outputting during a cron task
[ci skip]

Closes #5931
2016-01-15 17:47:56 -05:00
Achilleas Pipinellis 3fbd2b6964 Add the version each feature was introduced and remove note 2016-01-15 23:45:25 +01:00
Patricio Cano db66b12b29 Added advanced SAML troubleshooting 2016-01-15 17:02:25 -05:00
Robert Speicher 8a028cf3a2 Merge branch 'fix-autocomplete-new-issues' into 'master'
Fix autocomplete for new issues/MRs/snippets

Fixes gitlab-org/gitlab-ce#8067

See merge request !2446
2016-01-15 20:57:56 +00:00
Jacob Schatz 604a811f80 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
2016-01-15 14:06:31 -05:00
Jacob Schatz d04eadf822 Merge branch 'fix-alignment-issue' into 'master'
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
2016-01-15 16:34:48 +00:00
Douwe Maan c19795dff5 Merge branch 'ci/build_dependencies' into 'master'
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
2016-01-15 15:54:35 +00:00
Douwe Maan 57d8faf662 Merge branch 'feature/allow-artifacts-for-reporters' into 'master'
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
2016-01-15 15:53:34 +00:00
Jacob Vosmaer 5cb321c853 Merge branch 'no-mail-during-dev-bootstrap' into 'master'
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
2016-01-15 14:47:29 +00:00
Rémy Coutable ef3d5a2712 Replace strong by span for .item-title elements 2016-01-15 15:46:01 +01:00
Kamil Trzcinski 1ce766367e Change dependencies.builds to depends_on_builds 2016-01-15 15:35:33 +01:00
Jacob Vosmaer aeb5ef20cf Merge branch 'simplify-procfile' into 'master'
Simplify Procfile

These changes are meant to make development easier.

[ci skip]

See merge request !2429
2016-01-15 14:22:45 +00:00
Drew Blessing 20106834c1 Merge branch 'fixKerberosSignUp' into 'master'
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
2016-01-15 14:08:30 +00:00
Drew Blessing 4bc7d6e3c1 Merge branch 'issue_7975' into 'master'
Consider that URL can end with '/' before redirecting.

Closes #7975

See merge request !2416
2016-01-15 14:02:55 +00:00
Steffen Köhler 2444c04055 Fix signup for some OAuth providers
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.
2016-01-15 14:55:52 +01:00
Grzegorz Bizon 1558d8af6d Add Changelog entry for new permissions for build artifacts
[ci skip]
2016-01-15 14:08:56 +01:00
Grzegorz Bizon 6a504c8256 Add feature tests for permissions for build artifacts read ability 2016-01-15 13:56:43 +01:00
Grzegorz Bizon 6b2f38f39a Fix nonexistent method in artifacts controller 2016-01-15 13:48:29 +01:00
Jacob Vosmaer 4da7547b6d Don't send (fake) email during dev bootstrap
This allows you to do:

    rake dev:setup BOOTSTRAP=1

and prevent dozens of letter_opener emai popups in your browser.
2016-01-15 13:15:24 +01:00
Douwe Maan 03604b39eb Merge branch 'doc_github_import' into 'master'
Refactor GitHub importer documentation

To be merged when gitlab-org/gitlab-ce!2324 is finished.

See merge request !2390
2016-01-15 12:11:14 +00:00
Grzegorz Bizon b7bb56c7a3 Expand builds namespace for feature tests in spinach 2016-01-15 13:09:20 +01:00
Andrew JohnsonandGrzegorz Bizon f66f9e95bf Give reporters the ability to download artifacts.
Also fix a few places where page_404 should be render_404.
2016-01-15 12:01:19 +01:00
Yorick Peterse f7240e03a6 Fix autocomplete for new issues/MRs/snippets 2016-01-15 11:29:53 +01:00
Rémy Coutable 9e053decfc Remove unnecessary class 2016-01-15 11:14:33 +01:00
Jacob Vosmaer d28332cc9e Direct sidekiq boot output to log file
This behavior got lost in the previous commit.
2016-01-15 11:12:49 +01:00
Rémy Coutable a69271374d Streamline item titles to use a single class, and add back strong tags 2016-01-15 11:10:55 +01:00
Robert Speicher f093d8ccb4 Merge branch 'deleting-a-note-after-editing-another-results-in-a-javascript-error' into 'master'
Fix javascript error with deleting messages in issue or merge request

Elements searched for by jQuery no longer existed in the DOM.
Javascript was also unnecessarily complex, for using jQuery

Fixes #8109

See merge request !2442
2016-01-15 04:27:24 +00:00
Robert Speicher 041ca926e0 Update CHANGELOG
Moving 8.5 change to 8.4 since we're merging master into stable for now.

[ci skip]
2016-01-14 21:33:49 -05:00
Jacob Schatz daf60957d9 Fix javascript error with deleting messages in issue or merge request
Elements searched for by jQuery no longer existed in the DOM.
Javascript was also unnecessarily complex, for using jQuery
Fixes #8109
2016-01-14 19:09:46 -05:00
Robert Speicher 9d8926b750 Merge branch 'rs-woff2' into 'master'
Prefer custom WOFF2 fonts if the browser supports them

[ci skip]

See merge request !2443
2016-01-14 22:35:51 +00:00
Robert Speicher 6fd92ad4a9 Prefer custom WOFF2 fonts if the browser supports them
[ci skip]
2016-01-14 17:33:54 -05:00
Andriy Dyadyura 519c293e52 update 2016-01-14 23:00:25 +01:00
Kamil Trzciński 948bb655f3 Merge branch 'ci/api-triggers' into 'master'
Add triggers API

References #4264

See merge request !2286
2016-01-14 21:56:00 +00:00
Andriy Dyadyura 0f6ff0dfc3 update 2016-01-14 22:44:34 +01:00