summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 'dz-nested-groups-improvements-3'Dmitriy Zaporozhets2017-02-142-3/+8
|\
| * Merge branch '19302-wiki-page-delete-does-not-trigger-the-webhook' into 'mast...Rémy Coutable2017-02-141-0/+4
| |\
| | * Make WikiPage comparable according to StaticModel interfaceMark Fletcher2017-02-141-0/+4
| * | Merge branch '22645-add-discussion-contribs-to-calendar' into 'master' Sean McGivern2017-02-141-3/+4
| |\ \
| | * | Add comment events to contributions calendar22645-add-discussion-contribs-to-calendarRémy Coutable2017-02-131-3/+4
* | | | Use Namespace#full_path instead of Namespace#pathDmitriy Zaporozhets2017-02-143-16/+22
|/ / /
* | | Add GFM support to nested groupsdz-nested-groups-gfm-altDmitriy Zaporozhets2017-02-132-2/+2
| |/ |/|
* | Merge branch '27480_deploy_keys_should_not_show_up_in_users_keys_list' into '...Douwe Maan2017-02-131-1/+6
|\ \
| * | Make deploy key not show in User's keys listPawel Chojnacki2017-02-131-1/+6
* | | Merge branch '24333-close-issues-with-merge-request-title-ui' into 'master' Rémy Coutable2017-02-131-2/+2
|\ \ \
| * | | Show mentioned/issues being closed from a Merge Requests titleJan Christophersen2017-02-131-2/+2
| |/ /
* | | Merge branch '27395-reduce-group-activity-sql-queries' into 'master' Yorick Peterse2017-02-131-2/+2
|\ \ \
| * | | Use preload for Event#target since it's a polymorphic association27395-reduce-group-activity-sql-queriesRémy Coutable2017-02-131-1/+1
| * | | Include :author, :project, and :target in Event.with_associationsRémy Coutable2017-02-131-1/+1
| * | | Don't instantiate AR objects in Event.in_projectsRémy Coutable2017-02-131-1/+1
| |/ /
* | | Merge branch 'dm-quick-fix-web-edit-new-lines' into 'master' Robert Speicher2017-02-131-0/+8
|\ \ \ | |_|/ |/| |
| * | Respect autocrlf setting when creating/updating file through web UIdm-quick-fix-web-edit-new-linesDouwe Maan2017-02-131-0/+8
| |/
* | Merge branch '23535-folders-in-wiki-repository' into 'master' Douwe Maan2017-02-132-1/+56
|\ \ | |/ |/|
| * Add WikiPage.unhyphenizeAlex Braha Stoll2017-01-301-1/+5
| * Merge branch 'master' into 23535-folders-in-wiki-repositoryAlex Braha Stoll2017-01-2988-453/+828
| |\
| * | Remove directories as one of the attributes of WikiDirectoryAlex Braha Stoll2016-12-311-3/+2
| * | Improve WikiPage.group_by_directoryAlex Braha Stoll2016-12-311-1/+1
| * | Change WikiPage#directoryAlex Braha Stoll2016-12-311-5/+4
| * | Remove WikiPage#full_pathAlex Braha Stoll2016-12-311-5/+0
| * | Add WikiDirectory#to_partial_pathAlex Braha Stoll2016-12-311-0/+6
| * | Add WikiPage#to_partial_pathAlex Braha Stoll2016-12-311-0/+6
| * | Change WikiPage.group_by_directory to use WikiDirectoryAlex Braha Stoll2016-12-311-4/+14
| * | Add model WikiDirectoryAlex Braha Stoll2016-12-311-0/+13
| * | Simplify WikiPage.group_by_directory by using Enumerable#group_byAlex Braha Stoll2016-12-311-9/+2
| * | Remove WikiPage.sort_by_directoryAlex Braha Stoll2016-12-311-22/+2
| * | Change WikiPage.group_by_directory to order by directory and file alphabetica...Alex Braha Stoll2016-12-311-1/+28
| * | Change WikiPage#directory to always start a directory hierarchy with '/'Alex Braha Stoll2016-12-311-2/+2
| * | Change WikiPage.group_by_directory to use WikiPage#directoryAlex Braha Stoll2016-12-311-4/+2
| * | Add component to show the full path of a wiki page when viewing its contentAlex Braha Stoll2016-12-311-0/+11
| * | Remove WikiPage.add_to_directoryAlex Braha Stoll2016-12-311-8/+0
| * | Refactor WikiPage.group_by_directoryAlex Braha Stoll2016-12-311-9/+6
| * | Show directory hierarchy when listing wiki pagesAlex Braha Stoll2016-12-311-0/+25
* | | Merge branch 'make-rubocop-happy-again' into 'master'Rémy Coutable2017-02-131-1/+1
|\ \ \
| * | | Use safe navigation operator to make rubocop happywinniehell2017-02-131-1/+1
* | | | Merge branch '24976-start-of-line-mention' into 'master' Sean McGivern2017-02-133-11/+31
|\ \ \ \ | |/ / / |/| | |
| * | | Create directly_addressed Todos when mentioned in beginning of a lineErshad Kunnakkadan2017-02-083-11/+31
* | | | Merge branch 'issue_25900_2' into 'master' Sean McGivern2017-02-133-0/+19
|\ \ \ \
| * | | | Gather issuable metadata to avoid n+ queries on index viewissue_25900_2Felipe Artur2017-02-093-0/+19
* | | | | Merge branch 'zj-drop-ruby-21-tests' into 'master' Rémy Coutable2017-02-137-29/+19
|\ \ \ \ \
| * | | | | Update Rubocop to ruby 2.3zj-drop-ruby-21-testsZ.J. van de Weg2017-02-077-29/+19
* | | | | | Merge branch 'rs-warden-blocked-users' into 'master' Robert Speicher2017-02-101-0/+9
|\ \ \ \ \ \
| * | | | | | Don't perform Devise trackable updates on blocked User recordsrs-warden-blocked-usersRobert Speicher2017-02-101-0/+9
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'dz-nested-groups-members-page' into 'master' Dmitriy Zaporozhets2017-02-102-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Show parent group members for nested groupdz-nested-groups-members-pageDmitriy Zaporozhets2017-02-102-1/+2
* | | | | | Merge branch 'issue_26701' into 'master'Sean McGivern2017-02-091-10/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
View Lorry Controller Status