Commit Graph
22882 Commits
Author SHA1 Message Date
Achilleas PipinellisandRobert Speicher a1e4867160 Merge branch 'ci/build-artifacts-documentation' into 'master'
Add basic documentation for build artifacts

/cc @axil @ayufan 

See merge request !2511
2016-01-21 14:07:50 -05:00
Achilleas PipinellisandRobert Speicher 70add6912e Merge branch 'doc_restart_gitlab' into 'master'
Add documentation on restarting GitLab

This will save as time from writing the same commands
over and over again.

See merge request !2510
2016-01-21 14:07:27 -05:00
Robert SpeicherandRobert Speicher 86420a5a6b Merge branch 'fix-permissions' into 'master'
Remove execution permissions from font assets

[ci skip]

See merge request !2082
2016-01-21 11:14:53 -05:00
Robert SpeicherandRobert Speicher fd106c7fdd Merge branch 'workhorse-path' into 'master'
Init script changes for gitlab-workhorse in 8.4

Goes with https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/31

Also bumps gitlab-workhorse to 0.6.1.

[ci skip]

See merge request !2529
2016-01-21 11:09:09 -05:00
Douwe MaanandRobert Speicher ef3bccac7e Merge branch 'fix-github-wiki-import' into 'master'
Fix import of GitHub's wiki when the repository has not been created

Fixes #12503 

See merge request !2533
2016-01-21 11:04:54 -05:00
Marin Jankovski 56adae8682 Version 8.4.0-rc3 v8.4.0-rc3 2016-01-21 14:02:29 +01:00
Robert SpeicherandRobert Speicher 0762d07e02 Merge branch 'fix-project-creation' into 'master'
Creator should be added as a master of the project on creation

Fixes #4222 

This also enable a project creator to add themselves as a master of the
project for existing repositories that were created in the meanwhile
that they don't appear as members.

See merge request !2520
2016-01-20 18:24:26 -05:00
Robert Speicher 8366dbdacf Remove Performance Monitoring from Integration docs
[ci skip]
2016-01-20 17:56:29 -05:00
Robert SpeicherandRobert Speicher 960d873989 Merge branch 'fix-github-pull-requests-import' into 'master'
Fix cross projects detection when importing GitHub pull requests

Fixes #12456

See merge request !2523
2016-01-20 17:13:55 -05:00
Achilleas PipinellisandRobert Speicher ed540c3741 Merge branch 'metrics-documentation' into 'master'
Added documentation for GitLab Metrics

This adds documentation for the metrics code I recently added.

Two notes:

* I'm referring to this feature as "GitLab Metrics" everywhere simply
  because the code resides in the `Gitlab::Metrics` namespace. A
  different name is fine, though I think just "Metrics" might be a bit
  too abstract.
