summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Add Application Setting to configure default Repository Path for new projectsshards-configAlejandro Rodríguez2016-06-292-0/+6
* Refactor repository paths handling to allow multiple git mount pointsAlejandro Rodríguez2016-06-294-46/+75
* Merge branch 'rubocop/enable-space-after-cops' into 'master' Robert Speicher2016-06-294-5/+5
|\
| * Enable Style/SpaceAfterComma Rubocop coprubocop/enable-space-after-copsGrzegorz Bizon2016-06-294-5/+5
* | Merge branch '14669-bugzilla-integration' into 'master' Rémy Coutable2016-06-294-3/+27
|\ \
| * | Removed redudant methods implemented by parent classTim2016-06-292-15/+0
| * | Set field defaults to be the same as IssueTrackerServiceTim2016-06-291-3/+3
| * | Added Bugzilla as external issue tracker optionTim2016-06-293-0/+39
| |/
* | Merge branch '18663-avoid-extra-yaml-serializations' into 'master' Yorick Peterse2016-06-291-10/+37
|\ \
| * | Use update_columns to by_pass all the dirty code on active_recordPaco Guzman2016-06-291-10/+37
| |/
* | Reduce overhead and optimize ProjectTeam#max_member_access performanceStan Hu2016-06-292-12/+3
|/
* Merge branch 'zj-workhorse-format-patch' into 'master' Robert Speicher2016-06-291-7/+0
|\
| * Workhorse to serve email diffsZ.J. van de Weg2016-06-281-7/+0
* | Merge branch 'display-deleted-ref-in-events' into 'master' Rémy Coutable2016-06-281-1/+1
|\ \
| * | Display last commit of deleted branch in push events (!4699)winniehell2016-06-281-1/+1
* | | Merge branch 'fix/attr-encrypted-issue' into 'master' Rémy Coutable2016-06-283-0/+3
|\ \ \
| * | | add missing attribute to attr_encrypted so it is fully backwards-compatibleJames Lopez2016-06-283-0/+3
* | | | Merge branch 'feature/custom-highlighting' into 'master' Rémy Coutable2016-06-282-0/+10
|\ \ \ \ | |/ / / |/| | |
| * | | move the path alias to a more appropriate locationhttp://jneen.net/2016-06-271-5/+5
| * | | add an alias for Snippet#pathhttp://jneen.net/2016-06-271-0/+6
| * | | add custom highlighting via .gitattributeshttp://jneen.net/2016-06-271-0/+4
* | | | Merge remote-tracking branch 'dev/master'Robert Speicher2016-06-273-4/+13
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'fix-18997' into 'master' Robert Speicher2016-06-271-1/+10
| |\ \ \
| | * | | Fix visibility of private project snippets for members when searchingDouglas Barbosa Alexandre2016-06-221-4/+10
| | * | | Fix internal snippets can be searched by anyoneDouglas Barbosa Alexandre2016-06-221-1/+4
| * | | | Merge branch '19102-fix' into 'master' Robert Speicher2016-06-272-3/+3
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix an information disclosure when requesting access to a group containing pr...Rémy Coutable2016-06-242-3/+3
| | | |/ | | |/|
* | | | Merge branch 'issue_18398' into 'master' Douwe Maan2016-06-271-0/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Check for conflict with wiki projects when creating a new project.issue_18398Ruben Davila2016-06-271-0/+11
* | | | Add support for "skip ci" tooSimon Welsh2016-06-251-1/+1
* | | | Allow "ci skip" to be in any caseSimon Welsh2016-06-251-1/+1
|/ / /
* | | Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_mer...19035-fix-merge-issueRémy Coutable2016-06-241-4/+4
* | | Support for rendering/redacting multiple documentsYorick Peterse2016-06-241-0/+4
|/ /
* | Merge branch 'optimize-award-emoji' into 'master' Yorick Peterse2016-06-233-10/+22
|\ \
| * | Preload notes/discussions associations (award_emoji: :user)optimize-award-emojiPaco Guzman2016-06-234-12/+24
| * | Eager load award emoji on notesZ.J. van de Weg2016-06-232-2/+2
* | | Merge branch '18569-fix-diff-note-position' into 'master' Robert Speicher2016-06-231-1/+1
|\ \ \ | |/ / |/| |
| * | Restore old behavior around diff notes to outdated discussionsDouwe Maan2016-06-221-1/+1
| |/
* | Merge branch 'issue_14563' into 'master' Rémy Coutable2016-06-231-1/+1
|\ \
| * | Fix user creation with stronger minimum password requirements:qNathan Bush2016-06-231-1/+1
* | | Improve performance of searching tags by name by using a memorized tag array18924-gitlab-ce-tags-page-is-not-working-502-read-timeoutAlejandro Rodríguez2016-06-231-1/+1
* | | Merge branch 'fix-404-for-pipelines' into 'master' Rémy Coutable2016-06-231-1/+2
|\ \ \ | |/ / |/| |
| * | Fix 404 for pipelinesKamil Trzcinski2016-06-231-1/+2
* | | Merge branch '18915-pagination-with-priority-sort-repeats-results' into 'mast...Rémy Coutable2016-06-231-9/+12
|\ \ \ | |/ / |/| |
| * | Fix pagination on sorts with lots of tiesSean McGivern2016-06-231-9/+12
| |/
* | fixed pipeline notes issueJames Lopez2016-06-231-0/+13
|/
* Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-exe...Douwe Maan2016-06-223-30/+1
|\
| * New Members::DestroyServiceRémy Coutable2016-06-183-30/+1
* | Merge branch '18590-banzai-filter-relativelinkfilter-is-slow' into 'master' Yorick Peterse2016-06-211-0/+26
|\ \
| * | Optimize Banzai::Filter::RelativeLinkFilterAlejandro Rodríguez2016-06-211-0/+26