summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream-9-2-security' into master-security-updateDJ Mountney2017-06-082-1/+2
|\
| * Bring in security changes from the 9.2.5 releaseDJ Mountney2017-06-0712-11/+17
* | Merge branch '25934-project-snippet-vis' into 'security-9-2'DJ Mountney2017-06-089-10/+14
* | Merge branch 'dz-api-x-frame' into 'security-9-2'DJ Mountney2017-06-081-0/+1
* | Merge branch 'dm-diff-file-diffable' into 'master'Sean McGivern2017-06-083-9/+13
|\ \
| * | Move diffable? method from Repository to Diff::Filedm-diff-file-diffableDouwe Maan2017-06-083-22/+38
* | | Merge branch 'dm-highlight-diff-file-blob' into 'master'Sean McGivern2017-06-083-27/+36
|\ \ \
| * | | Use Diff::File blob methods from diff highlighterdm-highlight-diff-file-blobDouwe Maan2017-06-083-27/+36
| |/ /
* | | Merge branch '33383_add_bulgarian_translation_of_cycle_analytics_page' into '...Douwe Maan2017-06-081-1/+2
|\ \ \
| * | | add bulgarian translation of cycle analytics page to I18N黄涛2017-06-071-1/+2
* | | | Merge branch '33334_add_portuguese_brazil_translation_of_cycle_analytics_page...Douwe Maan2017-06-081-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Update i18n.rb styleHuang Tao2017-06-071-1/+1
| * | | add portuguese brazil translation of cycle analytics page黄涛2017-06-071-0/+1
| |/ /
* | | Merge branch 'blob-load-all-data' into 'master'Grzegorz Bizon2017-06-084-4/+4
|\ \ \ | |_|/ |/| |
| * | Blob#load_all_data! doesn’t need an argumentblob-load-all-dataDouwe Maan2017-06-074-4/+4
* | | remove the rouge copypasta and add notes to refactorhttp://jneen.net/2017-06-072-28/+4
* | | Translate project & repository pagesBob Van Landuyt2017-06-0711-23/+23
* | | Merge branch 'krakowski_master2' into 'master'Grzegorz Bizon2017-06-071-20/+31
|\ \ \ | |/ / |/| |
| * | use squre bracketShinya Maeda2017-06-081-1/+1
| * | Use source instead of trigger_requests in stage_seedsShinya Maeda2017-06-082-5/+2
| * | Remove source.nilShinya Maeda2017-06-081-3/+3
| * | Fix conditionShinya Maeda2017-06-082-4/+7
| * | Fix unmatches_pathShinya Maeda2017-06-081-6/+9
| * | Fix change in behaviorFilip Krakowski2017-06-081-8/+8
| * | Check if source is nilFilip Krakowski2017-06-081-1/+1
| * | Fix static-analysis offensesFilip Krakowski2017-06-081-1/+1
| * | Add all sources as special keywords for only and exceptFilip Krakowski2017-06-081-4/+11
| * | Use pipeline.source to determine what triggered a pipelineFilip Krakowski2017-06-081-16/+16
| * | Add 'schedules' keyword to 'only' and 'except'Filip Krakowski2017-06-081-14/+15
* | | Added more actions and report as abuse to all notesLuke "Jared" Bennett2017-06-071-1/+6
* | | Merge branch 'backport_fix_slash_commands_for_multiple_assignee' into 'master'Douwe Maan2017-06-072-4/+10
|\ \ \
| * | | Backport Fix '/unassign' slash commandbackport_fix_slash_commands_for_multiple_assigneeValery Sizov2017-06-072-4/+10
* | | | Merge branch 'fix/backup-restore-resume' into 'master'James Lopez2017-06-071-38/+37
|\ \ \ \
| * | | | fix typofix/backup-restore-resumeJames Lopez2017-06-071-1/+1
| * | | | fix wikiJames Lopez2017-06-071-1/+1
| * | | | refactor code and specJames Lopez2017-06-071-25/+21
| * | | | fix backup task to ignore errors per projectJames Lopez2017-06-071-26/+29
| | |_|/ | |/| |
* | | | Merge branch 'sync-email-from-omniauth' into 'master'Douwe Maan2017-06-072-9/+21
|\ \ \ \
| * | | | Sync email address from specified omniauth providerRobin Bobbitt2017-06-072-9/+21
| | |_|/ | |/| |
* | | | Merge branch 'fix-memoization-in-contributions-calendar' into 'master'Rémy Coutable2017-06-071-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix memoization in ContributionsCalendar#activity_datesfix-memoization-in-contributions-calendarSean McGivern2017-06-071-1/+1
* | | | Merge branch 'fix_rubocop_warning_about_has_key' into 'master'Grzegorz Bizon2017-06-071-1/+1
|\ \ \ \
| * | | | Use key? instead of has_key? methodfix_rubocop_warning_about_has_keyPawel Chojnacki2017-06-071-1/+1
* | | | | Merge branch '3191-deploy-keys-update' into 'master'Rémy Coutable2017-06-071-0/+21
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Implement ability to update deploy keysAlexander Randa2017-06-021-0/+21
* | | | | Merge branch 'dm-diff-file-straight-diff' into 'master'Sean McGivern2017-06-074-18/+14
|\ \ \ \ \
| * | | | | Fix Diff::Position#diff_file for positions on straight diffsdm-diff-file-straight-diffDouwe Maan2017-06-064-18/+14
* | | | | | Merge branch 'feature/gb/persist-pipeline-stages' into 'master'Kamil Trzciński2017-06-075-5/+68
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'feature/gb/migrate-pipeline-stages' into feature/gb/persist-pip...Grzegorz Bizon2017-06-0620-143/+422
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'master' into feature/gb/persist-pipeline-stagesGrzegorz Bizon2017-06-05124-1178/+2764
| |\ \ \ \ \ \
View Lorry Controller Status