* Grafana isn't covered since it's fairly straight-forward to setup
  (there's nothing really special we can cover). I think we _should_
  cover it once we start shipping it with Omnibus.

I assigned @axil since he's our technical writer/documentation guru,
feel free to re-assign if needed.

cc @sytses @axil @dzaporozhets @JobV 

See merge request !2484
2016-01-20 17:13:07 -05:00
Robert SpeicherandRobert Speicher eebb691cb6 Merge branch 'issue_3945' into 'master'
Add syntax highlighting to diff view

Closes #3945

See merge request !2109
2016-01-20 16:56:13 -05:00
Robert Speicher 6a5cd3ca41 Merge branch 'feature/check-against-rbl-only' into 'master'
Split from !2455

References #9092

See merge request !2515
2016-01-20 14:25:40 -05:00
Robert SpeicherandRobert Speicher 96f12f57fc Merge branch 'fix-error-500-with-invalid-utf8' into 'master'
Gracefully handle invalid UTF-8 sequences in Markdown links

Closes #6077

See merge request !2382
2016-01-20 14:03:58 -05:00
Robert SpeicherandRobert Speicher 645f775081 Merge branch 'sentry-integration' into 'master'
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
2016-01-20 14:01:23 -05:00
Dmitriy ZaporozhetsandRobert Speicher 84316761a6 Merge branch 'awardemoji-tooltip-shows-people-multiple-times' into 'master'
Fixes tooltip doesn't duplicate the "me" name.

Checks that "me" is not in the array of names in tooltip

![emojilist](/uploads/20b1a39cda194358f9730ec3c6b86acb/emojilist.gif)

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/7978


See merge request !2454
2016-01-20 13:56:54 -05:00
Dmitriy ZaporozhetsandRobert Speicher f3683b6172 Merge branch 'secret-shortcut-feature' into 'master'
Adds "t" as a shortcut for find file anywhere



See merge request !2507
2016-01-20 13:51:36 -05:00
Douwe MaanandRobert Speicher efb883892e Merge branch 'ci/artifacts-remove-compressed-size' into 'master'
Remove `Compressed to` column from build artifacts browser

See #10982.

See merge request !2509
2016-01-20 13:46:21 -05:00
Robert SpeicherandRobert Speicher 5f192df811 Merge branch 'adjust-unicorn-memory-limits' into 'master'
Use ENV variables for Unicorn worker killer & increase default limits

Merge request that lead to this particular merge request:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2421

[ci skip]

See merge request !2513
2016-01-20 13:45:13 -05:00
Robert Speicher d3af84afb8 Update CHANGELOG
- Add attribution for Anton Baklanov
- Remove attributions for employees

[ci skip]
2016-01-19 16:46:10 -05:00
Robert SpeicherandRobert Speicher 74a6b4b633 Merge branch 'add_email_headers' into 'master'
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
2016-01-19 16:25:21 -05:00
Dmitriy ZaporozhetsandRobert Speicher 91af0864f1 Merge branch 'star-button-fork-count-increase' into 'master'
Starring project only increases star count

This is instead of increasing star & fork count

Fixes #11396

![star-count](/uploads/9a1d569393bc051d1a019f0340eec957/star-count.gif)

cc. @jschatz1 

See merge request !2504
2016-01-19 14:18:41 -05:00
Robert SpeicherandRobert Speicher a3a008f6b2 Merge branch 'user-ldap-email' into 'master'
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
2016-01-19 14:15:52 -05:00
Grzegorz BizonandRobert Speicher 6d0bf9d08f Merge branch 'fix/artifacts-double-propagation' into 'master'
Fix double request issue in artifacts browser

This fixed problem with double propagation when clicking a link that lies inside tr with clicked event attached.

See merge request !2496
2016-01-19 12:19:05 -05:00
Douwe MaanandRobert Speicher 52124655e1 Merge branch 'fix-consider-re-assign-as-a-mention' 2016-01-19 12:12:35 -05:00
Douwe MaanandRobert Speicher 21a2942daf Merge branch 'fix-project-creation' into 'master'
Creator should be added as a master of the project on creation

Fixes: #4222

See merge request !2463
2016-01-19 12:09:25 -05:00
Douwe MaanandRobert Speicher da61b8b3b0 Merge branch 'improve-project-external-issue-trackers' into 'master'
Greatly improve external_issue_tracker performance

See 3d41133d48f6522b8755bb91b804864e8e520871 for all the details. As an aside, this commit contains a set of migrations that will introduce downtime as they add a column with a default value which in turn locks the entire table (at least on PostgreSQL).

See merge request !2498
2016-01-19 12:06:58 -05:00
Dmitriy ZaporozhetsandRobert Speicher 208008ee39 Merge branch 'browse-issues-incorrect-positioning-in-firefox-on-commit-page' into 'master'
Fix positioning issues with browse files button

Issue is that in Firefox clipboard is blocking the browse files
from moving all the way to the right.
Move clipboard up 1px into -1px to unblock "browse files"

SS from firefox:

![Screen_Shot_2016-01-18_at_4.01.58_PM](/uploads/312a5f1e55ca707081f718e2413416fb/Screen_Shot_2016-01-18_at_4.01.58_PM.png)

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/10849


See merge request !2489
2016-01-18 21:15:29 -05:00
Dmitriy ZaporozhetsandRobert Speicher aa36717fdb Merge branch 'sorting-dropdown-does-not-fit-filter-bar' into 'master'
Reduce margin to fit dropdowns

![Screen_Shot_2016-01-18_at_7.51.23_PM](/uploads/03336f86fde25d6d045742297a19751c/Screen_Shot_2016-01-18_at_7.51.23_PM.png)

Fixes #10747 

See merge request !2492
2016-01-18 21:12:12 -05:00
Grzegorz BizonandRobert Speicher 7ccccfc6d5 Merge branch 'ux/improve-artifacts-browser' into 'master'
Improve UX in build artifacts browser

This improves UX in build artifacts browser, and makes it more consistent with repository tree browser we already have.

---
Before:

![ux_artifacts_before](/uploads/9869ff74afd5e6636f0df81c7823fb6f/ux_artifacts_before.png)

---
After:

![ux_artifacts_after](/uploads/cdb68925f4489bb852fd701870e6d6a0/ux_artifacts_after.png)

---

It is easier to click on a file/directory entry now, because we don't need to click on a entry's basename (that can be really short, like `..` parent directory). We also show `Compressed to` size that indicates how much storage does this entry really consume.

Row for an entry is also highlighted on hover and we do not have Download button (clicking on a file row / file basename is enough to download a file).

Closes #10242 

See merge request !2477
2016-01-18 17:14:29 -05:00
Robert SpeicherandRobert Speicher 6c5f24f4ad Merge branch 'fix_changelog' into 'master'
Move entry `Fix: As an admin, cannot add oneself as a member to a
group/project`

The CHANGELOG entry said it was fixed in 8.2.3. However, I found
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1942 that
suggests it wasn't fixed until 8.3.0. A customer experienced this
issue on 8.2.3, still. This ultimately led to me investigating this
further.

[ci skip]

See merge request !2488
2016-01-18 17:14:04 -05:00
Robert SpeicherandRobert Speicher fe16f7b439 Merge branch 'fix/events-data-limit-for-mysql' into 'master'
Fix limit for `data` column in `events` table when using MySQL

Closes #9084 

See merge request !2486
2016-01-18 16:56:58 -05:00
Robert SpeicherandRobert Speicher 449ec2bb0e Merge branch 'update-devise' into 'master'
Update devise to version 3.5.4

Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2642

See merge request !2490
2016-01-18 16:47:30 -05:00
Robert SpeicherandRobert Speicher 6d5581743a Merge branch 'remove-leading-comma-award-emoji' into 'master'
Remove leading comma when user is the only one to award that emoji

Fixes #9073

See merge request !2450
2016-01-18 13:29:26 -05:00
Robert SpeicherandRobert Speicher 928303ce50 Merge branch 'workhorse-0.6.0' into 'master'
Use gitlab-workhorse 0.6.0

[ci skip]

See merge request !2483
2016-01-18 12:42:02 -05:00
Robert SpeicherandRobert Speicher 0b7e1e9eb2 Merge branch 'fix-gravator-default-url' into 'master'
Ensure Gravatar host looks like an actual host

Solves #10243.

I've chosen to simplify the method that extracts the host: since we
only need the host, let's get rid of the path and thus get rid of the
escaping problems!

Unit tests should ensure that most of the cases are covered.

See merge request !2482
2016-01-18 12:38:42 -05:00
Robert Speicher 99b339497a Version 8.4.0-rc2 v8.4.0-rc2 2016-01-17 23:19:29 -05:00
Dmitriy ZaporozhetsandRobert Speicher 72a8c2b336 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-17 23:14:21 -05:00
Dmitriy ZaporozhetsandRobert Speicher cd3f27b9e1 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 16:32:21 -05:00
Robert SpeicherandRobert Speicher 3a77f4d1a9 Merge branch 'abuse-autofill-message' into 'master'
Autofill abuse message text with user url. Closes #2838

See merge request !2396
2016-01-16 12:07:12 -05:00
Robert SpeicherandRobert Speicher 1c233ff5fe 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 17:50:10 -05:00
Robert SpeicherandRobert Speicher 1f1eed47fb 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 15:59:48 -05:00
Robert Speicher afda483595 Merge branch 'master' into 8-4-stable 2016-01-15 15:23:16 -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