summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into 21170-cycle-analyticsTimothy Andrew2016-09-2023-141/+387
|\
| * Fix broken spec due to last_activity_at updates being throttledStan Hu2016-09-191-4/+14
| * Merge branch 'throttle-last-activity-at' into 'master' Rémy Coutable2016-09-191-3/+14
| |\
| | * Restrict last_activity_at updates to one per hourYorick Peterse2016-09-191-3/+14
| * | Merge branch 'per-build-token-without-lfs' into 'master' Rémy Coutable2016-09-192-18/+18
| |\ \
| | * \ Merge branch 'master' into per-build-tokenKamil Trzcinski2016-09-198-12/+40
| | |\ \ | | | |/
| | * | Don't leak build tokens in build logsKamil Trzcinski2016-09-191-6/+10
| | * | Improve code commentsKamil Trzcinski2016-09-161-1/+1
| | * | Merge remote-tracking branch 'origin/lfs-support-for-ssh' into per-build-tokenKamil Trzcinski2016-09-152-11/+18
| | |\ \
| | | * | Refactor LFS token logic to use a Redis key instead of a DB field, making it ...Patricio Cano2016-09-152-7/+1
| | | * | Added LFS support to SSHPatricio Cano2016-09-152-1/+7
| | * | | Fix existing authorization specsKamil Trzcinski2016-09-151-0/+1
| | * | | Merge remote-tracking branch 'origin/master' into per-build-tokenKamil Trzcinski2016-09-156-42/+77
| | |\ \ \
| | * | | | Use a permissions of user to access all dependent projects from CI jobs (this...Kamil Trzcinski2016-09-132-12/+7
| * | | | | Merge branch 'fix/import-export-db-errors' into 'master' Rémy Coutable2016-09-191-5/+6
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | squashed - Fix DB exceptions raised importing some specific projects.James Lopez2016-09-191-5/+6
| * | | | | Cleanup changesKamil Trzcinski2016-09-191-12/+1
| * | | | | Update support for dynamic environmentsKamil Trzcinski2016-09-191-1/+1
| * | | | | Properly create deployment using all possible optionsKamil Trzcinski2016-09-191-7/+8
| * | | | | Add support for dynamic environmentsKamil Trzcinski2016-09-193-2/+27
| |/ / / /
| * | | | Return created statusKamil Trzcinski2016-09-181-1/+1
| * | | | Merge branch '22246-actionview-template-error-undefined-method-each-for-nil-n...Stan Hu2016-09-161-1/+1
| |\ \ \ \
| | * | | | MergeRequest#environments now returns an empty array when diff_head_commit is...22246-actionview-template-error-undefined-method-each-for-nil-nilclassRémy Coutable2016-09-161-1/+1
| | | |_|/ | | |/| |
| * | | | Merge branch 'group-specific-lfs-settings' into 'master' Rémy Coutable2016-09-163-3/+14
| |\ \ \ \
| | * | | | Improved helper methods, better flow for `project.lfs_enabled?`, and UI fixes.Patricio Cano2016-09-151-4/+0
| | * | | | Added group-specific setting for LFS.Patricio Cano2016-09-153-3/+18
| | |/ / /
| * | | | Merge branch '20870-secret-variables-sorted-by-key' into 'master' Rémy Coutable2016-09-161-2/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Sort secret variables by key (fix #20870)Diego Souza2016-09-091-2/+4
| * | | | Merge branch 'group-similar' into 'master' Rémy Coutable2016-09-151-0/+8
| |\ \ \ \
| | * | | | Add grouping testsKamil Trzcinski2016-09-141-1/+5
| | * | | | Group similar buildsKamil Trzcinski2016-09-071-0/+4
| * | | | | Merge branch 'fix-multiple-pipeline-events' into 'master' 22202-similar-code-found-in-defn-mass-108-in-lib-gitlab-diff-position_tracer-rb-98-lib-gitlab-diff-position_tracer-rb-119Rémy Coutable2016-09-152-11/+10
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Fix Commit#status, feedback:fix-multiple-pipeline-eventsLin Jen-Shin2016-09-142-2/+2
| | * | | | should show the status of the latest oneLin Jen-Shin2016-09-121-1/+1
| | * | | | Revert "reload instead, so that we don't have to change order"Lin Jen-Shin2016-09-121-11/+4
| | * | | | reload instead, so that we don't have to change orderLin Jen-Shin2016-09-121-4/+11
| | * | | | Fix test (credits to Kamil)Lin Jen-Shin2016-09-121-3/+4
| | * | | | Fix the ordering of transition callbacks:Lin Jen-Shin2016-09-121-7/+5
| | | |_|/ | | |/| |
| * | | | Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhqRémy Coutable2016-09-141-8/+25
| |\ \ \ \
| | * \ \ \ Merge branch '21650-only-active-users-can-be-members' into 'master' Douwe Maan2016-09-141-8/+25
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Exclude some pending or inactivated rows in Member scopesNick Thomas2016-09-081-8/+25
| | | | |/ | | | |/|
| * | | | Merge branch 'update-gitlab-git' into 'master' Douwe Maan2016-09-141-0/+12
| |\ \ \ \
| | * | | | Handle encoding in non-binary Blob instancesupdate-gitlab-gitYorick Peterse2016-09-141-0/+12
| * | | | | Backport search_helper changes from EEbackport_to_search_helper_from_eeValery Sizov2016-09-141-32/+1
| * | | | | Merge branch 'pushes-since-gc-redis' into 'master' 19600-artifacts-show-up-in-interface-as-expired-immediately-although-configured-as-1-month-or-4-weeksRobert Speicher2016-09-131-0/+16
| |\ \ \ \ \
| | * | | | | Move pushes_since_gc to Redispushes-since-gc-redisYorick Peterse2016-09-131-0/+16
| | |/ / / /
| * | | | | Change method name to #reopenable?Katarzyna Kobierska2016-09-131-2/+3
| * | | | | Add #can_reopen? and testsKatarzyna Kobierska2016-09-131-3/+1
| * | | | | Add methodKatarzyna Kobierska2016-09-131-0/+7
| * | | | | Add #closed_without_source_project?Katarzyna Kobierska2016-09-131-1/+5