summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-fix-events-update-spec' into 'master' Yorick Peterse2016-10-071-1/+1
|\
| * Fix Event#reset_project_activity updatessh-fix-events-update-specStan Hu2016-10-061-1/+1
* | Use CacheMarkdownField for notesNick Thomas2016-10-071-1/+4
* | Add markdown cache columns to the database, but don't use them yetNick Thomas2016-10-0714-0/+192
|/
* Merge branch 'new-merge-requests-commit-tab-active' into 'master' Fatih Acet2016-10-061-2/+2
|\
| * MergeRequest new form load diff asynchronouslynew-merge-requests-commit-tab-activePaco Guzman2016-10-061-2/+2
* | Merge branch 'mahcsig/gitlab-ce-17350-multi-file-commit'Rémy Coutable2016-10-061-0/+46
|\ \ | |/ |/|
| * multi-file commitMarc Siegfriedt2016-10-051-0/+46
* | Merge branch 'feature/improve-async-pipeline-processing' into 'master' Kamil Trzciński2016-10-062-8/+12
|\ \ | |/ |/|
| * Do not return false in commit status transitionfeature/improve-async-pipeline-processingGrzegorz Bizon2016-10-041-1/+1
| * Fix hipchat service specs after changes in pipelineGrzegorz Bizon2016-10-041-3/+2
| * Update order of build transition callbacksGrzegorz Bizon2016-10-041-12/+13
| * Extract updating pipeline status to async workerGrzegorz Bizon2016-10-041-4/+8
| * Use internal commit status API to check if finishedGrzegorz Bizon2016-10-041-2/+2
| * Fix async pipeline and remove unrelated changesGrzegorz Bizon2016-10-043-15/+2
| * Make pipeline processing asynchronousKamil Trzcinski2016-10-033-7/+20
* | Merge branch 'trending-caching' into 'master' Rémy Coutable2016-10-051-0/+1
|\ \
| * | Exclude system notes from Project.trendingYorick Peterse2016-10-041-0/+1
* | | Merge branch 'test-improve-gitlab-identifier' into 'master' Rémy Coutable2016-10-051-0/+5
|\ \ \
| * | | Refactor Gitlab::IdentifierYorick Peterse2016-10-051-0/+5
| |/ /
* | | Merge branch 'update-runner-information' into 'master' Rémy Coutable2016-10-051-1/+1
|\ \ \
| * | | Update runner version only when updating contacted_atKamil Trzcinski2016-10-031-1/+1
* | | | Merge branch 'all-skipped-equals-success' into 'master' Rémy Coutable2016-10-053-15/+34
|\ \ \ \
| * | | | Introduce all_state_names so that we could avoid NOT INLin Jen-Shin2016-10-052-2/+6
| * | | | Merge remote-tracking branch 'upstream/master' into all-skipped-equals-successLin Jen-Shin2016-10-0412-25/+53
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | We don't need self. there. (sorry, can't resist anymore)Lin Jen-Shin2016-10-031-1/+1
| * | | | Merge branch 'master' into all-skipped-equals-successLin Jen-Shin2016-10-0310-92/+139
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Fix tests. Check 'success' first (default status)Lin Jen-Shin2016-10-031-1/+1
| * | | | Add test for CommitStatus.exclude_ignoredLin Jen-Shin2016-10-031-1/+0
| * | | | Remove dead codeLin Jen-Shin2016-10-031-2/+0
| * | | | Style/EmptyLinesAroundBlockBodyLin Jen-Shin2016-10-031-0/+3
| * | | | Specify 3 cases we want them to be excluded. [ci skip]Lin Jen-Shin2016-10-031-0/+1
| * | | | Rename ignored to failed_but_allowed, introduce exclude_ignoredLin Jen-Shin2016-10-033-19/+26
| * | | | Add a test for on_failure jobs in the middleLin Jen-Shin2016-10-011-0/+1
| * | | | on_failure should also be ignored, and status_sql shouldLin Jen-Shin2016-10-011-3/+9
| * | | | Or we could simply ignore skipped manual jobsLin Jen-Shin2016-09-301-1/+1
| * | | | We consider skipped = success, fixes #22598Lin Jen-Shin2016-09-301-1/+1
* | | | | Merge branch 'remove-reset-project-activity-lease' into 'master' Rémy Coutable2016-10-051-12/+7
|\ \ \ \ \
| * | | | | Remove lease from Event#reset_project_activityremove-reset-project-activity-leaseYorick Peterse2016-10-041-12/+7
| | |_|/ / | |/| | |
* | | | | Fix project deletion when feature visibility is set to privatesh-fix-project-deletion-private-visibilityStan Hu2016-10-041-1/+4
|/ / / /
* | | | Merge branch 'restrict-failed-2fa-attempts' into 'master' Rémy Coutable2016-10-041-0/+16
|\ \ \ \
| * | | | Restrict failed login attempts for users with 2FASean McGivern2016-10-041-0/+16
* | | | | Merge branch 'zj-save-environment-deployment-refs' into 'master' Kamil Trzciński2016-10-043-3/+17
|\ \ \ \ \
| * | | | | deployment refs in own folder, new method for creating refszj-save-environment-deployment-refsZ.J. van de Weg2016-10-043-3/+7
| * | | | | Update method nameZeger-Jan van de Weg2016-10-041-1/+1
| * | | | | Save a fetchable ref per deployementZ.J. van de Weg2016-10-042-2/+12
* | | | | | Merge branch 'issue_22446' into 'master' Sean McGivern2016-10-041-0/+4
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into issue_22446Sean McGivern2016-10-041-0/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Fix bug when trying to cache closed issues from external issue trackersissue_22446Felipe Artur2016-10-031-0/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'cleanup-mentionable-methods-arguments' into 'master' Douwe Maan2016-10-041-17/+10
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
View Lorry Controller Status