Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix/import-export-gitlab-errors' into 'master' | Rémy Coutable | 2016-06-23 | 1 | -1/+3 |
|\ | |||||
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-expo... | James Lopez | 2016-06-23 | 3 | -4/+21 |
| |\ | |||||
| * | | fix utc error | James Lopez | 2016-06-22 | 1 | -1/+3 |
* | | | Add Sidekiq queue duration to transaction metrics. | Paco Guzman | 2016-06-23 | 1 | -0/+2 |
| |/ |/| | |||||
* | | Merge branch 'fix_saml_signin' into 'master' | Robert Speicher | 2016-06-22 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix subsequent SAML sign ins | Drew Blessing | 2016-06-22 | 1 | -1/+1 |
* | | | Merge branch 'fix-external-issue-links' into 'master' | Robert Speicher | 2016-06-22 | 1 | -3/+7 |
|\ \ \ | |||||
| * | | | Handle external issues in IssueReferenceFilterfix-external-issue-links | Yorick Peterse | 2016-06-21 | 1 | -3/+7 |
* | | | | Merge branch 'master' into feature/import-export-docs | Achilleas Pipinellis | 2016-06-22 | 3 | -10/+4 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-exe... | Douwe Maan | 2016-06-22 | 1 | -0/+2 |
| |\ \ \ | |||||
| | * | | | Raise a new Gitlab::Access::AccessDeniedError when permission is not enough t... | Rémy Coutable | 2016-06-18 | 1 | -0/+2 |
| * | | | | Merge branch 'remove-banzai-pre-process' into 'master' | Robert Speicher | 2016-06-21 | 2 | -10/+2 |
| |\ \ \ \ | |||||
| | * | | | | Move pre_process into render_resultremove-banzai-pre-process | Yorick Peterse | 2016-06-21 | 2 | -10/+2 |
* | | | | | | added nice to have - rake task and some changes to docs | James Lopez | 2016-06-21 | 1 | -0/+13 |
|/ / / / / | |||||
* | | | | | Merge branch '18590-banzai-filter-relativelinkfilter-is-slow' into 'master' | Yorick Peterse | 2016-06-21 | 1 | -37/+14 |
|\ \ \ \ \ | |||||
| * | | | | | Optimize Banzai::Filter::RelativeLinkFilter | Alejandro Rodríguez | 2016-06-21 | 1 | -37/+14 |
* | | | | | | Merge branch 'fix/builds-api-nil-commit' into 'master' | Rémy Coutable | 2016-06-21 | 1 | -5/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix builds API response not including commit data | Grzegorz Bizon | 2016-06-21 | 1 | -5/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'show-image-id-on-registry-page' into 'master' | Rémy Coutable | 2016-06-21 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Show proper image ID on registry page | Kamil Trzcinski | 2016-06-21 | 1 | -0/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'ci-lfs-fetch' into 'master' | Rémy Coutable | 2016-06-21 | 3 | -6/+10 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Add test coverage to LFS fetchingci-lfs-fetch | Kamil Trzcinski | 2016-06-21 | 1 | -0/+2 |
| * | | | | | Merge remote-tracking branch 'origin/master' into ci-lfs-fetch | Kamil Trzcinski | 2016-06-21 | 72 | -260/+2136 |
| |\ \ \ \ \ | | |/ / / / | |||||
| * | | | | | Merge remote-tracking branch 'origin/master' into ci-lfs-fetch | Kamil Trzcinski | 2016-06-10 | 63 | -504/+808 |
| |\ \ \ \ \ | |||||
| * | | | | | | WIP | Kamil Trzcinski | 2016-06-03 | 3 | -6/+8 |
* | | | | | | | Merge branch '17521-gitlab-ci-yml-templates' into 'master' | Jacob Schatz | 2016-06-21 | 10 | -134/+209 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fixup! override content method | Z.J. van de Weg | 2016-06-20 | 4 | -21/+20 |
| * | | | | | | | Incorporate review | Z.J. van de Weg | 2016-06-20 | 4 | -11/+19 |
| * | | | | | | | Run rake gitlab:update_templates | Z.J. van de Weg | 2016-06-20 | 1 | -1/+1 |
| * | | | | | | | Add changelog item, fix rubocop issue | Z.J. van de Weg | 2016-06-20 | 1 | -1/+1 |
| * | | | | | | | Implement backend gitlab ci dropdown | Z.J. van de Weg | 2016-06-20 | 5 | -47/+73 |
| * | | | | | | | Refactor Gitlab::Gitignores | ZJ van de Weg | 2016-06-20 | 9 | -134/+176 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'feature/runner-lock-on-project' into 'master' | Rémy Coutable | 2016-06-21 | 3 | -9/+13 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr... | Lin Jen-Shin | 2016-06-20 | 44 | -123/+1504 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr... | Lin Jen-Shin | 2016-06-17 | 32 | -122/+542 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Return the association and check it in controller instead: | Lin Jen-Shin | 2016-06-14 | 1 | -1/+3 |
| * | | | | | | | | Merge branch 'prefer-assign_to' into feature/runner-lock-on-project | Lin Jen-Shin | 2016-06-14 | 1 | -2/+5 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Give 409 Conflict whenever the runner was already enabledprefer-assign_to | Lin Jen-Shin | 2016-06-14 | 1 | -2/+5 |
| | * | | | | | | | | Prefer Runner#assign_to instead of creating directly | Lin Jen-Shin | 2016-06-14 | 1 | -1/+1 |
| * | | | | | | | | | Merge branch 'master' into feature/runner-lock-on-project | Lin Jen-Shin | 2016-06-14 | 21 | -139/+232 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| * | | | | | | | | | Avoid enabling locked runners. Give 403 in this case | Lin Jen-Shin | 2016-06-14 | 1 | -0/+1 |
| * | | | | | | | | | Prefer attributes_for_keys so that it ignores nils | Lin Jen-Shin | 2016-06-09 | 1 | -7/+3 |
| * | | | | | | | | | WIP, try to add views for locked runners | Lin Jen-Shin | 2016-06-09 | 3 | -2/+4 |
* | | | | | | | | | | Merge branch '18760-remove-explicate-assignment-on-metrics-action' into 'mast... | Yorick Peterse | 2016-06-21 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Remove explicit Gitlab::Metrics.action assignments, are already automatic.18760-remove-explicate-assignment-on-metrics-action | Paco Guzman | 2016-06-18 | 1 | -2/+0 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'limit-email-diff-size' into 'master' | Robert Speicher | 2016-06-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | Limit push email diff sizelimit-email-diff-size | Sean McGivern | 2016-06-17 | 1 | -1/+1 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | use rails root join | James Lopez | 2016-06-20 | 1 | -1/+1 |
* | | | | | | | | fixed a couple of errors spotted in production | James Lopez | 2016-06-20 | 1 | -1/+1 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge branch 'fix-out-of-bounds-markdown-refs' into 'master' | Robert Speicher | 2016-06-18 | 2 | -1/+7 |
|\ \ \ \ \ \ \ |