summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* removing last chunk of MR ajax changes, rest will be in another MRJacob Schatz2016-01-121-0/+10
* fixes conflictsJacob Schatz2016-01-1152-233/+437
|\
| * Merge branch 'group-issues-sorting' into 'master' Dmitriy Zaporozhets2016-01-113-2/+7
| |\
| | * Removed ORDER BY in "of_group" scopesgroup-issues-sortingYorick Peterse2016-01-072-2/+4
| | * Don't pluck IDs when getting issues/MRs per groupYorick Peterse2016-01-072-2/+2
| | * Sort by ID when sorting using "Recently created"Yorick Peterse2016-01-071-0/+3
| * | Before project save ensure that a runners_token existsStan Hu2016-01-101-0/+1
| * | Fix Error 500 when visiting build page of project with nil runners_tokenStan Hu2016-01-102-5/+7
| * | Merge branch 'fix_jira_shortterm' into 'master' Robert Speicher2016-01-101-0/+3
| |\ \
| | * | Do not call API if there is no API URLDrew Blessing2016-01-071-0/+3
| * | | Merge branch 'suppress-allow-failure-builds' into 'master' Stan Hu2016-01-081-1/+5
| |\ \ \
| | * | | Suppress e-mails on failed builds if allow_failure is setStan Hu2016-01-071-1/+5
| * | | | Merge branch 'docs_project_services' into 'master' Achilleas Pipinellis2016-01-081-6/+1
| |\ \ \ \
| | * | | | Remove useless assignment to variableAchilleas Pipinellis2016-01-081-1/+1
| | * | | | Remove reference to EE from JIRA service modelAchilleas Pipinellis2016-01-081-5/+0
| * | | | | Merge branch 'accept-2xx-status-codes-for-webhooks' into 'master' Dmitriy Zaporozhets2016-01-081-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Accept 2xx status codes for successful Web hook triggersStan Hu2016-01-071-1/+1
| | | |_|/ | | |/| |
| * | | | Add two custom Date/Time conversion formatsRobert Speicher2016-01-072-4/+4
| * | | | Remove stamp gemRobert Speicher2016-01-072-4/+4
| | |_|/ | |/| |
| * | | Merge branch 'milestone-ref' into 'master' Robert Speicher2016-01-071-0/+22
| |\ \ \ | | |_|/ | |/| |
| | * | Milestone reference is a Markdown linkmilestone-refDouwe Maan2016-01-071-1/+5
| | * | Merge branch 'master' into milestone-refDouwe Maan2016-01-064-50/+85
| | |\ \
| | * | | Remove icon from milestone reference.Douwe Maan2016-01-051-1/+1
| | * | | Merge branch 'master' into milestone-refDouwe Maan2016-01-0511-35/+117
| | |\ \ \
| | * \ \ \ Merge branch 'master' into milestone-refDouwe Maan2015-12-251-26/+33
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into milestone-refDouwe Maan2015-12-245-38/+67
| | |\ \ \ \ \
| | * | | | | | Render milestone links as referencesDouwe Maan2015-12-241-0/+18
| * | | | | | | Merge branch 'annotate-models-20160105' into 'master' Dmitriy Zaporozhets2016-01-0741-119/+176
| |\ \ \ \ \ \ \
| | * | | | | | | Annotate modelsStan Hu2016-01-0641-119/+176
| * | | | | | | | Add support for ref and path to commits filteringDmitriy Zaporozhets2016-01-071-9/+12
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-071-0/+5
| * | | | | | | Merge branch 'merge-when-build-succeeds-unchecked' into 'master' Robert Speicher2016-01-061-5/+11
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-uncheckedDouwe Maan2016-01-064-50/+85
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | Get "Merge when build succeeds" to work when commits were pushed to MR target...Douwe Maan2016-01-051-5/+11
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'fix-banzai-cache' into 'master' Robert Speicher2016-01-061-2/+5
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Fix mentionable reference extraction caching.Douwe Maan2016-01-061-2/+5
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'fix/project-destroy-callbacks' into 'master' Douwe Maan2016-01-061-4/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix project destroy callbackfix/project-destroy-callbacksGrzegorz Bizon2016-01-051-4/+2
| * | | | | | Merge branch 'validate-readme-format' into 'master'Robert Speicher2016-01-051-8/+6
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Validate README format before displayingDouglas Barbosa Alexandre2016-01-051-8/+6
| * | | | | | Merge branch 'mikew1/gitlab-ce-better-asana-refs' into 'master' Douwe Maan2016-01-051-42/+40
| |\ \ \ \ \ \
| | * | | | | | Don't log backtrace in Asana servicemikew1/gitlab-ce-better-asana-refsMike Wyatt2016-01-041-1/+0
| | * | | | | | Merge remote-tracking branch 'upstream/master' into better-asana-refsMike Wyatt2015-12-3124-144/+519
| | |\ \ \ \ \ \
| | * | | | | | | Better handling of errors in Asana serviceMike Wyatt2015-12-301-9/+8
| | * | | | | | | Update Asana service documentationMike Wyatt2015-12-301-2/+2
| | * | | | | | | Restore colon in Asana commentMike Wyatt2015-12-301-1/+1
| | * | | | | | | Merge remote-tracking branch 'origin/master' into better-asana-refsMike Wyatt2015-12-304-29/+30
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fix error in Asana serviceMike Wyatt2015-12-291-1/+1
| | * | | | | | | | Update Asana service to work with Personal Access Token, lessen number of req...Mike Wyatt2015-12-291-31/+21
| | * | | | | | | | Update Asana field descriptionsMike Wyatt2015-12-291-4/+2