1. 20 Jan, 2016 2 commits
  2. 19 Jan, 2016 1 commit
  3. 18 Jan, 2016 14 commits
  4. 17 Jan, 2016 2 commits
  5. 16 Jan, 2016 6 commits
  6. 15 Jan, 2016 15 commits
    • Achilleas Pipinellis's avatar
      Merge branch 'saml-ts' into 'master' · 50984c13
      Achilleas Pipinellis authored
      Added advanced SAML troubleshooting
      
      /cc @dblessing @balameb
      
      See merge request !2456
      50984c13
    • Robert Speicher's avatar
      Merge branch 'rs-silence-statemachine-in-cron' into 'master' · 714ae482
      Robert Speicher authored
      Prevent StateMachine warnings from outputting during a cron task
      
      [ci skip]
      
      Closes #5931
      
      See merge request !2458
      714ae482
    • Robert Speicher's avatar
      Prevent StateMachine warnings from outputting during a cron task · e8785ded
      Robert Speicher authored
      [ci skip]
      
      Closes #5931
      e8785ded
    • Achilleas Pipinellis's avatar
    • Patricio Cano's avatar
      Added advanced SAML troubleshooting · db66b12b
      Patricio Cano authored
      db66b12b
    • Robert Speicher's avatar
      Merge branch 'fix-autocomplete-new-issues' into 'master' · 8a028cf3
      Robert Speicher authored
      Fix autocomplete for new issues/MRs/snippets
      
      Fixes gitlab-org/gitlab-ce#8067
      
      See merge request !2446
      8a028cf3
    • Jacob Schatz's avatar
      Fixes issue where firefox does not delete message after comment submit · 604a811f
      Jacob Schatz authored
      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
      604a811f
    • Jacob Schatz's avatar
      Merge branch 'fix-alignment-issue' into 'master' · d04eadf8
      Jacob Schatz authored
      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
      d04eadf8
    • Douwe Maan's avatar
      Merge branch 'ci/build_dependencies' into 'master' · c19795df
      Douwe Maan authored
      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
      c19795df
    • Douwe Maan's avatar
      Merge branch 'feature/allow-artifacts-for-reporters' into 'master' · 57d8faf6
      Douwe Maan authored
      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
      57d8faf6
    • Jacob Vosmaer's avatar
      Merge branch 'no-mail-during-dev-bootstrap' into 'master' · 5cb321c8
      Jacob Vosmaer authored
      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
      5cb321c8
    • Rémy Coutable's avatar
      ef3d5a27
    • Kamil Trzcinski's avatar
      1ce76636
    • Jacob Vosmaer's avatar
      Merge branch 'simplify-procfile' into 'master' · aeb5ef20
      Jacob Vosmaer authored
      Simplify Procfile
      
      These changes are meant to make development easier.
      
      [ci skip]
      
      See merge request !2429
      aeb5ef20
    • Drew Blessing's avatar
      Merge branch 'fixKerberosSignUp' into 'master' · 20106834
      Drew Blessing authored
      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
      20106834