summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/import-export-gitlab-errors' into 'master' Rémy Coutable2016-06-231-1/+3
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-expo...James Lopez2016-06-233-4/+21
| |\
| * | fix utc errorJames Lopez2016-06-221-1/+3
* | | Add Sidekiq queue duration to transaction metrics.Paco Guzman2016-06-231-0/+2
| |/ |/|
* | Merge branch 'fix_saml_signin' into 'master' Robert Speicher2016-06-221-1/+1
|\ \
| * | Fix subsequent SAML sign insDrew Blessing2016-06-221-1/+1
* | | Merge branch 'fix-external-issue-links' into 'master' Robert Speicher2016-06-221-3/+7
|\ \ \
| * | | Handle external issues in IssueReferenceFilterfix-external-issue-linksYorick Peterse2016-06-211-3/+7
* | | | Merge branch 'master' into feature/import-export-docsAchilleas Pipinellis2016-06-223-10/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-exe...Douwe Maan2016-06-221-0/+2
| |\ \ \
| | * | | Raise a new Gitlab::Access::AccessDeniedError when permission is not enough t...Rémy Coutable2016-06-181-0/+2
| * | | | Merge branch 'remove-banzai-pre-process' into 'master' Robert Speicher2016-06-212-10/+2
| |\ \ \ \
| | * | | | Move pre_process into render_resultremove-banzai-pre-processYorick Peterse2016-06-212-10/+2
* | | | | | added nice to have - rake task and some changes to docsJames Lopez2016-06-211-0/+13
|/ / / / /
* | | | | Merge branch '18590-banzai-filter-relativelinkfilter-is-slow' into 'master' Yorick Peterse2016-06-211-37/+14
|\ \ \ \ \
| * | | | | Optimize Banzai::Filter::RelativeLinkFilterAlejandro Rodríguez2016-06-211-37/+14
* | | | | | Merge branch 'fix/builds-api-nil-commit' into 'master' Rémy Coutable2016-06-211-5/+1
|\ \ \ \ \ \
| * | | | | | Fix builds API response not including commit dataGrzegorz Bizon2016-06-211-5/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'show-image-id-on-registry-page' into 'master' Rémy Coutable2016-06-211-0/+1
|\ \ \ \ \ \
| * | | | | | Show proper image ID on registry pageKamil Trzcinski2016-06-211-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'ci-lfs-fetch' into 'master' Rémy Coutable2016-06-213-6/+10
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add test coverage to LFS fetchingci-lfs-fetchKamil Trzcinski2016-06-211-0/+2
| * | | | | Merge remote-tracking branch 'origin/master' into ci-lfs-fetchKamil Trzcinski2016-06-2172-260/+2136
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merge remote-tracking branch 'origin/master' into ci-lfs-fetchKamil Trzcinski2016-06-1063-504/+808
| |\ \ \ \ \
| * | | | | | WIPKamil Trzcinski2016-06-033-6/+8
* | | | | | | Merge branch '17521-gitlab-ci-yml-templates' into 'master' Jacob Schatz2016-06-2110-134/+209
|\ \ \ \ \ \ \
| * | | | | | | fixup! override content methodZ.J. van de Weg2016-06-204-21/+20
| * | | | | | | Incorporate reviewZ.J. van de Weg2016-06-204-11/+19
| * | | | | | | Run rake gitlab:update_templatesZ.J. van de Weg2016-06-201-1/+1
| * | | | | | | Add changelog item, fix rubocop issueZ.J. van de Weg2016-06-201-1/+1
| * | | | | | | Implement backend gitlab ci dropdownZ.J. van de Weg2016-06-205-47/+73
| * | | | | | | Refactor Gitlab::GitignoresZJ van de Weg2016-06-209-134/+176
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'feature/runner-lock-on-project' into 'master' Rémy Coutable2016-06-213-9/+13
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-2044-123/+1504
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-1732-122/+542
| |\ \ \ \ \ \ \
| * | | | | | | | Return the association and check it in controller instead:Lin Jen-Shin2016-06-141-1/+3
| * | | | | | | | Merge branch 'prefer-assign_to' into feature/runner-lock-on-projectLin Jen-Shin2016-06-141-2/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Give 409 Conflict whenever the runner was already enabledprefer-assign_toLin Jen-Shin2016-06-141-2/+5
| | * | | | | | | | Prefer Runner#assign_to instead of creating directlyLin Jen-Shin2016-06-141-1/+1
| * | | | | | | | | Merge branch 'master' into feature/runner-lock-on-projectLin Jen-Shin2016-06-1421-139/+232
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| * | | | | | | | | Avoid enabling locked runners. Give 403 in this caseLin Jen-Shin2016-06-141-0/+1
| * | | | | | | | | Prefer attributes_for_keys so that it ignores nilsLin Jen-Shin2016-06-091-7/+3
| * | | | | | | | | WIP, try to add views for locked runnersLin Jen-Shin2016-06-093-2/+4
* | | | | | | | | | Merge branch '18760-remove-explicate-assignment-on-metrics-action' into 'mast...Yorick Peterse2016-06-211-2/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove explicit Gitlab::Metrics.action assignments, are already automatic.18760-remove-explicate-assignment-on-metrics-actionPaco Guzman2016-06-181-2/+0
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'limit-email-diff-size' into 'master' Robert Speicher2016-06-201-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Limit push email diff sizelimit-email-diff-sizeSean McGivern2016-06-171-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | use rails root joinJames Lopez2016-06-201-1/+1
* | | | | | | | fixed a couple of errors spotted in productionJames Lopez2016-06-201-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'fix-out-of-bounds-markdown-refs' into 'master' Robert Speicher2016-06-182-1/+7
|\ \ \ \ \ \ \