summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-0211-82/+113
|\
| * Merge branch 'zj-format-chat-messages' into 'master' Kamil Trzciński2017-02-011-9/+5
| |\
| | * Fix testsZ.J. van de Weg2017-01-301-6/+2
| | * Chat Commands have presentersZ.J. van de Weg2017-01-301-10/+10
| * | Merge branch 'correct-gitlab-host-references' into 'master' Achilleas Pipinellis2017-01-311-2/+2
| |\ \
| | * | Corrected docs href'scorrect-gitlab-host-referencesLuke "Jared" Bennett2017-01-301-2/+2
| * | | Merge branch '26852-fix-slug-for-openshift' into 'master' Kamil Trzciński2017-01-311-5/+13
| |\ \ \
| | * | | Avoid repeated dashes in $CI_ENVIRONMENT_SLUGNick Thomas2017-01-231-5/+13
| * | | | Merge branch 'zj-display-error-team-fetch' into 'master' Kamil Trzciński2017-01-311-2/+2
| |\ \ \ \
| | * | | | Update #list_teams to propagate errorsZ.J. van de Weg2017-01-301-4/+4
| | * | | | Fix inconsistent return typeZ.J. van de Weg2017-01-241-2/+2
| * | | | | Improve search within group logicDmitriy Zaporozhets2017-01-301-0/+1
| * | | | | Merge branch '23634-remove-project-grouping' into 'master' Sean McGivern2017-01-305-19/+27
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Add commment to Issue, Project and MergeRequest #to_referenceOswaldo Ferreira2017-01-273-0/+3
| | * | | | Change argument name assuming its always a ProjectOswaldo Ferreira2017-01-271-2/+2
| | * | | | Present TODO's list without grouping by projectOswaldo Ferreira2017-01-272-4/+4
| | * | | | Present group and dashboard MR list without grouping by projectOswaldo Ferreira2017-01-272-18/+13
| | * | | | Refactor Project#to_reference and make full_path a keyword argumentBerna Castro2017-01-272-24/+26
| | * | | | Add the group path to the issue ID if applicableBerna Castro2017-01-271-4/+12
| * | | | | update scripts and docs to reference the newly namespaced rake taskrelative-url-assetsMike Greiling2017-01-271-1/+1
| |/ / / /
| * | | | Merge branch '27280-fix-unititalized-constant' into 'master' Robert Speicher2017-01-271-44/+51
| |\ \ \ \
| | * | | | Move ApplicationSetting DEFAULTS to `.defaults` insteadRémy Coutable2017-01-271-44/+48
| | * | | | Move a begin/rescue clause to ApplicationSetting.expireRémy Coutable2017-01-271-0/+3
| * | | | | Merge branch 'sh-fix-annotated-tags-pointing-to-blob' into 'master' Douwe Maan2017-01-271-1/+12
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix Error 500 when repositories contain annotated tags pointing to blobssh-fix-annotated-tags-pointing-to-blobStan Hu2017-01-261-1/+12
* | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-261-4/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '26068_tasklist_issue' into 'master' Sean McGivern2017-01-261-4/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Don’t count tasks that are not defined as list items correctlyJarka Kadlecova2017-01-251-4/+4
* | | | | | Use commit rather than branch, and rename to avoid confusionLin Jen-Shin2017-01-261-8/+8
* | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-2681-427/+788
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'refresh-authorizations-fork-join' into 'master' Douwe Maan2017-01-252-11/+12
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-joinYorick Peterse2017-01-252-11/+12
| * | | | | Merge branch 'backport-ee-changes-for-build-minutes' into 'master' Grzegorz Bizon2017-01-252-1/+15
| |\ \ \ \ \
| | * | | | | Remove unneeded code and fix offensesbackport-ee-changes-for-build-minutesKamil Trzcinski2017-01-251-1/+10
| | * | | | | Merge remote-tracking branch 'origin/master' into backport-ee-changes-for-bui...Kamil Trzcinski2017-01-2442-85/+139
| | |\ \ \ \ \
| | * | | | | | Backport changes introduced by https://gitlab.com/gitlab-org/gitlab-ee/merge_...Kamil Trzcinski2017-01-201-0/+5
| * | | | | | | Merge branch 'dz-nested-groups-access-improvements' into 'master' Dmitriy Zaporozhets2017-01-255-6/+49
| |\ \ \ \ \ \ \
| | * | | | | | | Add User#nested_groups and User#nested_projects methodsDmitriy Zaporozhets2017-01-254-3/+28
| | * | | | | | | Refactor Namespace code related to nested groupsDmitriy Zaporozhets2017-01-133-5/+23
| * | | | | | | | Merge branch 'no_project_notes' into 'master' Sean McGivern2017-01-255-6/+48
| |\ \ \ \ \ \ \ \
| | * | | | | | | | address commentsJarka Kadlecova2017-01-255-7/+22
| | * | | | | | | | make mentions working when project not specifiedJarka Kadlecova2017-01-182-2/+9
| | * | | | | | | | Support notes without projectJarka Kadlecova2017-01-183-4/+24
| * | | | | | | | | Merge branch 'fix_broken_diff_discussions' into 'master' Sean McGivern2017-01-251-3/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Make diff discussion more reliablefix_broken_diff_discussionsValery Sizov2016-12-301-3/+5
| * | | | | | | | | | Merge branch '26468-fix-users-sort-in-admin-area' into 'master' Douwe Maan2017-01-241-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixing sort of Users so that users who never logged in will be displayed lastPoornima M2017-01-241-2/+2
| * | | | | | | | | | | Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master' Robert Speicher2017-01-241-40/+44
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Revert "Merge branch 'revert-9cac0317' into 'master' "Grzegorz Bizon2017-01-231-40/+44
| * | | | | | | | | | | Merge branch '24923_nested_tasks' into 'master' Sean McGivern2017-01-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status