summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '33525-use-git-diff-instead-of-git-format-patch' into 'master'Robert Speicher2017-06-121-7/+3
|\ | | | | | | | | | | | | Generate patch with git diff instead of git format-patch Closes #33525 See merge request !12060
| * Generate patch with git diff instead of git format-patch33525-use-git-diff-instead-of-git-format-patchRémy Coutable2017-06-091-7/+3
| | | | | | | | | | | | | | | | | | | | This will generate a patch: - that is smaller - that applies more cleanly since only the final diff will be applied instead of each commit's diff Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '33003-avatar-in-project-api' into 'master'Rémy Coutable2017-06-121-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Accept avatar file in project API Closes #33003 See merge request !11988
| * | Accept image for avatar in project APIvanadium232017-06-091-0/+1
| | |
* | | Merge branch 'dm-mail-room-check-without-omnibus' into 'master'Robert Speicher2017-06-091-5/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Don't check if MailRoom is running on Omnibus Closes #19607 See merge request !12056
| * | | Don't check if MailRoom is running on Omnibusdm-mail-room-check-without-omnibusDouwe Maan2017-06-091-5/+4
| | |/ | |/|
* | | Merge branch 'cache-diff-size-limits' into 'master'Douwe Maan2017-06-091-2/+18
|\ \ \ | |_|/ |/| | | | | | | | Only look up diff size limit flags once per request See merge request !12048
| * | Only look up diff size limit flags once per requestcache-diff-size-limitsSean McGivern2017-06-091-2/+18
| | |
* | | Merge branch 'tc-link-to-commit-on-help-page' into 'master'Robert Speicher2017-06-091-1/+3
|\ \ \ | |_|/ |/| | | | | | | | Make the revision on the `/help` page clickable See merge request !12016
| * | Make the revision on the `/help` page clickabletc-link-to-commit-on-help-pageToon Claes2017-06-091-1/+3
| | | | | | | | | | | | | | | For quicker access, add hyperlink to the gitlab.com commits page for the current REVISION of GitLab.
* | | Merge branch 'pat-msg-on-auth-failure' into 'master'Rémy Coutable2017-06-091-1/+5
|\ \ \ | | | | | | | | | | | | | | | | Prompt user to create personal access token for Git over HTTP See merge request !11986
| * | | Instruct user to use a personal access token for Git over HTTPRobin Bobbitt2017-06-071-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | If internal auth is disabled and LDAP is not configured on the instance, present the user with a message to create a personal access token if his Git over HTTP auth attempt fails.
* | | | Merge branch 'dm-blob-binaryness-change' into 'master'Sean McGivern2017-06-091-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Detect if blob binaryness changes after loading all data See merge request !11981
| * | | Detect if file that appears to be text in the first 1024 bytes is actually ↵dm-blob-binaryness-changeDouwe Maan2017-06-081-0/+1
| | | | | | | | | | | | | | | | binary afer loading all data
* | | | 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
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ran: - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch - git checkout -b 9-2-5-security-patch origin/v9.2.2 - git apply patchfile.patch - git commit - [Got the sha ref for the commit] - git checkout -b upstream-9-2-security master - git cherry-pick <SHA of the patchfile commit> - [Resolved conflicts] - git cherry-pick --continue
* | | | Merge branch '25934-project-snippet-vis' into 'security-9-2'DJ Mountney2017-06-089-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | Fix visibility when referencing snippets See merge request !2101
* | | | Merge branch 'dz-api-x-frame' into 'security-9-2'DJ Mountney2017-06-081-0/+1
| |/ / |/| | | | | | | | | | | | | | Restrict API X-Frame-Options to same origin See merge request !2103
* | | Merge branch 'dm-diff-file-diffable' into 'master'Sean McGivern2017-06-083-9/+13
|\ \ \ | | | | | | | | | | | | | | | | Move diffable? method from Repository to Diff::File See merge request !11980
| * | | 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 highlighter See merge request !11978
| * | | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add bulgarian translation of Cycle Analytics Page to I18N Closes #33383 See merge request !11958
| * | | | add bulgarian translation of cycle analytics page to I18N黄涛2017-06-071-1/+2
| | | | | | | | | | | | | | | | | | | | Fix #33383
* | | | | Merge branch ↵Douwe Maan2017-06-081-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '33334_add_portuguese_brazil_translation_of_cycle_analytics_page' into 'master' Add portuguese brazil translation of Cycle Analytics Page to I18N Closes #33334 See merge request !11920
| * | | | Update i18n.rb styleHuang Tao2017-06-071-1/+1
| | | | |
| * | | | add portuguese brazil translation of cycle analytics page黄涛2017-06-071-0/+1
| |/ / / | | | | | | | | | | | | Fix #33334
* | | | Merge branch 'blob-load-all-data' into 'master'Grzegorz Bizon2017-06-084-4/+4
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Blob#load_all_data! doesn’t need an argument See merge request !11977
| * | | 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
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Add all pipeline sources as special keywords to 'only' and 'except' Closes #32955 See merge request !11972
| * | 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 from EE: Fix '/unassign' slash command See merge request !11926
| * | | 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 backup task to continue on corrupt repositories Closes #31767 See merge request !11962
| * | | | 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
| | | | |
View Lorry Controller Status