summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/issues-board' into 'master' Sean McGivern2016-10-131-2/+8
|\
| * Add Project::BoardLimitExcedeed error classDouglas Barbosa Alexandre2016-10-111-1/+3
| * Restrict the number of permitted boards per project to oneDouglas Barbosa Alexandre2016-10-111-1/+6
| * Allow projects to have many boardsDouglas Barbosa Alexandre2016-10-111-2/+1
* | Merge branch 'feature/cycle-analytics-2-backend' into 'master' Douwe Maan2016-10-131-4/+10
|\ \
| * | updated var name based on feedbackfeature/cycle-analytics-2-backendJames Lopez2016-10-131-2/+2
| * | Ignore deployment for statistics in Cycle Analytics, except in staging and pr...James Lopez2016-10-121-4/+10
* | | Merge branch 'feature/improve-mrwbs-and-todos-for-pipelines' into 'master' Kamil Trzciński2016-10-132-20/+13
|\ \ \
| * \ \ Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelinesfeature/improve-mrwbs-and-todos-for-pipelinesGrzegorz Bizon2016-10-121-1/+2
| |\ \ \
| * | | | Do not return from proc-closure in pipeline transitionGrzegorz Bizon2016-10-121-1/+1
| * | | | Schedule async pipeline success worker after commitGrzegorz Bizon2016-10-121-1/+2
| * | | | Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelinesGrzegorz Bizon2016-10-1224-42/+340
| |\ \ \ \
| * | | | | Process MWBS in successful pipeline asynchronouslyGrzegorz Bizon2016-10-071-1/+1
| * | | | | Rename pipeline workers to match current conventionGrzegorz Bizon2016-10-061-2/+2
| * | | | | Move MWBS trigger from build to pipeline eventGrzegorz Bizon2016-10-062-11/+9
* | | | | | Refactor straight compare diff codeDmitriy Zaporozhets2016-10-122-8/+18
* | | | | | Improve tests for merge request diff modelDmitriy Zaporozhets2016-10-121-1/+1
* | | | | | Use straight diff approach when compare merge request versionsDmitriy Zaporozhets2016-10-122-3/+9
| |_|/ / / |/| | | |
* | | | | Merge branch '20708-new-branch-is-immediatelly-tagged-as-merged' into 'master' Douwe Maan2016-10-121-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | refactors tests because of gitlab-test repository changes20708-new-branch-is-immediatelly-tagged-as-mergedtiagonbotelho2016-10-111-6/+3
| * | | | removes inconsistency regarding tagging immediately as merged once you create...tiagonbotelho2016-10-091-1/+5
* | | | | Merge branch 'api-fix-project-group-sharing' into 'security'Rémy Coutable2016-10-111-1/+1
| |_|/ / |/| | |
* | | | Make guests unable to view MRsguests_cant_see_mrsValery Sizov2016-10-111-1/+7
| |_|/ |/| |
* | | Merge branch 'sh-fix-issue-20776' into 'master' Robert Speicher2016-10-111-1/+13
|\ \ \
| * | | Fix Error 500 when viewing old merge requests with bad diff datash-fix-issue-20776Stan Hu2016-10-101-1/+13
* | | | Merge branch 'new-gitlab-users-clear_all_authentication_tokens-task' into 'ma...Robert Speicher2016-10-111-0/+5
|\ \ \ \
| * | | | Add a safeguard in User#set_projects_limitnew-gitlab-users-clear_all_authentication_tokens-taskRémy Coutable2016-10-111-0/+5
| |/ / /
* | | | Merge branch 'precalculate-trending-projects' into 'master' Robert Speicher2016-10-112-13/+38
|\ \ \ \ | |/ / / |/| | |
| * | | Precalculate trending projectsprecalculate-trending-projectsYorick Peterse2016-10-102-13/+38
| |/ /
* | | Merge branch 'fix/async-pipeline-processing-stale-data' into 'master' Kamil Trzciński2016-10-101-11/+21
|\ \ \
| * | | Check for transition loopback in commit statusfix/async-pipeline-processing-stale-dataGrzegorz Bizon2016-10-081-1/+3
| * | | Add temporary fix for race condition in MWBSGrzegorz Bizon2016-10-081-0/+3
| * | | Improve transitions and run hooks after transactionGrzegorz Bizon2016-10-081-18/+20
| * | | Fix ci pipeline processing with async jobsGrzegorz Bizon2016-10-071-14/+17
* | | | Merge branch 'namespace-validation-fixes' into 'master' Sean McGivern2016-10-101-8/+6
|\ \ \ \
| * | | | Correct namespace validation to forbid bad names #21077Will Starms2016-10-071-8/+6
| | |/ / | |/| |
* | | | Make searching for commits case insensitive.Adam Niedzielski2016-10-101-2/+4
|/ / /
* | | Merge branch 'backport-part-of-ee-744' into 'master' Robert Speicher2016-10-071-1/+6
|\ \ \
| * | | Make Member#add_user set access_level for requestersbackport-part-of-ee-744Rémy Coutable2016-10-031-1/+6
* | | | Merge branch 'mrchrisw/remove-whitelist' into 'master' Robert Speicher2016-10-071-1/+1
|\ \ \ \
| * | | | Update user whitelist reject messagemrchrisw/remove-whitelistdev-chris2016-10-071-1/+1
* | | | | 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
|\ \ \ | |/ / |/| |