Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '28093-snippet-and-issue-spam-check-on-edit' into 'master' | Sean McGivern | 2017-02-22 | 4 | -49/+49 |
|\ | |||||
| * | Spam check and reCAPTCHA improvements28093-snippet-and-issue-spam-check-on-edit | Oswaldo Ferreira | 2017-02-21 | 4 | -49/+49 |
* | | fixes delimiter removes when todo marked as done | Nur Rony | 2017-02-22 | 1 | -2/+4 |
* | | Merge branch 'add-filtered-search-to-mr' into 'master' | Alfredo Sumaran | 2017-02-22 | 1 | -0/+11 |
|\ \ | |||||
| * | | Add filtered search to MR pageadd-filtered-search-to-mr | Clement Ho | 2017-02-21 | 1 | -0/+11 |
| |/ | |||||
* | | Merge branch 'dm-no-more-andor' into 'master' | Robert Speicher | 2017-02-22 | 9 | -17/+15 |
|\ \ | |||||
| * | | No more and/or | Douwe Maan | 2017-02-21 | 9 | -17/+15 |
| |/ | |||||
* | | change todos counter position & format ( for large counts ) | mhasbini | 2017-02-21 | 1 | -0/+5 |
|/ | |||||
* | Merge branch 'dm-fix-editing-files-on-forks-quick' into 'master' | Robert Speicher | 2017-02-20 | 1 | -12/+4 |
|\ | |||||
| * | Fix issue where files on a fork could not be edited | Douwe Maan | 2017-02-17 | 1 | -12/+4 |
* | | Merge branch 'authentiq-backchannel-logout' into 'master' | Douwe Maan | 2017-02-20 | 1 | -0/+7 |
|\ \ | |||||
| * | | Added support for Authentiq Back-Channel Logout | Alexandros Keramidas | 2017-02-20 | 1 | -0/+7 |
* | | | Merge branch '21240_snippets_line_ending' into 'master' | Sean McGivern | 2017-02-20 | 3 | -25/+24 |
|\ \ \ | |||||
| * | | | Download snippets with LF line-endings by default | Jarka Kadlecova | 2017-02-20 | 3 | -25/+24 |
* | | | | Merge branch 'fix_sidekiq_concurrency_warning_message_in_admin_background_job... | Rémy Coutable | 2017-02-20 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | fix incorrect sidekiq concurrency count in admin background page | wendy0402 | 2017-02-19 | 1 | -0/+1 |
* | | | | | exclude rpc_pipefs from system disc info | Ben Bodenmiller | 2017-02-18 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Merge branch '25465-todo-done-clicking-is-kind-of-unsafe' into 'master' | Clement Ho | 2017-02-18 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | Todo done clicking is kind of unusable. | Jacopo | 2017-02-17 | 1 | -0/+6 |
| | |/ / | |/| | | |||||
* | | | | Merge branch '27920-both-wip-messages-showing' into 'master' | Fatih Acet | 2017-02-17 | 2 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | Dispatch needed JS when creating a new MR in diff view27920-both-wip-messages-showing | Sam Rose | 2017-02-14 | 2 | -1/+3 |
* | | | | | Merge branch 'use-update-runner-service' into 'master' | Kamil Trzciński | 2017-02-17 | 2 | -6/+6 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'upstream/master' into use-update-runner-service | Lin Jen-Shin | 2017-02-15 | 34 | -117/+237 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into use-update-runner-service | Lin Jen-Shin | 2017-02-07 | 6 | -7/+78 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into use-update-runner-service | Lin Jen-Shin | 2017-02-04 | 27 | -72/+176 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Prefer service object over after_save hook | Lin Jen-Shin | 2017-01-21 | 2 | -6/+6 |
* | | | | | | | | | Merge branch '26200-convert-sidebar-to-dropdown' into 'master' | Sean McGivern | 2017-02-17 | 2 | -2/+0 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | Drop theme ID from users table | Annabel Dunstone Gray | 2017-02-15 | 2 | -2/+0 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'paginate-environments-bundle' into 'master' | Fatih Acet | 2017-02-16 | 1 | -5/+30 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'fe-paginated-environments-api' into 'paginate-environments-bund...paginate-environments-bundle | Filipa Lacerda | 2017-02-16 | 1 | -5/+30 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Add count keys to response JSONfe-paginated-environments-api | Z.J. van de Weg | 2017-02-15 | 1 | -3/+4 |
| | * | | | | | | | Merge branch 'master' into fe-paginated-environments-api | Filipa Lacerda | 2017-02-12 | 8 | -25/+14 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Add route for environment folder and expose an API | Grzegorz Bizon | 2017-02-09 | 1 | -0/+18 |
| | * | | | | | | | | Resolve 500 error | Filipa Lacerda | 2017-02-09 | 1 | -1/+0 |
| | * | | | | | | | | Add support for environment scopes in controller | Grzegorz Bizon | 2017-02-09 | 1 | -7/+12 |
| | * | | | | | | | | Enable grouping and pagination in environmnets API | Grzegorz Bizon | 2017-02-09 | 1 | -1/+3 |
* | | | | | | | | | | Merge branch '28176_merge_widget_fix' into 'master' | Sean McGivern | 2017-02-16 | 1 | -3/+6 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Fix error in MR widget after /merge slash command | Jarka Kadlecova | 2017-02-16 | 1 | -3/+6 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'move_tags_service_to_namespace' into 'master' | Rémy Coutable | 2017-02-15 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Move tag services to `Tags` namespace | dixpac | 2017-02-14 | 1 | -2/+2 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Execute web hooks for WikiPage delete operation | Mark Fletcher | 2017-02-14 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'option-to-be-notified-of-own-activity' into 'master' | Douwe Maan | 2017-02-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add notified_of_own_activity to permitted attributes | Richard Macklin | 2017-02-01 | 1 | -1/+1 |
* | | | | | | | | Merge branch '27395-reduce-group-activity-sql-queries' into 'master' | Yorick Peterse | 2017-02-13 | 1 | -12/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use preload for Event#target since it's a polymorphic association27395-reduce-group-activity-sql-queries | Rémy Coutable | 2017-02-13 | 1 | -12/+11 |
* | | | | | | | | | Merge branch '23535-folders-in-wiki-repository' into 'master' | Douwe Maan | 2017-02-13 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into 23535-folders-in-wiki-repository | Alex Braha Stoll | 2017-01-29 | 34 | -288/+404 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Render wiki entries using a collection of WikiPage and WikiDirectory objects | Alex Braha Stoll | 2016-12-31 | 1 | -2/+2 |
| * | | | | | | | | | Show directory hierarchy when listing wiki pages | Alex Braha Stoll | 2016-12-31 | 1 | -1/+2 |
* | | | | | | | | | | Merge branch 'issue_25900_2' into 'master' | Sean McGivern | 2017-02-13 | 5 | -4/+38 |
|\ \ \ \ \ \ \ \ \ \ |