summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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 '22818-licence-gitignore-and-yml-endpoints-removal' into 'master' Rémy Coutable2017-02-131-1/+1
|\ \
| * | Remove deprecated templates endpoints in V422818-licence-gitignore-and-yml-endpoints-removalOswaldo Ferreira2017-02-131-1/+1
* | | Merge branch 'option-to-be-notified-of-own-activity' into 'master' Douwe Maan2017-02-134-6/+13
|\ \ \
| * | | Remove `try` from NotificationService#build_recipientsRichard Macklin2017-02-031-1/+1
| * | | Refactor NotificationService#pipeline_finished to use skip_current_userRichard Macklin2017-02-031-2/+3
| * | | Add checkbox in UI to opt into receiving notifications about your activityRichard Macklin2017-02-012-0/+6
| * | | Update NotificationService to respect User#notified_of_own_activityRichard Macklin2017-02-011-3/+3
| * | | Add notified_of_own_activity to permitted attributesRichard Macklin2017-02-011-1/+1
* | | | 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-132-14/+13
|\ \ \ \
| * | | | Use preload for Event#target since it's a polymorphic association27395-reduce-group-activity-sql-queriesRémy Coutable2017-02-132-13/+12
| * | | | 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 'rs-rubocop-rspec' into 'master' Rémy Coutable2017-02-131-1/+1
|\ \ \ \ \
| * | | | | Enable `Style/RedundantException` cop and correct offenseRobert Speicher2017-02-101-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 '27939-fix-current-build-arrow' into 'master' Filipa Lacerda2017-02-131-1/+1
|\ \ \ \ \ \
| * | | | | | Fix current build arrow27939-fix-current-build-arrowEric Eastwood2017-02-131-1/+1
* | | | | | | Merge branch '23535-folders-in-wiki-repository' into 'master' Douwe Maan2017-02-1313-14/+126
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix haml-lint violationAlex Braha Stoll2017-02-131-1/+1
| * | | | | | Add WikiPage.unhyphenizeAlex Braha Stoll2017-01-302-2/+6
| * | | | | | Merge branch 'master' into 23535-folders-in-wiki-repositoryAlex Braha Stoll2017-01-29631-3377/+9330
| |\ \ \ \ \ \
| * | | | | | | Remove directories as one of the attributes of WikiDirectoryAlex Braha Stoll2016-12-311-3/+2
| * | | | | | | Add new wiki related partialsAlex Braha Stoll2016-12-313-10/+9
| * | | | | | | 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 a breadcrumb at projects/wikis/show.html.hamlAlex Braha Stoll2016-12-313-0/+21
| * | | | | | | Stop rendering page full path at projects/wikis/show.html.hamlAlex Braha Stoll2016-12-312-2/+0
| * | | | | | | Render wiki entries using a collection of WikiPage and WikiDirectory objectsAlex Braha Stoll2016-12-316-24/+13
| * | | | | | | 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
| * | | | | | | Use the icon helper at wikis/_new.html.hamlAlex Braha Stoll2016-12-311-2/+2
| * | | | | | | Fix scss style violationAlex Braha Stoll2016-12-311-1/+2
| * | | | | | | Improve style of wiki page listsAlex Braha Stoll2016-12-312-1/+17
| * | | | | | | Change WikiPage.group_by_directory to order by directory and file alphabetica...Alex Braha Stoll2016-12-311-1/+28
| * | | | | | | Add tip about specifying the full path when creating new wiki pagesAlex Braha Stoll2016-12-312-0/+12
| * | | | | | | 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-313-2/+14
| * | | | | | | Remove root directory name from index of wikisAlex Braha Stoll2016-12-312-9/+14
| * | | | | | | Remove root directory name from the sidebar of wikisAlex Braha Stoll2016-12-312-7/+13
View Lorry Controller Status